win32 patch from Tor Lillqvist (glib-tml-981027-0), fixes some minor

win32 buglets

-Yosh

diff --git a/ChangeLog b/ChangeLog
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f555ed4..552ef24 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glibconfig.h.win32
+       * gutils.c
+       * makefile.msc: win32 patch from Tor Lillqvist (glib-tml-981027-0),
+       fixes some minor win32 buglets
+
 Mon Oct 26 22:12:03 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glib.h: reimplemented the endian stuff, using inline asm

diff --git a/glib/gutils.c b/glib/gutils.c
index b451b98..4062243 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -322,14 +322,16 @@ g_get_current_dir (void)
 gchar*
 g_getenv (const gchar *variable)
 {
+#ifndef NATIVE_WIN32
   g_return_val_if_fail (variable != NULL, NULL);
 
-#ifndef NATIVE_WIN32
   return getenv (variable);
 #else
   gchar *v;
   guint l, k;
   gchar *p;
+
+  g_return_val_if_fail (variable != NULL, NULL);
   
   v = getenv (variable);
   if (!v)

diff --git a/glibconfig.h.win32 b/glibconfig.h.win32
index 4380c26..11035a2 100644 (file)
--- a/glibconfig.h.win32
+++ b/glibconfig.h.win32
@@ -21,6 +21,10 @@
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+/* #undef WORDS_BIGENDIAN */
+
 /* #undef ENABLE_MEM_CHECK */
 /* #undef ENABLE_MEM_PROFILE */
 

diff --git a/gutils.c b/gutils.c
index b451b98..4062243 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -322,14 +322,16 @@ g_get_current_dir (void)
 gchar*
 g_getenv (const gchar *variable)
 {
+#ifndef NATIVE_WIN32
   g_return_val_if_fail (variable != NULL, NULL);
 
-#ifndef NATIVE_WIN32
   return getenv (variable);
 #else
   gchar *v;
   guint l, k;
   gchar *p;
+
+  g_return_val_if_fail (variable != NULL, NULL);
   
   v = getenv (variable);
   if (!v)

diff --git a/makefile.msc b/makefile.msc
index b8980fd..4798fdd 100644 (file)
--- a/makefile.msc
+++ b/makefile.msc
@@ -63,7 +63,7 @@ gmodule_OBJECTS = \
        gmodule.obj
 
 gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS)
-       $(CC) $(CFLAGS) -MD -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def
+       $(CC) $(CFLAGS) -MD -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
 
 gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c
        $(CC) $(CFLAGS) -Igmodule -c -DG_LIB_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c