__PRETTY_FUNCTION__ was made a non-token before gcc-3.0.0 for C++. (Fix

Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>

        * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
        before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
        #113797)

diff --git a/ChangeLog b/ChangeLog
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25d4f17..d8ec0ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue May 27 19:56:35 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token
+       before gcc-3.0.0 for C++. (Fix from Martin Kretzschmar,
+       #113797)
+
 2003-05-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c: Remain silent when sucessful. 

diff --git a/glib/gmacros.h b/glib/gmacros.h
index 3babc16..7315445 100644 (file)
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -101,7 +101,7 @@
 #define        G_STRINGIFY_ARG(contents)       #contents
 
 /* Provide a string identifying the current code position */
-#if defined(__GNUC__) && (__GNUC__ < 3)
+#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus)
 #  define G_STRLOC     __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
 #else
 #  define G_STRLOC     __FILE__ ":" G_STRINGIFY (__LINE__)