From: Hans Breuer <hans@breuer.org>
Date: Fri, 27 Jun 2008 09:59:30 +0000 (+0000)
Subject: move G_OS_WIN32 inclusion of <io.h> down to where G_OS_WIN32 will be
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3ed6102555694a585bfa46a71b6c8d2671278cd8;p=dana%2Fcg-glib.git

move G_OS_WIN32 inclusion of <io.h> down to where G_OS_WIN32 will be

2008-06-27  Hans Breuer  <hans@breuer.org>

	* glib-genmarshal.c : move G_OS_WIN32 inclusion of <io.h> down to
	where G_OS_WIN32 will be defined (#540047, Kazuki IWAMOTO)

svn path=/trunk/; revision=7100
---

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 370f7a61..b91e2e95 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-27  Hans Breuer  <hans@breuer.org>
+
+	* glib-genmarshal.c : move G_OS_WIN32 inclusion of <io.h> down to
+	where G_OS_WIN32 will be defined (#540047, Kazuki IWAMOTO)
+
 2008-06-22  Michael Natterer  <mitch@imendio.com>
 
 	* *.c: remove trailing whitespace from newly added gtk-doc
diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index 4de9932e..26b55d3b 100644
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -29,15 +29,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef G_OS_WIN32
-#include <io.h>
-#endif
-
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "GLib-Genmarshal"
 #include <glib.h>
 #include <glib/gprintf.h>
 
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 /* --- defines --- */
 #define	PRG_NAME	"glib-genmarshal"