glib r7451 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Sep 10 03:21:42 2008
New Revision: 7451
URL: http://svn.gnome.org/viewvc/glib?rev=7451&view=rev

Log:
2008-09-09  Matthias Clasen  <mclasen redhat com>

        Bug 551228 â G_STRFUNC on recent Sun compiler should be expanded to
        __func__ rather than '???'

        * glib/gmacros.h: Don't use glibconfig.h defines in gmacros.h,
        as the comment up top says. Instead look at __STDC_VERSION__.
        Problem reported by Lin Ma.



Modified:
   trunk/ChangeLog
   trunk/glib/gmacros.h

Modified: trunk/glib/gmacros.h
==============================================================================
--- trunk/glib/gmacros.h	(original)
+++ trunk/glib/gmacros.h	Wed Sep 10 03:21:42 2008
@@ -147,7 +147,7 @@
 /* Provide a string identifying the current function, non-concatenatable */
 #if defined (__GNUC__)
 #  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (G_HAVE_ISO_VARARGS)
+#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
 #  define G_STRFUNC     ((const char*) (__func__))
 #else
 #  define G_STRFUNC     ((const char*) ("???"))