handle galiasdef.c (although completely useless for msvc build)

2005-03-18  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in : handle galiasdef.c (although completely
	useless for msvc build)

	* glib/gbacktrace.c glib/gmessage.c : need at least _WIN_VER 0x0401
	for IsDebuggerPresent()

	* gobject/makefile.msc.in : handle gobjectaliasdef.c

diff --git a/ChangeLog b/ChangeLog
index 84f95dba00b1baf5829a2dbae32aafcafffdb152..de99651dd83e4ff5ae571ac6188820fa205355ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-18  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : handle galiasdef.c (although completely 
+       useless for msvc build)
+
+       * glib/gbacktrace.c glib/gmessage.c : need at least _WIN_VER 0x0401
+       for IsDebuggerPresent()
+
 2005-03-17  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gkeyfile.c: Update the documentation, reflecting the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 84f95dba00b1baf5829a2dbae32aafcafffdb152..de99651dd83e4ff5ae571ac6188820fa205355ee 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-03-18  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : handle galiasdef.c (although completely 
+       useless for msvc build)
+
+       * glib/gbacktrace.c glib/gmessage.c : need at least _WIN_VER 0x0401
+       for IsDebuggerPresent()
+
 2005-03-17  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gkeyfile.c: Update the documentation, reflecting the

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 84f95dba00b1baf5829a2dbae32aafcafffdb152..de99651dd83e4ff5ae571ac6188820fa205355ee 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2005-03-18  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : handle galiasdef.c (although completely 
+       useless for msvc build)
+
+       * glib/gbacktrace.c glib/gmessage.c : need at least _WIN_VER 0x0401
+       for IsDebuggerPresent()
+
 2005-03-17  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gkeyfile.c: Update the documentation, reflecting the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 84f95dba00b1baf5829a2dbae32aafcafffdb152..de99651dd83e4ff5ae571ac6188820fa205355ee 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-03-18  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : handle galiasdef.c (although completely 
+       useless for msvc build)
+
+       * glib/gbacktrace.c glib/gmessage.c : need at least _WIN_VER 0x0401
+       for IsDebuggerPresent()
+
 2005-03-17  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gkeyfile.c: Update the documentation, reflecting the

diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 64c412e2f6bd77a3f7fb0459f7b64c8153b73e7e..ac30b00e942886406c1dd02c67cbac0629887e27 100644 (file)
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -61,6 +61,7 @@
 
 #ifdef G_OS_WIN32
 #  define STRICT               /* Strict typing, please */
+#  define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */
 #  include <windows.h>
 #  undef STRICT
 #endif

diff --git a/glib/gmessages.c b/glib/gmessages.c
index c3adab75b46ff9dbad037e684b6e00a24c0b89ec..42019e6434c97b2f3830095134cc0676cdcc1aac 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -49,6 +49,10 @@
 
 #ifdef G_OS_WIN32
 #include <io.h>
+#  define STRICT               /* Strict typing, please */
+#  define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */
+#  include <windows.h>
+#  undef STRICT
 #endif
 
 /* --- structures --- */

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index d5029bf310559b1e126876dfcb449bed3b056386..6d64684c078c21e0daecefaa083fd3c0ea3b3ade 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -15,6 +15,7 @@ all :                         \
        ..\config.h             \
        ..\glibconfig.h \
        galias.h                \
+       galiasdef.c             \
        gnulib\gnulib.lib       \
        libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
        glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
@@ -87,12 +88,15 @@ glib_OBJECTS =                      \
 galias.h: glib.symbols
        perl makegalias.pl < glib.symbols > galias.h
 
+galiasdef.c: glib.symbols
+         perl makegalias.pl -def < glib.symbols > galiasdef.c
+
 localcharset.c : libcharset/localcharset.c
        copy libcharset\localcharset.c localcharset.c
 
 glib.def: glib.symbols
        echo EXPORTS > glib.def
-       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS glib.symbols >> glib.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES glib.symbols >> glib.def
 
 glib.res : glib.rc
        rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index c73f4d7de83f6b70515541f439da4743ec852cb5..102b8a6b0a31b8ba94630bda6f55427b9ca61c70 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-18  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc.in : handle gobjectaliasdef.c
+
 2005-03-14  Matthias Clasen  <mclasen@redhat.com>
 
        Make PLT-reduction work with gcc4, and don't include

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 56035659ba2592d3fbf19433890c1c882a65011d..de512492143ea26190f7d21b91589ee546436d8b 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -18,6 +18,7 @@ all :                         \
        gmarshal.h              \
        gmarshal.c              \
        gobjectalias.h  \
+       gobjectaliasdef.c \
        gmarshal.strings \
        gobject-query.exe \
        libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll       \
@@ -44,9 +45,12 @@ gobject_OBJECTS =            \
 gobjectalias.h: gobject.symbols
        perl makegobjectalias.pl < gobject.symbols > gobjectalias.h
 
+gobjectaliasdef.c: gobject.symbols
+       perl makegobjectalias.pl -def < gobject.symbols > gobjectaliasdef.c
+
 gobject.def: gobject.symbols
        echo EXPORTS > gobject.def
-       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gobject.symbols >> gobject.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES gobject.symbols >> gobject.def
 
 gobject.res : gobject.rc
        rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc