--- glib/glib/gconvert.c	2003-12-13 14:38:18.000000000 +0000
+++ glib.new/glib/gconvert.c	2004-03-29 15:15:11.723198400 +0100
@@ -990,7 +990,7 @@
 		      charset, "UTF-8", bytes_read, bytes_written, error);
 }
 
-#ifndef G_PLATFORM_WIN32
+#ifndef G_OS_WIN32
 
 typedef struct _GFilenameCharsetCache GFilenameCharsetCache;
 
@@ -1087,14 +1087,14 @@
   return cache->is_utf8;
 }
 
-#else /* G_PLATFORM_WIN32 */
+#else /* G_OS_WIN32 */
 static gboolean
 get_filename_charset (const gchar **filename_charset) 
 {
   g_get_charset (filename_charset);
   return FALSE;
 }
-#endif /* G_PLATFORM_WIN32 */
+#endif /* G_OS_WIN32 */
 
 /* This is called from g_thread_init(). It's used to
  * initialize some static data in a threadsafe way.
