In case of G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with

2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib/gmessages.h (g_assert, g_assert_not_reached,
	g_return_if_fail, g_return_val_if_fail): In case of
	G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
	"G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
	gcc prior to 3.0. (#86664)

diff --git a/ChangeLog b/ChangeLog
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4acc877..250e5d5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-06-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmessages.h (g_assert, g_assert_not_reached,
+       g_return_if_fail, g_return_val_if_fail): In case of
+       G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with
+       "G_STMT_START{ (void)0; }G_STMT_END", because the former chokes
+       gcc prior to 3.0. (#86664)
+
 2002-06-26  Yanko Kaneti <yaneti@declera.com>
 
        * configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

diff --git a/glib/gmessages.h b/glib/gmessages.h
index b66c9c7..346a4b0 100644 (file)
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -192,8 +192,8 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 
 #ifdef G_DISABLE_ASSERT
 
-#define g_assert(expr)         G_STMT_START{ }G_STMT_END
-#define g_assert_not_reached() G_STMT_START{ }G_STMT_END
+#define g_assert(expr)         G_STMT_START{ (void)0; }G_STMT_END
+#define g_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
 
 #else /* !G_DISABLE_ASSERT */
 
@@ -242,8 +242,8 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 
 #ifdef G_DISABLE_CHECKS
 
-#define g_return_if_fail(expr)                 G_STMT_START{ }G_STMT_END
-#define g_return_val_if_fail(expr,val)         G_STMT_START{ }G_STMT_END
+#define g_return_if_fail(expr)                 G_STMT_START{ (void)0; }G_STMT_END
+#define g_return_val_if_fail(expr,val)         G_STMT_START{ (void)0; }G_STMT_END
 #define g_return_if_reached()                  G_STMT_START{ return; }G_STMT_END
 #define g_return_val_if_reached(val)           G_STMT_START{ return (val); }G_STMT_END