diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-03-22 20:46:19 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-03-22 20:46:19 +0000 |
| commit | 142219f278b625341a152436ce7fc72670e25bc4 (patch) | |
| tree | 5991530422cc0263444a7d6a99d561f2e3811879 /glib | |
| parent | 5a470fc8d72b866eb30cd08ddb8da53a7d7a76d7 (diff) | |
| download | glib-142219f278b625341a152436ce7fc72670e25bc4.tar.gz | |
Move Win32-only includes after inclusion of glib.h, so that G_OS_WIN32 is
2000-03-22 Tor Lillqvist <tml@iki.fi>
* gutils.c: Move Win32-only includes after inclusion of glib.h, so
that G_OS_WIN32 is defined.
* glibconfig.h.win32.in: Add GSystemThread.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gutils.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/glib/gutils.c b/glib/gutils.c index aad31927f..30c3bb755 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -48,16 +48,6 @@ #include <sys/param.h> #endif -#ifdef G_OS_WIN32 -# define STRICT /* Strict typing, please */ -# include <windows.h> -# include <errno.h> -# include <ctype.h> -# ifdef _MSC_VER -# include <io.h> -# endif /* _MSC_VER */ -#endif /* G_OS_WIN32 */ - /* implement Glib's inline functions */ #define G_INLINE_FUNC extern @@ -74,6 +64,14 @@ #define G_PATH_LENGTH 2048 #endif +#ifdef G_OS_WIN32 +# define STRICT /* Strict typing, please */ +# include <windows.h> +# include <ctype.h> +# include <direct.h> +# include <io.h> +#endif /* G_OS_WIN32 */ + const guint glib_major_version = GLIB_MAJOR_VERSION; const guint glib_minor_version = GLIB_MINOR_VERSION; const guint glib_micro_version = GLIB_MICRO_VERSION; @@ -481,7 +479,7 @@ g_get_any_init (void) g_free (homepath); } } -#endif /* !G_OS_WIN32 */ +#endif /* G_OS_WIN32 */ #ifdef HAVE_PWD_H { |