diff options
| author | Matthias Gehre <M.Gehre@gmx.de> | 2012-04-14 20:06:52 (GMT) |
|---|---|---|
| committer | Matthias Gehre <M.Gehre@gmx.de> | 2012-04-14 20:06:52 (GMT) |
| commit | cdaffc615025d1a50a2c30409abd801f0079266b (patch) | |
| tree | 363953d82426dba2729f9cd41885654123b8b1eb /src | |
| parent | 72694c70c3ce9956a3d0705e0ace72228b9d618a (diff) | |
| download | mxe-cdaffc615025d1a50a2c30409abd801f0079266b.zip mxe-cdaffc615025d1a50a2c30409abd801f0079266b.tar.gz mxe-cdaffc615025d1a50a2c30409abd801f0079266b.tar.bz2 | |
glib: Add DllMain alias gio_DllMain/glib_DllMain
Diffstat (limited to 'src')
| -rw-r--r-- | src/glib-2-DllMain.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/src/glib-2-DllMain.patch b/src/glib-2-DllMain.patch new file mode 100644 index 0000000..4ed2ac5 --- /dev/null +++ b/src/glib-2-DllMain.patch @@ -0,0 +1,59 @@ +diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c +--- glib-2.28.8-orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100 ++++ glib/gio/giomodule.c 2011-11-23 21:04:43.867004895 +0100 +@@ -489,10 +489,8 @@ + + static HMODULE gio_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++gio_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -502,8 +500,6 @@ + return TRUE; + } + +-#endif +- + #undef GIO_MODULE_DIR + + /* GIO_MODULE_DIR is used only in code called just once, +diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c +--- glib-2.28.8-orig/glib/gutils.c 2011-06-06 01:18:49.000000000 +0200 ++++ glib/glib/gutils.c 2011-11-23 21:05:07.822988144 +0100 +@@ -144,10 +144,8 @@ + + static HMODULE glib_dll = NULL; + +-#ifdef DLL_EXPORT +- + BOOL WINAPI +-DllMain (HINSTANCE hinstDLL, ++glib_DllMain (HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) + { +@@ -157,8 +155,6 @@ + return TRUE; + } + +-#endif +- + gchar * + _glib_get_dll_directory (void) + { +@@ -166,10 +162,8 @@ + gchar *p; + wchar_t wc_fn[MAX_PATH]; + +-#ifdef DLL_EXPORT + if (glib_dll == NULL) + return NULL; +-#endif + + /* This code is different from that in + * g_win32_get_package_installation_directory_of_module() in that |