Only use __FUNCTION__, __PRETTY_FUNCTION__ for G_GNUC_FUNCTION,

Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
        G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
        3, since in 3.0.3 the semantics of these functions were changed in
        an incompatible way. (#69097)
This commit is contained in:
Owen Taylor 2002-01-28 23:01:19 +00:00 committed by Owen Taylor
parent 97564c24de
commit 8fece396e5
9 changed files with 58 additions and 2 deletions

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -1,3 +1,10 @@
Mon Jan 28 17:56:10 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for
G_GNUC_FUNCTION, G_GNUC_PRETTY_FUNCTION, G_STRLOC when __GNUC__ <
3, since in 3.0.3 the semantics of these functions were changed in
an incompatible way. (#69097)
2002-01-28 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Some documentation fixes/elaborations

View File

@ -82,7 +82,7 @@
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
#ifdef __GNUC__
#ifdef __GNUC__ && (__GNUC__ < 3)
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */
@ -94,7 +94,7 @@
#define G_STRINGIFY_ARG(contents) #contents
/* Provide a string identifying the current code position */
#ifdef __GNUC__
#if defined(__GNUC__) && (__GNUC__ < 3)
# define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
#else
# define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__)