From f33b1397d390c625d21eebbf39c03ffacce1b085 Mon Sep 17 00:00:00 2001 From: Matej Knopp Date: Mon, 21 Nov 2011 18:56:19 +0100 Subject: [PATCH] adapter: fix return type of _map() to gconstpointer Fixes compiler warnings on OSX: gstadapter.h:82: warning: type qualifiers ignored on function return type gstadapter.c:412: warning: type qualifiers ignored on function return type const gpointer is not the same as gconstpointer or const void *. https://bugzilla.gnome.org/show_bug.cgi?id=664491 --- libs/gst/base/gstadapter.c | 2 +- libs/gst/base/gstadapter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/gst/base/gstadapter.c b/libs/gst/base/gstadapter.c index 0d7c43064c..3604019a8d 100644 --- a/libs/gst/base/gstadapter.c +++ b/libs/gst/base/gstadapter.c @@ -407,7 +407,7 @@ gst_adapter_try_to_merge_up (GstAdapter * adapter, gsize size) * Returns: (transfer none) (array length=size): a pointer to the first * @size bytes of data, or NULL */ -const gpointer +gconstpointer gst_adapter_map (GstAdapter * adapter, gsize size) { GstBuffer *cur; diff --git a/libs/gst/base/gstadapter.h b/libs/gst/base/gstadapter.h index 9a244711dd..1e7536cad9 100644 --- a/libs/gst/base/gstadapter.h +++ b/libs/gst/base/gstadapter.h @@ -79,7 +79,7 @@ GstAdapter * gst_adapter_new (void); void gst_adapter_clear (GstAdapter *adapter); void gst_adapter_push (GstAdapter *adapter, GstBuffer* buf); -const gpointer gst_adapter_map (GstAdapter *adapter, gsize size); +gconstpointer gst_adapter_map (GstAdapter *adapter, gsize size); void gst_adapter_unmap (GstAdapter *adapter); void gst_adapter_copy (GstAdapter *adapter, gpointer dest, gsize offset, gsize size);