get rid of warning here

2002-01-28  Havoc Pennington  <hp@redhat.com>

	* glib/gmacros.h: get rid of warning here

diff --git a/ChangeLog b/ChangeLog
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c48bd25..dff6a78 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-01-28  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gmacros.h: get rid of warning here
+
 Mon Jan 28 17:56:10 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmacros.h: Only use __FUNCTION__, __PRETTY_FUNCTION__ for

diff --git a/glib/gmacros.h b/glib/gmacros.h
index 2f42a31..549cd16 100644 (file)
--- 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__ */