? gtk-doc.make
? tests/foobar
? tests/lt-module-test.exe.stackdump
? tests/test.txt
? tests/tmp.txt
Index: glib/giowin32.c
===================================================================
RCS file: /cvs/gnome/glib/glib/giowin32.c,v
retrieving revision 1.53
diff -u -r1.53 giowin32.c
--- glib/giowin32.c	22 Nov 2003 19:28:04 -0000	1.53
+++ glib/giowin32.c	8 Apr 2004 15:48:24 -0000
@@ -734,7 +734,7 @@
   UNLOCK (channel->mutex);
 }
 
-#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
+#if defined(G_OS_WIN32) && defined(__GNUC__)
 __declspec(dllexport)
 #endif
 GSourceFuncs g_io_watch_funcs = {
Index: glib/gmain.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gmain.c,v
retrieving revision 1.116
diff -u -r1.116 gmain.c
--- glib/gmain.c	19 Mar 2004 20:25:03 -0000	1.116
+++ glib/gmain.c	8 Apr 2004 15:48:27 -0000
@@ -271,7 +271,7 @@
 G_LOCK_DEFINE_STATIC (main_context_list);
 static GSList *main_context_list = NULL;
 
-#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
+#if defined(G_OS_WIN32) && defined(__GNUC__)
 __declspec(dllexport)
 #endif
 GSourceFuncs g_timeout_funcs =
@@ -290,7 +290,7 @@
   NULL
 };
 
-#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
+#if defined(G_OS_WIN32) && defined(__GNUC__)
 __declspec(dllexport)
 #endif
 GSourceFuncs g_idle_funcs =
Index: glib/gstrfuncs.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gstrfuncs.c,v
retrieving revision 1.105
diff -u -r1.105 gstrfuncs.c
--- glib/gstrfuncs.c	26 Feb 2004 23:43:45 -0000	1.105
+++ glib/gstrfuncs.c	8 Apr 2004 15:48:30 -0000
@@ -75,7 +75,7 @@
   /* the upper 128 are all zeroes */
 };
 
-#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
+#if defined(G_OS_WIN32) && defined(__GNUC__)
 __declspec(dllexport)
 #endif
 const guint16 * const g_ascii_table = ascii_table_data;
Index: glib/gthread.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gthread.c,v
retrieving revision 1.38
diff -u -r1.38 gthread.c
--- glib/gthread.c	5 Mar 2004 21:10:45 -0000	1.38
+++ glib/gthread.c	8 Apr 2004 15:48:30 -0000
@@ -95,7 +95,7 @@
 gboolean g_thread_use_default_impl = TRUE;
 gboolean g_threads_got_initialized = FALSE;
 
-#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
+#if defined(G_OS_WIN32) && defined(__GNUC__)
 __declspec(dllexport)
 #endif
 GThreadFunctions g_thread_functions_for_glib_use = {
Index: glib/libcharset/localcharset.c
===================================================================
RCS file: /cvs/gnome/glib/glib/libcharset/localcharset.c,v
retrieving revision 1.4
diff -u -r1.4 localcharset.c
--- glib/libcharset/localcharset.c	15 Dec 2002 01:35:07 -0000	1.4
+++ glib/libcharset/localcharset.c	8 Apr 2004 15:48:32 -0000
@@ -23,6 +23,8 @@
 # include <config.h>
 #endif
 
+#include <glibconfig.h>
+
 #if HAVE_STDDEF_H
 # include <stddef.h>
 #endif
@@ -37,6 +39,10 @@
 # include <stdlib.h>
 #endif
 
+#if defined G_PLATFORM_WIN32
+# define _WIN32 1
+#endif
+
 #if defined _WIN32 || defined __WIN32__
 # undef WIN32   /* avoid warning on mingw32 */
 # define WIN32
Index: tests/uri-test.c
===================================================================
RCS file: /cvs/gnome/glib/tests/uri-test.c,v
retrieving revision 1.8
diff -u -r1.8 uri-test.c
--- tests/uri-test.c	30 Mar 2003 21:24:58 -0000	1.8
+++ tests/uri-test.c	8 Apr 2004 15:48:32 -0000
@@ -61,7 +61,7 @@
   { "c:\\windows", "otherhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
 #endif
   { "etc", "localhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
   /* g_filename_to_utf8 uses current code page on Win32, these tests assume that
    * local filenames *are* in UTF-8.
    */
