diff -urN glib.old/glib/giowin32.c glib/glib/giowin32.c
--- glib.old/glib/giowin32.c	2003-11-22 19:28:04.000000000 +0000
+++ glib/glib/giowin32.c	2004-03-29 13:00:40.757720000 +0100
@@ -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 = {
diff -urN glib.old/glib/gmain.c glib/glib/gmain.c
--- glib.old/glib/gmain.c	2004-03-19 20:25:03.000000000 +0000
+++ glib/glib/gmain.c	2004-03-29 13:00:33.867812800 +0100
@@ -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 =
diff -urN glib.old/glib/gstrfuncs.c glib/glib/gstrfuncs.c
--- glib.old/glib/gstrfuncs.c	2004-02-26 23:43:45.000000000 +0000
+++ glib/glib/gstrfuncs.c	2004-03-29 13:00:17.714585600 +0100
@@ -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;
diff -urN glib.old/glib/gthread.c glib/glib/gthread.c
--- glib.old/glib/gthread.c	2004-03-05 21:10:45.000000000 +0000
+++ glib/glib/gthread.c	2004-03-29 13:00:05.557104000 +0100
@@ -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 = {
