From db16c1be2bdb0923405f2bb59ce21ff084691cf1 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 11 Dec 2003 18:31:46 +0000 Subject: [PATCH] change #elif with no expression to #else in G_STRFUNC definition. Thanks Thu Dec 11 10:31:21 2003 Manish Singh * glib/gmacros.h: change #elif with no expression to #else in G_STRFUNC definition. Thanks to Damien Carbery, fixes #129101. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmacros.h | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 881077694..11b1e31a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 881077694..11b1e31a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 881077694..11b1e31a7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 881077694..11b1e31a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 881077694..11b1e31a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 881077694..11b1e31a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Dec 11 10:31:21 2003 Manish Singh + + * 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 * === Released 2.3.1 === diff --git a/glib/gmacros.h b/glib/gmacros.h index 7b61b8246..a5d97f102 100644 --- 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