From f6ccf00fed6758abb54ab0c668bca2842051a177 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Fri, 28 Jun 2002 08:41:16 +0000 Subject: [PATCH] In case of G_DISABLE_ASSERT replace "G_STMT_START{ }G_STMT_END" with 2002-06-28 Sebastian Wilhelmi * 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) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/gmessages.h | 8 ++++---- 8 files changed, 60 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4acc8770..250e5d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4acc8770..250e5d53 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-06-28 Sebastian Wilhelmi + + * 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 * configure.in: (ALL_LINGUAS) Added Bulgarian (bg). diff --git a/glib/gmessages.h b/glib/gmessages.h index b66c9c75..346a4b09 100644 --- 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 -- 2.34.1