Index: glib/gtypes.h
===================================================================
RCS file: /cvs/gnome/glib/glib/gtypes.h,v
retrieving revision 1.15
diff -u -r1.15 gtypes.h
--- glib/gtypes.h	2 Dec 2003 01:31:41 -0000	1.15
+++ glib/gtypes.h	6 Apr 2004 09:37:06 -0000
@@ -396,7 +396,7 @@
  * properly get exported in windows dlls.
  */
 #ifndef GLIB_VAR
-#  ifdef G_PLATFORM_WIN32
+#  ifdef G_OS_WIN32
 #    ifdef GLIB_STATIC_COMPILATION
 #      define GLIB_VAR extern
 #    else /* !GLIB_STATIC_COMPILATION */
@@ -410,9 +410,9 @@
 #        define GLIB_VAR extern __declspec(dllimport)
 #      endif /* !GLIB_COMPILATION */
 #    endif /* !GLIB_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
+#  else /* !G_OS_WIN32 */
 #    define GLIB_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
+#  endif /* !G_OS_WIN32 */
 #endif /* GLIB_VAR */
 
 #endif /* __G_TYPES_H__ */
Index: gobject/gparamspecs.h
===================================================================
RCS file: /cvs/gnome/glib/gobject/gparamspecs.h,v
retrieving revision 1.22
diff -u -r1.22 gparamspecs.h
--- gobject/gparamspecs.h	21 Oct 2003 19:12:27 -0000	1.22
+++ gobject/gparamspecs.h	6 Apr 2004 09:37:07 -0000
@@ -400,7 +400,7 @@
  * properly get exported in windows dlls.
  */
 #ifndef GOBJECT_VAR
-#  ifdef G_PLATFORM_WIN32
+#  ifdef G_OS_WIN32
 #    ifdef GOBJECT_STATIC_COMPILATION
 #      define GOBJECT_VAR extern
 #    else /* !GOBJECT_STATIC_COMPILATION */
@@ -414,9 +414,9 @@
 #        define GOBJECT_VAR extern __declspec(dllimport)
 #      endif /* !GOBJECT_COMPILATION */
 #    endif /* !GOBJECT_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
+#  else /* !G_OS_WIN32 */
 #    define GOBJECT_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
+#  endif /* !G_OS_WIN32 */
 #endif /* GOBJECT_VAR */
 
 GOBJECT_VAR GType *g_param_spec_types;
