Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.

2000-12-29  Tor Lillqvist  <tml@iki.fi>

	* glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.

	* glib.def: Update.

	* {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.

diff --git a/ChangeLog b/ChangeLog
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 45d7835..582d21d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-12-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glibconfig.h.win32.in: Add GLIB_SIZEOF_VOID_P and GLIB_SIZEOF_LONG.
+
+       * glib.def: Update.
+
+       * {.,*}/makefile.{mingw,msc}.in: Add -DG_ENABLE_DEBUG.
+       
 Fri Dec 29 14:53:18 2000  Tim Janik  <timj@gtk.org>
 
        * configure.in: we can't grow _cv_ variables by using a backticked

diff --git a/glib.def b/glib.def
index 596db36..d56b87b 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -245,7 +245,6 @@ EXPORTS
        g_markup_parse_context_get_position
        g_markup_parse_context_new
        g_markup_parse_context_parse
-       g_mem_check
        g_mem_chunk_alloc
        g_mem_chunk_alloc0
        g_mem_chunk_clean
@@ -257,6 +256,7 @@ EXPORTS
        g_mem_chunk_reset
        g_mem_init
        g_mem_profile
+       g_mem_set_vtable
        g_memdup
        g_messages_init
        g_mkstemp

diff --git a/glib/glib.def b/glib/glib.def
index 596db36..d56b87b 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -245,7 +245,6 @@ EXPORTS
        g_markup_parse_context_get_position
        g_markup_parse_context_new
        g_markup_parse_context_parse
-       g_mem_check
        g_mem_chunk_alloc
        g_mem_chunk_alloc0
        g_mem_chunk_clean
@@ -257,6 +256,7 @@ EXPORTS
        g_mem_chunk_reset
        g_mem_init
        g_mem_profile
+       g_mem_set_vtable
        g_memdup
        g_messages_init
        g_mkstemp

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index 1ba1fd3..1b0f1be 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -19,7 +19,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
 DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 6891af9..49f92ea 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -17,7 +17,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
 DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                        \

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index a20493a..3e31ad3 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -82,6 +82,9 @@ typedef unsigned long long guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
+#define GLIB_SIZEOF_VOID_P 4
+#define GLIB_SIZEOF_LONG   4
+
 typedef gint32 gssize;
 typedef guint32 gsize;
 

diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in
index f90a2ce..58423f7 100644 (file)
--- 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
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG
 
 BUILD_DLL = ../build-dll
 

diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index 7bd97de..ebc9d4d 100644 (file)
--- 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
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG
 
 all : \
        gmoduleconf.h \

diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in
index 5bdb682..6625d07 100644 (file)
--- a/gobject/makefile.mingw.in
+++ b/gobject/makefile.mingw.in
@@ -3,7 +3,6 @@
 
 ## Use: make -f makefile.mingw
 
-
 TOP = ../..
 
 include ../build/win32/make.mingw
@@ -16,13 +15,13 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .. -I .
-DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime
+DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
 
 srcdir=.
 
 BUILD_DLL = ../build-dll
 
-all :                          \
+all : \
        gobject-$(GLIB_VER).dll \
        glib-genmarshal.exe
 

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 4730aa6..709854e 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/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 -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime
+DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
 
 all :                          \
        gobject-$(GLIB_VER).dll \

diff --git a/gthread/makefile.mingw.in b/gthread/makefile.mingw.in
index d38ab6d..f97c4fe 100644 (file)
--- a/gthread/makefile.mingw.in
+++ b/gthread/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=\"GThread\"
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG
 DEPCFLAGS = $(PTHREAD_CFLAGS)
 
 BUILD_DLL = ../build-dll

diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index 5450af0..0e5aab6 100644 (file)
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.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=\"GThread\"
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG
 DEPCFLAGS = $(PTHREAD_CFLAGS)
 
 all : \

diff --git a/makefile.mingw.in b/makefile.mingw.in
index 1ba1fd3..1b0f1be 100644 (file)
--- a/makefile.mingw.in
+++ b/makefile.mingw.in
@@ -19,7 +19,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
 DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \

diff --git a/makefile.msc.in b/makefile.msc.in
index 6891af9..49f92ea 100644 (file)
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -17,7 +17,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
 DEPCFLAGS = $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                        \