From 0b890c62986c23345de43882062c557bc1471fef Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 10 Sep 2008 03:21:42 +0000 Subject: [PATCH] =?utf8?q?Bug=20551228=20=E2=80=93=20G=5FSTRFUNC=20on=20re?= =?utf8?q?cent=20Sun=20compiler=20should=20be=20expanded=20to?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-09-09 Matthias Clasen 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 --- ChangeLog | 9 +++++++++ glib/gmacros.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5646151..ff2dbad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-09-09 Matthias Clasen + 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 + Bug 523463 – Core dump in gmain.c:2482:IA__g_main_context_check() * glib/gmain.c (g_main_context_check): Be robust against setting diff --git a/glib/gmacros.h b/glib/gmacros.h index 6317408..f87e932 100644 --- 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*) ("???")) -- 2.7.4