From e93e4945181e4bd6b419d7ee3c409db88ad918cd Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 17 Aug 1998 00:00:51 +0000 Subject: [PATCH] feature an extra MODULES parameter, so glib-config can be invoked with the Mon Aug 17 01:46:14 1998 Tim Janik * glib.m4: feature an extra MODULES parameter, so glib-config can be invoked with the "gmodule" argument. * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all g_return*_if_fail statements, and made them issue a message like "assertion `%s' failed". * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to g_log_find_domain. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-12 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ glib.h | 16 ++++++++-------- glib.m4 | 9 +++++++-- glib/glib.h | 16 ++++++++-------- glib/gmessages.c | 6 +++--- gmessages.c | 6 +++--- 13 files changed, 125 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ed028154..e08adc81a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2ed028154..e08adc81a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Mon Aug 17 01:46:14 1998 Tim Janik + + * glib.m4: feature an extra MODULES parameter, so glib-config can + be invoked with the "gmodule" argument. + + * glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all + g_return*_if_fail statements, and made them issue a message + like "assertion `%s' failed". + + * gmessages.c (g_logv): ugh, don't pass log_domain as NULL to + g_log_find_domain. + Sun Aug 16 20:28:27 1998 Tim Janik * version bump to 1.1.3, binary age 0, interface age 0. diff --git a/glib.h b/glib.h index 0240a3367..a00194ffb 100644 --- a/glib.h +++ b/glib.h @@ -327,8 +327,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d (%s): assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed.", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -340,8 +340,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d (%s): assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed.", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -355,8 +355,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d: assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed.", \ __FILE__, \ __LINE__, \ #expr); \ @@ -367,8 +367,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d: assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed.", \ __FILE__, \ __LINE__, \ #expr); \ diff --git a/glib.m4 b/glib.m4 index 49248afb3..f83a13839 100644 --- a/glib.m4 +++ b/glib.m4 @@ -1,8 +1,9 @@ # Configure paths for GLIB # Owen Taylor 97-11-3 -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified +dnl in MODULES, feature the glib-config gmodule option. dnl AC_DEFUN(AM_PATH_GLIB, [dnl @@ -28,6 +29,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru fi fi + case "$4" in + *gmodule*) glib_config_args="$glib_config_args gmodule";; + esac + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) min_glib_version=ifelse([$1], ,0.99.7,$1) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) diff --git a/glib/glib.h b/glib/glib.h index 0240a3367..a00194ffb 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -327,8 +327,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d (%s): assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed.", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -340,8 +340,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d (%s): assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed.", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -355,8 +355,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d: assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed.", \ __FILE__, \ __LINE__, \ #expr); \ @@ -367,8 +367,8 @@ if (!(expr)) \ { \ g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_WARNING, \ - "file %s: line %d: assertion failed: (%s)", \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed.", \ __FILE__, \ __LINE__, \ #expr); \ diff --git a/glib/gmessages.c b/glib/gmessages.c index c1119e367..d2937576d 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -64,7 +64,7 @@ static inline GLogDomain* g_log_find_domain (const gchar *log_domain) { register GLogDomain *domain; - + domain = g_log_domains; while (domain) { @@ -79,7 +79,7 @@ static inline GLogDomain* g_log_domain_new (const gchar *log_domain) { register GLogDomain *domain; - + domain = g_new (GLogDomain, 1); domain->log_domain = g_strdup (log_domain); domain->fatal_mask = G_LOG_FATAL_MASK; @@ -266,7 +266,7 @@ g_logv (const gchar *log_domain, GLogFunc log_func; gpointer data = NULL; - domain = g_log_find_domain (log_domain); + domain = g_log_find_domain (log_domain ? log_domain : ""); if (g_log_depth++) test_level |= G_LOG_FLAG_RECURSION; diff --git a/gmessages.c b/gmessages.c index c1119e367..d2937576d 100644 --- a/gmessages.c +++ b/gmessages.c @@ -64,7 +64,7 @@ static inline GLogDomain* g_log_find_domain (const gchar *log_domain) { register GLogDomain *domain; - + domain = g_log_domains; while (domain) { @@ -79,7 +79,7 @@ static inline GLogDomain* g_log_domain_new (const gchar *log_domain) { register GLogDomain *domain; - + domain = g_new (GLogDomain, 1); domain->log_domain = g_strdup (log_domain); domain->fatal_mask = G_LOG_FATAL_MASK; @@ -266,7 +266,7 @@ g_logv (const gchar *log_domain, GLogFunc log_func; gpointer data = NULL; - domain = g_log_find_domain (log_domain); + domain = g_log_find_domain (log_domain ? log_domain : ""); if (g_log_depth++) test_level |= G_LOG_FLAG_RECURSION; -- 2.34.1