diff --git a/ChangeLog b/ChangeLog index 981dc4868..60348576d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 981dc4868..60348576d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Apr 10 19:30:50 1999 Tim Janik + + * glib.h: removed braces around inline strings for the G_GNUC_FUNCTION + and G_GNUC_PRETTY_FUNCTION macros, so the macros can be used for compile + time string concatenation. + Thu Apr 8 19:53:19 1999 Owen Taylor * gmain.c (g_main_iterate): Check for two threads diff --git a/glib.h b/glib.h index d7d82c00c..6a322bc6a 100644 --- a/glib.h +++ b/glib.h @@ -262,11 +262,11 @@ extern "C" { * macros, so we can refer to them as strings unconditionally. */ #ifdef __GNUC__ -#define G_GNUC_FUNCTION (__FUNCTION__) -#define G_GNUC_PRETTY_FUNCTION (__PRETTY_FUNCTION__) +#define G_GNUC_FUNCTION __FUNCTION__ +#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else /* !__GNUC__ */ -#define G_GNUC_FUNCTION ("") -#define G_GNUC_PRETTY_FUNCTION ("") +#define G_GNUC_FUNCTION "" +#define G_GNUC_PRETTY_FUNCTION "" #endif /* !__GNUC__ */ /* we try to provide a usefull equivalent for ATEXIT if it is diff --git a/glib/glib.h b/glib/glib.h index d7d82c00c..6a322bc6a 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -262,11 +262,11 @@ extern "C" { * macros, so we can refer to them as strings unconditionally. */ #ifdef __GNUC__ -#define G_GNUC_FUNCTION (__FUNCTION__) -#define G_GNUC_PRETTY_FUNCTION (__PRETTY_FUNCTION__) +#define G_GNUC_FUNCTION __FUNCTION__ +#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else /* !__GNUC__ */ -#define G_GNUC_FUNCTION ("") -#define G_GNUC_PRETTY_FUNCTION ("") +#define G_GNUC_FUNCTION "" +#define G_GNUC_PRETTY_FUNCTION "" #endif /* !__GNUC__ */ /* we try to provide a usefull equivalent for ATEXIT if it is