From 8ad2623deddca63d07d62cca0a8da13a9140abe9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 17 Jan 1999 15:21:28 +0000 Subject: [PATCH] if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as ((gchar*) 0) instead of Sun Jan 17 16:14:03 1999 Tim Janik * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported by Seth Alves . --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib.h | 2 +- glib/glib.h | 2 +- 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7762008e1..dbd18b7ee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Jan 17 16:14:03 1999 Tim Janik + + * glib.h (g_error): if !defined (G_LOG_DOMAIN) define G_LOG_DOMAIN as + ((gchar*) 0) instead of ((void*) 0) to silence egcs C++ mode, reported + by Seth Alves . + Sun Jan 17 14:13:52 1999 Tim Janik * glib.h: added a define G_HOOK_DEFERRED_DESTROY, to substitute a noop diff --git a/glib.h b/glib.h index 03951b6e8..a50f6d0f3 100644 --- a/glib.h +++ b/glib.h @@ -1263,7 +1263,7 @@ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask); GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); #ifndef G_LOG_DOMAIN -#define G_LOG_DOMAIN (NULL) +#define G_LOG_DOMAIN ((gchar*) 0) #endif /* G_LOG_DOMAIN */ #ifdef __GNUC__ #define g_error(format, args...) g_log (G_LOG_DOMAIN, \ diff --git a/glib/glib.h b/glib/glib.h index 03951b6e8..a50f6d0f3 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -1263,7 +1263,7 @@ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask); GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); #ifndef G_LOG_DOMAIN -#define G_LOG_DOMAIN (NULL) +#define G_LOG_DOMAIN ((gchar*) 0) #endif /* G_LOG_DOMAIN */ #ifdef __GNUC__ #define g_error(format, args...) g_log (G_LOG_DOMAIN, \