[glib] Revert "Improvde #include order consistency"
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "Improvde #include order consistency"
- Date: Tue, 15 Jan 2013 11:36:09 +0000 (UTC)
commit 38229d47d1996fd046258f09d705d8247bf176ae
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jan 15 15:47:17 2013 +0800
Revert "Improvde #include order consistency"
This reverts commit f2e00a07f49d6ad0e8d790396bcdea913592ce33.
Moving the block up would prevent G_OS_WIN32 being checked correctly as
it is a macro that is defined by including the GLib header(s), at least for
Visual C++ builds.
https://bugzilla.gnome.org/show_bug.cgi?id=691769
gobject/glib-genmarshal.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index c6083ed..6ef6ea7 100644
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -29,10 +29,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef G_OS_WIN32
-#include <io.h>
-#endif
-
#include <glib/gstdio.h>
#undef G_LOG_DOMAIN
@@ -40,6 +36,10 @@
#include <glib.h>
#include <glib/gprintf.h>
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
/* --- defines --- */
#define PRG_NAME "glib-genmarshal"
#define PKG_NAME "GLib"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]