From cd89e4cca6d203c3f3324d7368bbbd6634bc11d3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 21 Feb 2001 12:41:28 +0000 Subject: [PATCH] Match also UNC paths on Win32. 2001-02-21 Tor Lillqvist * 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. --- .cvsignore | 4 ++++ ChangeLog | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-0 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-10 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-12 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-2 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-4 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-6 | 25 +++++++++++++++++++++++++ ChangeLog.pre-2-8 | 25 +++++++++++++++++++++++++ Makefile.am | 2 +- glib.def | 5 +++++ glib/Makefile.am | 2 +- glib/glib.def | 5 +++++ glib/gthread.h | 13 +------------ glib/gunicode.h | 12 ------------ glib/gutils.c | 20 ++++++++++++++++---- glib/makefile.mingw.in | 9 +-------- gmodule/.cvsignore | 3 +++ gobject/.cvsignore | 4 ++++ gthread.h | 13 +------------ gthread/.cvsignore | 3 +++ gunicode.h | 12 ------------ gutils.c | 20 ++++++++++++++++---- makefile.mingw.in | 9 +-------- testgdate.c | 3 +++ testgdateparser.c | 3 +++ testglib.c | 4 ++++ tests/.cvsignore | 4 ++++ tests/testgdate.c | 3 +++ tests/testgdateparser.c | 3 +++ tests/testglib.c | 4 ++++ 31 files changed, 286 insertions(+), 74 deletions(-) diff --git a/.cvsignore b/.cvsignore index f08502b7a..14cedf2bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,8 @@ *.lo +*.obj +*.lib +*.dll +*.exe .deps .libs Makefile diff --git a/ChangeLog b/ChangeLog index 1635b6716..db74a39fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1635b6716..db74a39fd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,28 @@ +2001-02-21 Tor Lillqvist + + * 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 * glib/glib.def, gobject/gobject.def : added nissing symbols diff --git a/Makefile.am b/Makefile.am index b6eff7731..fb7cea177 100644 --- 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 b1b97f537..748602bcb 100644 --- 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 b6eff7731..fb7cea177 100644 --- 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 b1b97f537..748602bcb 100644 --- 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 44145d56c..3452af408 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -28,21 +28,10 @@ #define __G_THREAD_H__ #include +#include 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 2c43900af..1abeced3d 100644 --- 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 456be3450..f474517ed 100644 --- 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) { - /* The official way to specify a home directory on NT is - * the HOMEDRIVE and HOMEPATH environment variables. At least - * it was at some time. + /* USERPROFILE is probably the closest equivalent to $HOME? */ + if (getenv ("USERPROFILE") != NULL) + g_home_dir = g_getenv ("USERPROFILE"); + } + + if (!g_home_dir) + { + /* 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 ef4f514db..338deb611 100644 --- 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 7dbf34e5e..7c2ba2b61 100644 --- 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 da49d2da0..db278ac59 100644 --- 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 44145d56c..3452af408 100644 --- a/gthread.h +++ b/gthread.h @@ -28,21 +28,10 @@ #define __G_THREAD_H__ #include +#include 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 1dd61229b..5baf327e9 100644 --- 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 2c43900af..1abeced3d 100644 --- 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 456be3450..f474517ed 100644 --- 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) { - /* The official way to specify a home directory on NT is - * the HOMEDRIVE and HOMEPATH environment variables. At least - * it was at some time. + /* USERPROFILE is probably the closest equivalent to $HOME? */ + if (getenv ("USERPROFILE") != NULL) + g_home_dir = g_getenv ("USERPROFILE"); + } + + if (!g_home_dir) + { + /* 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 ef4f514db..338deb611 100644 --- 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 8e3f75066..01365f3f9 100644 --- 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 1e482ffb5..c6be8238b 100644 --- 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 35ca81462..32ede0242 100644 --- a/testglib.c +++ b/testglib.c @@ -28,6 +28,10 @@ #undef G_LOG_DOMAIN +#ifdef GLIB_COMPILATION +#undef GLIB_COMPILATION +#endif + #include #include #include diff --git a/tests/.cvsignore b/tests/.cvsignore index c2cd636e1..15bf597c8 100644 --- 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 8e3f75066..01365f3f9 100644 --- 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 1e482ffb5..c6be8238b 100644 --- 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 35ca81462..32ede0242 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -28,6 +28,10 @@ #undef G_LOG_DOMAIN +#ifdef GLIB_COMPILATION +#undef GLIB_COMPILATION +#endif + #include #include #include