Match also UNC paths on Win32.

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

	* gutils.c (g_path_is_absolute): Match also UNC paths on Win32.

	* gthread.h: Include gtypes.h to be sure to get GLIB_VAR
	definition, remove definition from here.

	* gunicode.h: Remove duplicate GLIB_VAR definition from here, too.

	* gutils.c: (Win32) Use USERPROFILE as home dir if present. On
	Win2k, HOMEDRIVE and HOMEPATH aren't reliable.

	* Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.

	* makefile.mingw.in: Remove install target, Windows isn't Unix.

	* testgdate.c
	* testgdateparser.c
	* testglib.c: Undefine GLIB_COMPILATION.

	* glib.def: Updates.

	* .cvsignore
	* */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.

diff --git a/.cvsignore b/.cvsignore
index f08502b7a78e8e3ed9aaa636d81ca36a454d41c3..14cedf2bffc7d215bdd5527806969736d95d82bc 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,8 @@
 *.lo
+*.obj
+*.lib
+*.dll
+*.exe
 .deps
 .libs
 Makefile

diff --git a/ChangeLog b/ChangeLog
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1635b67165cafb6cf38d5b7c5e5719a4d4a5ddbd..db74a39fdaec5160de3683564f36e9493a55fd70 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,28 @@
+2001-02-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gutils.c (g_path_is_absolute): Match also UNC paths on Win32.
+
+       * gthread.h: Include gtypes.h to be sure to get GLIB_VAR
+       definition, remove definition from here.
+
+       * gunicode.h: Remove duplicate GLIB_VAR definition from here, too.
+
+       * gutils.c: (Win32) Use USERPROFILE as home dir if present. On
+       Win2k, HOMEDRIVE and HOMEPATH aren't reliable.
+       
+       * Makefile.am (INCLUDES): Add -DGLIB_COMPILATION.
+
+       * makefile.mingw.in: Remove install target, Windows isn't Unix.
+
+       * testgdate.c
+       * testgdateparser.c
+       * testglib.c: Undefine GLIB_COMPILATION.
+
+       * glib.def: Updates.
+
+       * .cvsignore
+       * */.cvsignore: Ignore also .obj, .dll, .lib and .exe files.
+
 2001-02-19  Hans Breuer <hans@breuer.org>
 
        * glib/glib.def, gobject/gobject.def : added nissing symbols

diff --git a/Makefile.am b/Makefile.am
index b6eff7731eee056ffb26c75bbd78b1a77a373bb0..fb7cea177a4b1a617932bd82935f1ce9554be5b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4
 SUBDIRS = . gobject gmodule gthread docs tests build
 
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-       -DG_DISABLE_COMPAT_H
+       -DG_DISABLE_COMPAT_H -DGLIB_COMPILATION
 
 EXTRA_DIST =                   \
        ChangeLog.pre-1-2       \

diff --git a/glib.def b/glib.def
index b1b97f537aac16cf3471154743352eefeb33c4a7..748602bcb2c6b1cc64a6851a01fcfcf481f875af 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -456,12 +456,17 @@ EXPORTS
        g_spawn_error_quark
        g_spawn_sync
        g_static_mutex_get_mutex_impl
+       g_static_private_free
        g_static_private_get
+       g_static_private_init
        g_static_private_set
+       g_static_rec_mutex_free
+       g_static_rec_mutex_init
        g_static_rec_mutex_lock
        g_static_rec_mutex_trylock
        g_static_rec_mutex_unlock
        g_static_rw_lock_free
+       g_static_rw_lock_init
        g_static_rw_lock_reader_lock
        g_static_rw_lock_reader_trylock
        g_static_rw_lock_reader_unlock

diff --git a/glib/Makefile.am b/glib/Makefile.am
index b6eff7731eee056ffb26c75bbd78b1a77a373bb0..fb7cea177a4b1a617932bd82935f1ce9554be5b7 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4
 SUBDIRS = . gobject gmodule gthread docs tests build
 
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-       -DG_DISABLE_COMPAT_H
+       -DG_DISABLE_COMPAT_H -DGLIB_COMPILATION
 
 EXTRA_DIST =                   \
        ChangeLog.pre-1-2       \

diff --git a/glib/glib.def b/glib/glib.def
index b1b97f537aac16cf3471154743352eefeb33c4a7..748602bcb2c6b1cc64a6851a01fcfcf481f875af 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -456,12 +456,17 @@ EXPORTS
        g_spawn_error_quark
        g_spawn_sync
        g_static_mutex_get_mutex_impl
+       g_static_private_free
        g_static_private_get
+       g_static_private_init
        g_static_private_set
+       g_static_rec_mutex_free
+       g_static_rec_mutex_init
        g_static_rec_mutex_lock
        g_static_rec_mutex_trylock
        g_static_rec_mutex_unlock
        g_static_rw_lock_free
+       g_static_rw_lock_init
        g_static_rw_lock_reader_lock
        g_static_rw_lock_reader_trylock
        g_static_rw_lock_reader_unlock

diff --git a/glib/gthread.h b/glib/gthread.h
index 44145d56ca156c08640b83e2d583f522c2169964..3452af408b3ce4025fdcea49ecf96e4d75fa9b3f 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -28,21 +28,10 @@
 #define __G_THREAD_H__
 
 #include <gerror.h>
+#include <gtypes.h>
 
 G_BEGIN_DECLS
 
-#ifndef GLIB_VAR
-#  ifdef G_OS_WIN32
-#    ifdef GLIB_COMPILATION
-#      define GLIB_VAR __declspec(dllexport)
-#    else /* !GLIB_COMPILATION */
-#      define GLIB_VAR extern __declspec(dllimport)
-#    endif /* !GLIB_COMPILATION */
-#  else /* !G_OS_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_OS_WIN32 */
-#endif /* GLIB_VAR */
-
 /* GLib Thread support
  */
 

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 2c43900af53a1593f94f4626bd114055a08a2d84..1abeced3d2b77c451205f120a126b5fe76491002 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -163,18 +163,6 @@ gunichar *g_unicode_canonical_decomposition (gunichar  ch,
  * We prefix variable declarations so they can
  * properly get exported in windows dlls.
  */
-#ifndef GLIB_VAR
-#  ifdef G_OS_WIN32
-#    ifdef GLIB_COMPILATION
-#      define GLIB_VAR __declspec(dllexport)
-#    else /* !GLIB_COMPILATION */
-#      define GLIB_VAR extern __declspec(dllimport)
-#    endif /* !GLIB_COMPILATION */
-#  else /* !G_OS_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_OS_WIN32 */
-#endif /* !GLIB_VAR */
-
 GLIB_VAR char g_utf8_skip[256];
 
 #define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])

diff --git a/glib/gutils.c b/glib/gutils.c
index 456be34504bc9ba000a2f80288b6231e69e5dcad..f474517edbd183b85796d45bc4dd02ead9bfe7f9 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -461,6 +461,9 @@ g_path_is_absolute (const gchar *file_name)
 #ifdef G_OS_WIN32
   if (isalpha (file_name[0]) && file_name[1] == ':' && file_name[2] == G_DIR_SEPARATOR)
     return TRUE;
+
+  if (file_name[0] == G_DIR_SEPARATOR && file_name[1] == G_DIR_SEPARATOR)
+    return TRUE;
 #endif
 
   return FALSE;
@@ -727,11 +730,20 @@ g_get_any_init (void)
          while ((p = strchr (g_home_dir, '/')) != NULL)
            *p = '\\';
        }
-      else
+
+      if (!g_home_dir)
+       {
+         /* USERPROFILE is probably the closest equivalent to $HOME? */
+         if (getenv ("USERPROFILE") != NULL)
+           g_home_dir = g_getenv ("USERPROFILE");
+       }
+
+      if (!g_home_dir)
        {
-         /* The official way to specify a home directory on NT is
-          * the HOMEDRIVE and HOMEPATH environment variables. At least
-          * it was at some time.
+         /* At least at some time, HOMEDRIVE and HOMEPATH were used
+          * to point to the home directory, I think. But on Windows
+          * 2000 HOMEDRIVE seems to be equal to SYSTEMDRIVE, and
+          * HOMEPATH is its root "\"?
           */
          if (getenv ("HOMEDRIVE") != NULL && getenv ("HOMEPATH") != NULL)
            {

diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in
index ef4f514db7a04f62fffd5115f5f3ba4f9c740a7c..338deb61180025d0a78d81b75de236d5e049b9df 100644 (file)
--- a/glib/makefile.mingw.in
+++ b/glib/makefile.mingw.in
@@ -3,10 +3,6 @@
 
 ## Use: make -f makefile.mingw
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH.
-BIN = /bin
-
 TOP = ..
 
 include build/win32/make.mingw
@@ -23,7 +19,7 @@ DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -D
 DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \
-       glib-$(GLIB_VER).dll            \
+       glib-$(GLIB_VER).dll            \
        sub-gmodule                     \
        sub-gthread                     \
        sub-gobject
@@ -37,9 +33,6 @@ all :                         \
        testgdate.exe           \
        testgdateparser.exe
 
-install : all
-       $(INSTALL) $(DLLS_TO_BUILD) $(BIN)
-
 glib_OBJECTS =                 \
        garray.o                \
        gasyncqueue.o           \

diff --git a/gmodule/.cvsignore b/gmodule/.cvsignore
index 7dbf34e5ec7fa793f472ed73bfec230be0b36ec0..7c2ba2b6176ca20219fd68b5de2d201c6d25076e 100644 (file)
--- a/gmodule/.cvsignore
+++ b/gmodule/.cvsignore
@@ -1,4 +1,7 @@
 *.lo
+*.obj
+*.lib
+*.dll
 Makefile
 Makefile.in
 makefile.msc

diff --git a/gobject/.cvsignore b/gobject/.cvsignore
index da49d2da0ee49a6dddcc54a545f0890d22c38c1f..db278ac5900e631c60101162dfbb4b4c62533d20 100644 (file)
--- a/gobject/.cvsignore
+++ b/gobject/.cvsignore
@@ -1,4 +1,8 @@
 *.lo
+*.obj
+*.lib
+*.dll
+*.exe
 Makefile
 Makefile.in
 makefile.msc

diff --git a/gthread.h b/gthread.h
index 44145d56ca156c08640b83e2d583f522c2169964..3452af408b3ce4025fdcea49ecf96e4d75fa9b3f 100644 (file)
--- a/gthread.h
+++ b/gthread.h
@@ -28,21 +28,10 @@
 #define __G_THREAD_H__
 
 #include <gerror.h>
+#include <gtypes.h>
 
 G_BEGIN_DECLS
 
-#ifndef GLIB_VAR
-#  ifdef G_OS_WIN32
-#    ifdef GLIB_COMPILATION
-#      define GLIB_VAR __declspec(dllexport)
-#    else /* !GLIB_COMPILATION */
-#      define GLIB_VAR extern __declspec(dllimport)
-#    endif /* !GLIB_COMPILATION */
-#  else /* !G_OS_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_OS_WIN32 */
-#endif /* GLIB_VAR */
-
 /* GLib Thread support
  */
 

diff --git a/gthread/.cvsignore b/gthread/.cvsignore
index 1dd61229bd34e6b7421c63e5212b6c1abe58a394..5baf327e9333a939d17f1efed603f2627e7f8c7b 100644 (file)
--- a/gthread/.cvsignore
+++ b/gthread/.cvsignore
@@ -5,6 +5,9 @@ Makefile
 .deps
 *.lo
 *.o
+*.obj
+*.lib
+*.dll
 .libs
 *.la
 so_locations

diff --git a/gunicode.h b/gunicode.h
index 2c43900af53a1593f94f4626bd114055a08a2d84..1abeced3d2b77c451205f120a126b5fe76491002 100644 (file)
--- a/gunicode.h
+++ b/gunicode.h
@@ -163,18 +163,6 @@ gunichar *g_unicode_canonical_decomposition (gunichar  ch,
  * We prefix variable declarations so they can
  * properly get exported in windows dlls.
  */
-#ifndef GLIB_VAR
-#  ifdef G_OS_WIN32
-#    ifdef GLIB_COMPILATION
-#      define GLIB_VAR __declspec(dllexport)
-#    else /* !GLIB_COMPILATION */
-#      define GLIB_VAR extern __declspec(dllimport)
-#    endif /* !GLIB_COMPILATION */
-#  else /* !G_OS_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_OS_WIN32 */
-#endif /* !GLIB_VAR */
-
 GLIB_VAR char g_utf8_skip[256];
 
 #define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])

diff --git a/gutils.c b/gutils.c
index 456be34504bc9ba000a2f80288b6231e69e5dcad..f474517edbd183b85796d45bc4dd02ead9bfe7f9 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -461,6 +461,9 @@ g_path_is_absolute (const gchar *file_name)
 #ifdef G_OS_WIN32
   if (isalpha (file_name[0]) && file_name[1] == ':' && file_name[2] == G_DIR_SEPARATOR)
     return TRUE;
+
+  if (file_name[0] == G_DIR_SEPARATOR && file_name[1] == G_DIR_SEPARATOR)
+    return TRUE;
 #endif
 
   return FALSE;
@@ -727,11 +730,20 @@ g_get_any_init (void)
          while ((p = strchr (g_home_dir, '/')) != NULL)
            *p = '\\';
        }
-      else
+
+      if (!g_home_dir)
+       {
+         /* USERPROFILE is probably the closest equivalent to $HOME? */
+         if (getenv ("USERPROFILE") != NULL)
+           g_home_dir = g_getenv ("USERPROFILE");
+       }
+
+      if (!g_home_dir)
        {
-         /* The official way to specify a home directory on NT is
-          * the HOMEDRIVE and HOMEPATH environment variables. At least
-          * it was at some time.
+         /* At least at some time, HOMEDRIVE and HOMEPATH were used
+          * to point to the home directory, I think. But on Windows
+          * 2000 HOMEDRIVE seems to be equal to SYSTEMDRIVE, and
+          * HOMEPATH is its root "\"?
           */
          if (getenv ("HOMEDRIVE") != NULL && getenv ("HOMEPATH") != NULL)
            {

diff --git a/makefile.mingw.in b/makefile.mingw.in
index ef4f514db7a04f62fffd5115f5f3ba4f9c740a7c..338deb61180025d0a78d81b75de236d5e049b9df 100644 (file)
--- a/makefile.mingw.in
+++ b/makefile.mingw.in
@@ -3,10 +3,6 @@
 
 ## Use: make -f makefile.mingw
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH.
-BIN = /bin
-
 TOP = ..
 
 include build/win32/make.mingw
@@ -23,7 +19,7 @@ DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -D
 DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
 
 DLLS_TO_BUILD =                                \
-       glib-$(GLIB_VER).dll            \
+       glib-$(GLIB_VER).dll            \
        sub-gmodule                     \
        sub-gthread                     \
        sub-gobject
@@ -37,9 +33,6 @@ all :                         \
        testgdate.exe           \
        testgdateparser.exe
 
-install : all
-       $(INSTALL) $(DLLS_TO_BUILD) $(BIN)
-
 glib_OBJECTS =                 \
        garray.o                \
        gasyncqueue.o           \

diff --git a/testgdate.c b/testgdate.c
index 8e3f7506692e3fc51a32b7c5ec9e4cf364d96f19..01365f3f9b5446fcf4ec03a8e282503f9396177a 100644 (file)
--- a/testgdate.c
+++ b/testgdate.c
@@ -1,3 +1,6 @@
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
 
 #include "glib.h"
 

diff --git a/testgdateparser.c b/testgdateparser.c
index 1e482ffb57c0b5ebec421f46f2285e93a7742718..c6be8238b322d2821d0a4ba7e1ce5a6fa7fc5afa 100644 (file)
--- a/testgdateparser.c
+++ b/testgdateparser.c
@@ -1,3 +1,6 @@
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
 
 #include "glib.h"
 

diff --git a/testglib.c b/testglib.c
index 35ca8146260f9c44ac76b255b074f315018f003f..32ede0242944eeb2fa4cf34bd36e8e9b92fc9612 100644 (file)
--- a/testglib.c
+++ b/testglib.c
@@ -28,6 +28,10 @@
 
 #undef G_LOG_DOMAIN
 
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

diff --git a/tests/.cvsignore b/tests/.cvsignore
index c2cd636e1896e14821590b222ef48df8cf0ca097..15bf597c8c8e4ba6389327a92c4ab65129118861 100644 (file)
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,4 +1,8 @@
 *.lo
+*.obj
+*.lib
+*.dll
+*.exe
 .deps
 .libs
 Makefile

diff --git a/tests/testgdate.c b/tests/testgdate.c
index 8e3f7506692e3fc51a32b7c5ec9e4cf364d96f19..01365f3f9b5446fcf4ec03a8e282503f9396177a 100644 (file)
--- a/tests/testgdate.c
+++ b/tests/testgdate.c
@@ -1,3 +1,6 @@
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
 
 #include "glib.h"
 

diff --git a/tests/testgdateparser.c b/tests/testgdateparser.c
index 1e482ffb57c0b5ebec421f46f2285e93a7742718..c6be8238b322d2821d0a4ba7e1ce5a6fa7fc5afa 100644 (file)
--- a/tests/testgdateparser.c
+++ b/tests/testgdateparser.c
@@ -1,3 +1,6 @@
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
 
 #include "glib.h"
 

diff --git a/tests/testglib.c b/tests/testglib.c
index 35ca8146260f9c44ac76b255b074f315018f003f..32ede0242944eeb2fa4cf34bd36e8e9b92fc9612 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -28,6 +28,10 @@
 
 #undef G_LOG_DOMAIN
 
+#ifdef GLIB_COMPILATION
+#undef GLIB_COMPILATION
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>