diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-12 17:33:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-12 17:33:25 +0000 |
| commit | f6d2369fd02d4171dcf51d1c70df6c0cc61333a5 (patch) | |
| tree | 9bdb208871ff2d89108c2fc70b9d55bd212628c5 | |
| parent | 3521c4b6ce12477548af221faeb7650320320f44 (diff) | |
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=/branches/glib-2-12/; revision=5250
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | glib/gthread.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,10 @@ 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 gcc 2.95. (#329031, David Schleef, Marc Brockschmidt) diff --git a/glib/gthread.c b/glib/gthread.c index de8855fdc..69c15e958 100644 --- 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 |