change #elif with no expression to #else in G_STRFUNC definition. Thanks

Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>

        * glib/gmacros.h: change #elif with no expression to #else in
        G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.

diff --git a/ChangeLog b/ChangeLog
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88107769462af9dab054d7d04b4e9b8b92274d31..11b1e31a7aef572aaa949d62dde2bc62395fab9b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
+
+       * glib/gmacros.h: change #elif with no expression to #else in
+       G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101.
+
 Mon Dec  8 12:02:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * === Released 2.3.1 ===

diff --git a/glib/gmacros.h b/glib/gmacros.h
index 7b61b824610004fe08134cba7502d529e185c459..a5d97f102ad09a9e3731558d8e6a03d476bed387 100644 (file)
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -113,7 +113,7 @@
 #  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
 #elif defined (G_HAVE_ISO_VARARGS)
 #  define G_STRFUNC     ((const char*) (__func__))
-#elif
+#else
 #  define G_STRFUNC     ((const char*) ("???"))
 #endif