luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-28 12:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move Win32-only includes after inclusion of glib.h, so that G_OS_WIN32 is

Browse Source 
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.
This commit is contained in:
Tor Lillqvist
2000-03-22 20:46:19 +00:00
committed by Tor Lillqvist
parent 5a470fc8d7
commit 142219f278
11 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gutils.c
View File

@@ -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
{