From bbca7f21d7aece80e90ca88ccc6851ac108ef9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?=
 <ole.andre.ravnas@tandberg.com>
Date: Wed, 7 May 2008 18:51:22 +0000
Subject: [PATCH] gst/gstinfo.h (GST_FUNCTION): Made GST_FUNCTION an alias for
 G_STRFUNC to avoid duplication.

Original commit message from CVS:
* gst/gstinfo.h (GST_FUNCTION):
Made GST_FUNCTION an alias for G_STRFUNC to avoid duplication.
---
 ChangeLog     | 5 +++++
 common        | 2 +-
 gst/gstinfo.h | 8 +-------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ef4930e26..cec869c1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
+
+	* gst/gstinfo.h (GST_FUNCTION):
+	  Made GST_FUNCTION an alias for G_STRFUNC to avoid duplication.
+
 2008-05-07  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* libs/gst/base/gstadapter.c: (gst_adapter_available_fast):
diff --git a/common b/common
index 9b28214399..ba3dd2882b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9b28214399156457fd6b43d0604a47e4bdf19c28
+Subproject commit ba3dd2882b1611f8115f9664e3b85e1fd956b53d
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index b23f91741c..56963ad6d1 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -215,13 +215,7 @@ struct _GstDebugCategory {
  * output with the function name of the message.
  */
 #ifndef GST_FUNCTION
-#if defined (__GNUC__)
-#  define GST_FUNCTION     ((const char*) (__FUNCTION__))
-#elif defined (G_HAVE_ISO_VARARGS)
-#  define GST_FUNCTION     ((const char*) (__func__))
-#else
-#  define GST_FUNCTION     ((const char*) ("???"))
-#endif
+#  define GST_FUNCTION G_STRFUNC
 #endif /* ifndef GST_FUNCTION */