From 66107ac7e1002713d9197ceb7225b8aa6ca74144 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 7 Mar 2001 14:22:25 +0000 Subject: [PATCH] Set G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule. 2001-03-07 Sebastian Wilhelmi * Makefile.am, makefile.mingw.in, makefile.msc.in: Set G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule. * gmodule.def, gmodule.h, gmodule.c: Removed g_log_domain_gmodule. * docs/reference/glib/glib-sections.txt, docs/reference/glib/tmpl/messages.sgml: Removed g_log_domain_gmodule. --- docs/reference/ChangeLog | 5 +++++ docs/reference/glib/glib-sections.txt | 1 - docs/reference/glib/tmpl/messages.sgml | 6 ------ gmodule/ChangeLog | 7 +++++++ gmodule/Makefile.am | 2 +- gmodule/gmodule.c | 1 - gmodule/gmodule.def | 1 - gmodule/gmodule.h | 1 - gmodule/makefile.mingw.in | 2 +- gmodule/makefile.msc.in | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index fd3aad8..98dad92 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2001-03-07 Sebastian Wilhelmi + + * glib/glib-sections.txt, glib/tmpl/messages.sgml: Removed + g_log_domain_gmodule. + 2001-02-23 Sebastian Wilhelmi * glib/tmpl/threads.sgml: Big update. Almost ready. diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index a7b6948..c2bbb37 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -693,7 +693,6 @@ G_BREAKPOINT messages G_LOG_DOMAIN g_log_domain_glib -g_log_domain_gmodule G_LOG_FATAL_MASK G_LOG_LEVEL_USER_SHIFT GLogFunc diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml index 13edc57..2b19d61 100644 --- a/docs/reference/glib/tmpl/messages.sgml +++ b/docs/reference/glib/tmpl/messages.sgml @@ -44,12 +44,6 @@ INCLUDES = \ - - - - - - GLib log levels that are considered fatal by default. diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 2e81920..ad2b325 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,10 @@ +2001-03-07 Sebastian Wilhelmi + + * Makefile.am, makefile.mingw.in, makefile.msc.in: Set + G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule. + + * gmodule.def, gmodule.h, gmodule.c: Removed g_log_domain_gmodule. + 2001-02-17 Havoc Pennington Applied patch from Soeren Sandmann: diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 497d4c6..7bac888 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \ - -DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@ + -DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ EXTRA_DIST = \ makefile.mingw.in \ diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index 29848a3..b735fea 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -82,7 +82,6 @@ static inline GModule* g_module_find_by_name (const gchar *name); /* --- variables --- */ -const char *g_log_domain_gmodule = "GModule"; static GModule *modules = NULL; static GModule *main_module = NULL; static GStaticPrivate module_error_private = G_STATIC_PRIVATE_INIT; diff --git a/gmodule/gmodule.def b/gmodule/gmodule.def index 5af8869..11e0d5d 100644 --- a/gmodule/gmodule.def +++ b/gmodule/gmodule.def @@ -1,5 +1,4 @@ EXPORTS - g_log_domain_gmodule g_module_build_path g_module_close g_module_error diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 18d0353..39d00d7 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -27,7 +27,6 @@ #ifndef __GMODULE_H__ #define __GMODULE_H__ -extern const char *g_log_domain_gmodule; #include #ifdef __cplusplus diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in index 5ce374f..c21511f 100644 --- a/gmodule/makefile.mingw.in +++ b/gmodule/makefile.mingw.in @@ -15,7 +15,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ # Nothing much configurable below INCLUDES = -I .. -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG +DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG BUILD_DLL = ../build-dll diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in index ebc9d4d..47b3c0e 100644 --- a/gmodule/makefile.msc.in +++ b/gmodule/makefile.msc.in @@ -13,7 +13,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ # Nothing much configurable below INCLUDES = -I .. -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG +DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG all : \ gmoduleconf.h \ -- 2.7.4