mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-07 19:35:50 +01:00
feature an extra MODULES parameter, so glib-config can be invoked with the
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org> * 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.
This commit is contained in:
parent
d5803865b4
commit
e93e494518
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* 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 <timj@gtk.org>
|
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* version bump to 1.1.3, binary age 0, interface age 0.
|
* version bump to 1.1.3, binary age 0, interface age 0.
|
||||||
|
16
glib.h
16
glib.h
@ -327,8 +327,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d (%s): assertion failed: (%s)", \
|
"file %s: line %d (%s): assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
__PRETTY_FUNCTION__, \
|
__PRETTY_FUNCTION__, \
|
||||||
@ -340,8 +340,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d (%s): assertion failed: (%s)", \
|
"file %s: line %d (%s): assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
__PRETTY_FUNCTION__, \
|
__PRETTY_FUNCTION__, \
|
||||||
@ -355,8 +355,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d: assertion failed: (%s)", \
|
"file %s: line %d: assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
#expr); \
|
#expr); \
|
||||||
@ -367,8 +367,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d: assertion failed: (%s)", \
|
"file %s: line %d: assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
#expr); \
|
#expr); \
|
||||||
|
9
glib.m4
9
glib.m4
@ -1,8 +1,9 @@
|
|||||||
# Configure paths for GLIB
|
# Configure paths for GLIB
|
||||||
# Owen Taylor 97-11-3
|
# Owen Taylor 97-11-3
|
||||||
|
|
||||||
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
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
|
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
|
dnl
|
||||||
AC_DEFUN(AM_PATH_GLIB,
|
AC_DEFUN(AM_PATH_GLIB,
|
||||||
[dnl
|
[dnl
|
||||||
@ -28,6 +29,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$4" in
|
||||||
|
*gmodule*) glib_config_args="$glib_config_args gmodule";;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
|
AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
|
||||||
min_glib_version=ifelse([$1], ,0.99.7,$1)
|
min_glib_version=ifelse([$1], ,0.99.7,$1)
|
||||||
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
|
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
|
||||||
|
16
glib/glib.h
16
glib/glib.h
@ -327,8 +327,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d (%s): assertion failed: (%s)", \
|
"file %s: line %d (%s): assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
__PRETTY_FUNCTION__, \
|
__PRETTY_FUNCTION__, \
|
||||||
@ -340,8 +340,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d (%s): assertion failed: (%s)", \
|
"file %s: line %d (%s): assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
__PRETTY_FUNCTION__, \
|
__PRETTY_FUNCTION__, \
|
||||||
@ -355,8 +355,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d: assertion failed: (%s)", \
|
"file %s: line %d: assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
#expr); \
|
#expr); \
|
||||||
@ -367,8 +367,8 @@
|
|||||||
if (!(expr)) \
|
if (!(expr)) \
|
||||||
{ \
|
{ \
|
||||||
g_log (G_LOG_DOMAIN, \
|
g_log (G_LOG_DOMAIN, \
|
||||||
G_LOG_LEVEL_WARNING, \
|
G_LOG_LEVEL_CRITICAL, \
|
||||||
"file %s: line %d: assertion failed: (%s)", \
|
"file %s: line %d: assertion `%s' failed.", \
|
||||||
__FILE__, \
|
__FILE__, \
|
||||||
__LINE__, \
|
__LINE__, \
|
||||||
#expr); \
|
#expr); \
|
||||||
|
@ -64,7 +64,7 @@ static inline GLogDomain*
|
|||||||
g_log_find_domain (const gchar *log_domain)
|
g_log_find_domain (const gchar *log_domain)
|
||||||
{
|
{
|
||||||
register GLogDomain *domain;
|
register GLogDomain *domain;
|
||||||
|
|
||||||
domain = g_log_domains;
|
domain = g_log_domains;
|
||||||
while (domain)
|
while (domain)
|
||||||
{
|
{
|
||||||
@ -79,7 +79,7 @@ static inline GLogDomain*
|
|||||||
g_log_domain_new (const gchar *log_domain)
|
g_log_domain_new (const gchar *log_domain)
|
||||||
{
|
{
|
||||||
register GLogDomain *domain;
|
register GLogDomain *domain;
|
||||||
|
|
||||||
domain = g_new (GLogDomain, 1);
|
domain = g_new (GLogDomain, 1);
|
||||||
domain->log_domain = g_strdup (log_domain);
|
domain->log_domain = g_strdup (log_domain);
|
||||||
domain->fatal_mask = G_LOG_FATAL_MASK;
|
domain->fatal_mask = G_LOG_FATAL_MASK;
|
||||||
@ -266,7 +266,7 @@ g_logv (const gchar *log_domain,
|
|||||||
GLogFunc log_func;
|
GLogFunc log_func;
|
||||||
gpointer data = NULL;
|
gpointer data = NULL;
|
||||||
|
|
||||||
domain = g_log_find_domain (log_domain);
|
domain = g_log_find_domain (log_domain ? log_domain : "");
|
||||||
|
|
||||||
if (g_log_depth++)
|
if (g_log_depth++)
|
||||||
test_level |= G_LOG_FLAG_RECURSION;
|
test_level |= G_LOG_FLAG_RECURSION;
|
||||||
|
@ -64,7 +64,7 @@ static inline GLogDomain*
|
|||||||
g_log_find_domain (const gchar *log_domain)
|
g_log_find_domain (const gchar *log_domain)
|
||||||
{
|
{
|
||||||
register GLogDomain *domain;
|
register GLogDomain *domain;
|
||||||
|
|
||||||
domain = g_log_domains;
|
domain = g_log_domains;
|
||||||
while (domain)
|
while (domain)
|
||||||
{
|
{
|
||||||
@ -79,7 +79,7 @@ static inline GLogDomain*
|
|||||||
g_log_domain_new (const gchar *log_domain)
|
g_log_domain_new (const gchar *log_domain)
|
||||||
{
|
{
|
||||||
register GLogDomain *domain;
|
register GLogDomain *domain;
|
||||||
|
|
||||||
domain = g_new (GLogDomain, 1);
|
domain = g_new (GLogDomain, 1);
|
||||||
domain->log_domain = g_strdup (log_domain);
|
domain->log_domain = g_strdup (log_domain);
|
||||||
domain->fatal_mask = G_LOG_FATAL_MASK;
|
domain->fatal_mask = G_LOG_FATAL_MASK;
|
||||||
@ -266,7 +266,7 @@ g_logv (const gchar *log_domain,
|
|||||||
GLogFunc log_func;
|
GLogFunc log_func;
|
||||||
gpointer data = NULL;
|
gpointer data = NULL;
|
||||||
|
|
||||||
domain = g_log_find_domain (log_domain);
|
domain = g_log_find_domain (log_domain ? log_domain : "");
|
||||||
|
|
||||||
if (g_log_depth++)
|
if (g_log_depth++)
|
||||||
test_level |= G_LOG_FLAG_RECURSION;
|
test_level |= G_LOG_FLAG_RECURSION;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user