Set G_LOG_DOMAIN as in Makefile.am.

2001-11-21  Tor Lillqvist  <tml@iki.fi>

	* glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
	Makefile.am.

gobject:

2001-11-22  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in Makefile.am.

	* gparamspecs.h (GOBJECT_VAR): Can't use GLIB_VAR here, as that
	makes sense only when building libglib. GOBJECT_VAR is similar for
	libgobject.

	* gobject.def: Add g_param_spec_types, remove
	g_type_fundamental_branch_last.

diff --git a/ChangeLog b/ChangeLog
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6b55f9c..0fb34d3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-21  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in
+       Makefile.am.
+
 Tue Nov 20 20:54:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gunidecomp.[ch] glib/gen-unicode-tables.pl: Patch

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index c48dd3b..ac9617c 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -12,7 +12,7 @@ include ../build/win32/make.mingw
 # Nothing much configurable below
 
 INCLUDES = -I . -I .. 
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG -DDLL_EXPORT
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG -DDLL_EXPORT
 DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
 
 all :                          \

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 91a7ec3..43a7a66 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,14 @@
+2001-11-22  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in Makefile.am.
+
+       * gparamspecs.h (GOBJECT_VAR): Can't use GLIB_VAR here, as that
+       makes sense only when building libglib. GOBJECT_VAR is similar for
+       libgobject.
+
+       * gobject.def: Add g_param_spec_types, remove
+       g_type_fundamental_branch_last.
+
 Wed Nov 21 17:23:33 2001  Tim Janik  <timj@gtk.org>
 
        * gparamspecs.[hc]: put newly created param spec types into a

diff --git a/gobject/gobject.def b/gobject/gobject.def
index 7284bcd..5c8f5e0 100644 (file)
--- a/gobject/gobject.def
+++ b/gobject/gobject.def
@@ -115,6 +115,7 @@ EXPORTS
        g_param_spec_sink
        g_param_spec_steal_qdata
        g_param_spec_string
+       g_param_spec_types
        g_param_spec_uchar
        g_param_spec_uint
        g_param_spec_uint64
@@ -186,7 +187,6 @@ EXPORTS
        g_type_depth
        g_type_free_instance
        g_type_from_name
-       g_type_fundamental_branch_last
        g_type_fundamental_last
        g_type_get_plugin
        g_type_get_qdata

diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 0b7584f..0a3bdf1 100644 (file)
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -384,7 +384,30 @@ GParamSpec*        g_param_spec_object      (const gchar    *name,
 
 
 /* --- internal --- */
-GLIB_VAR GType *g_param_spec_types;
+/* We prefix variable declarations so they can
+ * properly get exported in windows dlls.
+ */
+#ifndef GOBJECT_VAR
+#  ifdef G_PLATFORM_WIN32
+#    ifdef GOBJECT_STATIC_COMPILATION
+#      define GOBJECT_VAR extern
+#    else /* !GOBJECT_STATIC_COMPILATION */
+#      ifdef GOBJECT_COMPILATION
+#        ifdef DLL_EXPORT
+#          define GOBJECT_VAR __declspec(dllexport)
+#        else /* !DLL_EXPORT */
+#          define GOBJECT_VAR extern
+#        endif /* !DLL_EXPORT */
+#      else /* !GOBJECT_COMPILATION */
+#        define GOBJECT_VAR extern __declspec(dllimport)
+#      endif /* !GOBJECT_COMPILATION */
+#    endif /* !GOBJECT_STATIC_COMPILATION */
+#  else /* !G_PLATFORM_WIN32 */
+#    define GOBJECT_VAR extern
+#  endif /* !G_PLATFORM_WIN32 */
+#endif /* GOBJECT_VAR */
+
+GOBJECT_VAR GType *g_param_spec_types;
 
 G_END_DECLS
 

diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in
index ab6a40a..6dc784c 100644 (file)
--- a/gobject/makefile.mingw.in
+++ b/gobject/makefile.mingw.in
@@ -12,7 +12,7 @@ include ../build/win32/make.mingw
 # Nothing much configurable below
 
 INCLUDES = -I .. -I ../glib -I .
-DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
+DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" -DG_ENABLE_DEBUG
 
 srcdir=.