diff options
author | Tor Lillqvist <tml@src.gnome.org> | 1999-04-24 13:52:51 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 1999-04-24 13:52:51 +0000 |
commit | 2aa1277d60f63d283a955d40cc681f1d30a067e8 (patch) | |
tree | 536d4653239139bc39cc6dff0505f13297ab5e35 /gmain.c | |
parent | 0269749a67899057d1e861d9b0beebd8e84ae067 (diff) | |
download | glib-2aa1277d60f63d283a955d40cc681f1d30a067e8.tar.gz |
Support added for building using a GNU toolchain on Win32,
i.e. gcc -mno-cygwin on cygwin (a.k.a. mingw32, using egcs-1.1.2).
* README.win32: Updated.
* build-dll makefile.cygwin tests/makefile.cygwin: New files.
* glib.h glib.def glibconfig.h.win32 makefile.msc: Slight updates.
* gmain.c: No need to include <fcntl.h> and <io.h> on Win32.
* gmain.c gutils.c testglib.c tests/string-test.c: Test for
NATIVE_WIN32, not _MSC_VER.
* gmutex.c: Must declare g_thread_functions_for_glib_use as
exported (using the GUTILS_C_VAR macro).
* gutils.c gmodule/libgplugin_[ab].c: LibMain not needed.
* gmodule/gmoduleconf.h.win32: Need underscore with gcc.
* gthread/gthread.c: With gcc on Win32, must use memcpy to assign
value of g_thread_functions_for_glib_use (?).
* makefile.msc tests/makefile.msc: Cosmetics.
Diffstat (limited to 'gmain.c')
-rw-r--r-- | gmain.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -54,11 +54,6 @@ #include <windows.h> #endif /* NATIVE_WIN32 */ -#ifdef _MSC_VER -#include <fcntl.h> -#include <io.h> -#endif /* _MSC_VER */ - /* Types */ typedef struct _GTimeoutData GTimeoutData; @@ -576,7 +571,7 @@ g_source_remove_by_funcs_user_data (GSourceFuncs *funcs, void g_get_current_time (GTimeVal *result) { -#ifndef _MSC_VER +#ifndef NATIVE_WIN32 struct timeval r; g_return_if_fail (result != NULL); |