From 936c1886ade7192b2779021a81882645276956db Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 12 Aug 2001 19:08:13 +0000 Subject: [PATCH] fix g_return_if_fail, g_assert and friends to have a body for Sun Aug 12 21:05:13 2001 Tim Janik * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. fixes #58873. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmessages.h | 12 ++++++------ 9 files changed, 54 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8160cdfd2..5f4c3e0b5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Aug 12 21:05:13 2001 Tim Janik + + * glib/gmessages.h: fix g_return_if_fail, g_assert and friends to + have a body for G_DISABLE_CHECKS and G_DISABLE_ASSERT. + fixes #58873. + 2001-08-12 Ron Steinke * glib/giochannel.c: safer handling of errno, fixed diff --git a/glib/gmessages.h b/glib/gmessages.h index b937b4950..beedda5b3 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -186,8 +186,8 @@ GPrintFunc g_set_message_handler (GPrintFunc func); #ifdef G_DISABLE_ASSERT -#define g_assert(expr) -#define g_assert_not_reached() +#define g_assert(expr) G_STMT_START{ }G_STMT_END +#define g_assert_not_reached() G_STMT_START{ }G_STMT_END #else /* !G_DISABLE_ASSERT */ @@ -236,10 +236,10 @@ GPrintFunc g_set_message_handler (GPrintFunc func); #ifdef G_DISABLE_CHECKS -#define g_return_if_fail(expr) -#define g_return_val_if_fail(expr,val) -#define g_return_if_reached() return -#define g_return_val_if_reached(val) return (val) +#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_reached() G_STMT_START{ return; }G_STMT_END +#define g_return_val_if_reached(val) G_STMT_START{ return (val); }G_STMT_END #else /* !G_DISABLE_CHECKS */