From 6b55164587cc96639e8c2d082ecb29ee7b0ff0bb Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 18 Mar 2005 17:44:51 +0000 Subject: [PATCH] handle galiasdef.c (although completely useless for msvc build) 2005-03-18 Hans Breuer * 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 --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/gbacktrace.c | 1 + glib/gmessages.c | 4 ++++ glib/makefile.msc.in | 6 +++++- gobject/ChangeLog | 4 ++++ gobject/makefile.msc.in | 6 +++++- 9 files changed, 51 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84f95dba0..de99651dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-18 Hans Breuer + + * 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 * glib/gkeyfile.c: Update the documentation, reflecting the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 84f95dba0..de99651dd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-03-18 Hans Breuer + + * 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 * glib/gkeyfile.c: Update the documentation, reflecting the diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 84f95dba0..de99651dd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2005-03-18 Hans Breuer + + * 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 * glib/gkeyfile.c: Update the documentation, reflecting the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 84f95dba0..de99651dd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-03-18 Hans Breuer + + * 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 * glib/gkeyfile.c: Update the documentation, reflecting the diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c index 64c412e2f..ac30b00e9 100644 --- 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 # undef STRICT #endif diff --git a/glib/gmessages.c b/glib/gmessages.c index c3adab75b..42019e643 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -49,6 +49,10 @@ #ifdef G_OS_WIN32 #include +# define STRICT /* Strict typing, please */ +# define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */ +# include +# undef STRICT #endif /* --- structures --- */ diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index d5029bf31..6d64684c0 100644 --- 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 c73f4d7de..102b8a6b0 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +2005-03-18 Hans Breuer + + * makefile.msc.in : handle gobjectaliasdef.c + 2005-03-14 Matthias Clasen Make PLT-reduction work with gcc4, and don't include diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index 56035659b..de5124921 100644 --- 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