Only use G_LIKELY in g_assert() and g_return_[val]_if_fail() if it is

	* glib/gmessages.h: Only use G_LIKELY in g_assert() and
	g_return_[val]_if_fail() if it is actually doing something.

diff --git a/ChangeLog b/ChangeLog
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1505da8..b9deb2b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-11-26  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gmessages.h: Only use G_LIKELY in g_assert() and 
+       g_return_[val]_if_fail() if it is actually doing something.
+
 2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/grand.c, gthread/gthread-impl.c, tests/rand-test.c: 

diff --git a/glib/gmessages.h b/glib/gmessages.h
index 3a4a8dd..da3f15b 100644 (file)
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -198,7 +198,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 
 #else /* !G_DISABLE_ASSERT */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ > 2)  && defined(__OPTIMIZE__)
 
 #define g_assert(expr)                 G_STMT_START{           \
      if (!G_LIKELY (expr))                                     \
@@ -250,7 +250,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 
 #else /* !G_DISABLE_CHECKS */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
 
 #define g_return_if_fail(expr)         G_STMT_START{                   \
      if (!G_LIKELY (expr))                                             \