Include windows.h and fix include order. (#394258, Kazuki Iwamoto)

2007-01-12  Matthias Clasen  <mclasen@redhat.com>

        * glib/gthread.c: Include windows.h and fix
        include order. (#394258, Kazuki Iwamoto)

svn path=/trunk/; revision=5249

diff --git a/ChangeLog b/ChangeLog
index 230cfaff911474c1dc876cae29146c4fb6e7c631..e9182833ad7bd4ad06c748fee98defcf4e4a10bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gthread.c: Include windows.h and fix
+       include order. (#394258, Kazuki Iwamoto)
+
 2007-01-12  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Make G_GNUC_INTERNAL a no-op for

diff --git a/glib/gthread.c b/glib/gthread.c
index de8855fdc2b6db7948b8623a3ff71ac9795bb984..69c15e958048dd857b8f77e6de4af438d82dc488 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -34,19 +34,21 @@
 
 #include "config.h"
 
+#include "glib.h"
+#include "gthreadprivate.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #ifndef G_OS_WIN32
+#include <windows.h>
 #include <sys/time.h>
 #include <time.h>
 #endif /* G_OS_WIN32 */
 
 #include <string.h>
 
-#include "glib.h"
-#include "gthreadprivate.h"
 #include "galias.h"
 
 GQuark