From b19bcd9604fee9251130d109f068fc97e4198fd5 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 29 Jan 2002 00:29:24 +0000 Subject: [PATCH] get rid of warning here 2002-01-28 Havoc Pennington * glib/gmacros.h: get rid of warning here --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gmacros.h | 2 +- 9 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c48bd257c..dff6a7836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c48bd257c..dff6a7836 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2002-01-28 Havoc Pennington + + * glib/gmacros.h: get rid of warning here + Mon Jan 28 17:56:10 2002 Owen Taylor * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for diff --git a/glib/gmacros.h b/glib/gmacros.h index 2f42a314e..549cd16d9 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -82,7 +82,7 @@ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with * macros, so we can refer to them as strings unconditionally. */ -#ifdef __GNUC__ && (__GNUC__ < 3) +#if defined (__GNUC__) && (__GNUC__ < 3) #define G_GNUC_FUNCTION __FUNCTION__ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else /* !__GNUC__ */