Bug 551228 – G_STRFUNC on recent Sun compiler should be expanded to

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.

svn path=/trunk/; revision=7451

diff --git a/ChangeLog b/ChangeLog
index 5646151d62825e0d52decccd53bca447ed6fdfff..ff2dbad05f7fb1c07c9515af70ad831d8146fdd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2008-09-09  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 523463 – Core dump in gmain.c:2482:IA__g_main_context_check()

diff --git a/glib/gmacros.h b/glib/gmacros.h
index 631740892218d1ef7b6e8a29bd18f0a1857a44a8..f87e932cebe3e54f61853c52f35becd596000388 100644 (file)
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -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*) ("???"))