mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-17 23:47:52 +02:00
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.
This commit is contained in:
@@ -81,16 +81,6 @@ const guint glib_micro_version = GLIB_MICRO_VERSION;
|
||||
const guint glib_interface_age = GLIB_INTERFACE_AGE;
|
||||
const guint glib_binary_age = GLIB_BINARY_AGE;
|
||||
|
||||
#if defined (NATIVE_WIN32) && defined (__LCC__)
|
||||
int __stdcall
|
||||
LibMain (void *hinstDll,
|
||||
unsigned long dwReason,
|
||||
void *reserved)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
#endif /* NATIVE_WIN32 && __LCC__ */
|
||||
|
||||
void
|
||||
g_atexit (GVoidFunc func)
|
||||
{
|
||||
@@ -736,7 +726,6 @@ g_iochannel_wakeup_peer (GIOChannel *channel)
|
||||
#endif /* Old IO Channels */
|
||||
|
||||
#ifdef NATIVE_WIN32
|
||||
#ifdef _MSC_VER
|
||||
|
||||
int
|
||||
gwin_ftruncate (gint fd,
|
||||
@@ -898,6 +887,4 @@ gwin_closedir (DIR *dir)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#endif /* NATIVE_WIN32 */
|
||||
|
Reference in New Issue
Block a user