From 208a69d450c49b47219090d29abacf5888aa4144 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Sep 2004 22:14:49 +0000 Subject: [PATCH 1/1] Move the declaration of g_return_if_fail_warning() out of the ifdefs, so 2004-09-29 Matthias Clasen * glib/gmessages.h: Move the declaration of g_return_if_fail_warning() out of the ifdefs, so that building with G_DISABLE_ASSERT works. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmessages.h | 10 +++++----- 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ab4893..d20b201 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-29 Matthias Clasen + + * glib/gmessages.h: Move the declaration of + g_return_if_fail_warning() out of the ifdefs, so that + building with G_DISABLE_ASSERT works. + 2004-09-27 Murray Cumming * glib/goptions.[h|c], glib/glib.symbols: Rename diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5ab4893..d20b201 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-09-29 Matthias Clasen + + * glib/gmessages.h: Move the declaration of + g_return_if_fail_warning() out of the ifdefs, so that + building with G_DISABLE_ASSERT works. + 2004-09-27 Murray Cumming * glib/goptions.[h|c], glib/glib.symbols: Rename diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5ab4893..d20b201 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2004-09-29 Matthias Clasen + + * glib/gmessages.h: Move the declaration of + g_return_if_fail_warning() out of the ifdefs, so that + building with G_DISABLE_ASSERT works. + 2004-09-27 Murray Cumming * glib/goptions.[h|c], glib/glib.symbols: Rename diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5ab4893..d20b201 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-09-29 Matthias Clasen + + * glib/gmessages.h: Move the declaration of + g_return_if_fail_warning() out of the ifdefs, so that + building with G_DISABLE_ASSERT works. + 2004-09-27 Murray Cumming * glib/goptions.[h|c], glib/glib.symbols: Rename diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5ab4893..d20b201 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-09-29 Matthias Clasen + + * glib/gmessages.h: Move the declaration of + g_return_if_fail_warning() out of the ifdefs, so that + building with G_DISABLE_ASSERT works. + 2004-09-27 Murray Cumming * glib/goptions.[h|c], glib/glib.symbols: Rename diff --git a/glib/gmessages.h b/glib/gmessages.h index 2f8c59b..c38fd0e 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -108,6 +108,11 @@ void _g_log_fallback_handler (const gchar *log_domain, const gchar *message, gpointer unused_data) G_GNUC_INTERNAL; +/* Internal function, used to implement the following macros */ +void g_return_if_fail_warning (const char *log_domain, + const char *pretty_function, + const char *expression); + #ifndef G_LOG_DOMAIN #define G_LOG_DOMAIN ((gchar*) 0) @@ -269,11 +274,6 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); #ifdef __GNUC__ -/* Internal function, used to implement following macros */ -void g_return_if_fail_warning (const char *log_domain, - const char *pretty_function, - const char *expression); - #define g_return_if_fail(expr) G_STMT_START{ \ if G_LIKELY(expr) { } else \ { \ -- 2.7.4