Mercurial > mxe-octave

comparison src/glib-2-DllMain.patch @ 2615:7e5aaa010a02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package glib
author Hans Petter Jansson <hpj@cl.no>
date Mon, 04 Jun 2012 18:02:11 +0200
parents d35b16275627
children
comparison
equal deleted inserted replaced
2614:1f6e698fb89e 2615:7e5aaa010a02
1 This file is part of MXE.
2 See index.html for further information.
3
4 Avoid DllMain symbol conflict when linking statically.
5
1 diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c 6 diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c
2 --- glib-2.28.8-orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100 7 --- glib-2.28.8-orig/gio/giomodule.c 2011-01-05 22:44:06.000000000 +0100
3 +++ glib/gio/giomodule.c 2011-11-23 21:04:43.867004895 +0100 8 +++ glib/gio/giomodule.c 2011-11-23 21:04:43.867004895 +0100
4 @@ -489,10 +489,8 @@ 9 @@ -489,10 +489,8 @@
5 10
20 -#endif 25 -#endif
21 - 26 -
22 #undef GIO_MODULE_DIR 27 #undef GIO_MODULE_DIR
23 28
24 /* GIO_MODULE_DIR is used only in code called just once, 29 /* GIO_MODULE_DIR is used only in code called just once,
25 diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c 30 diff --git a/glib/glib-init.c b/glib/glib-init.c
26 --- glib-2.28.8-orig/glib/gutils.c 2011-06-06 01:18:49.000000000 +0200 31 index f4edd5c..02bf678 100644
27 +++ glib/glib/gutils.c 2011-11-23 21:05:07.822988144 +0100 32 --- a/glib/glib-init.c
28 @@ -144,10 +144,8 @@ 33 +++ b/glib/glib-init.c
34 @@ -226,9 +226,9 @@ glib_init (void)
35 HMODULE glib_dll;
29 36
30 static HMODULE glib_dll = NULL;
31
32 -#ifdef DLL_EXPORT
33 -
34 BOOL WINAPI 37 BOOL WINAPI
35 -DllMain (HINSTANCE hinstDLL, 38 -DllMain (HINSTANCE hinstDLL,
39 - DWORD fdwReason,
40 - LPVOID lpvReserved)
36 +glib_DllMain (HINSTANCE hinstDLL, 41 +glib_DllMain (HINSTANCE hinstDLL,
37 DWORD fdwReason, 42 + DWORD fdwReason,
38 LPVOID lpvReserved) 43 + LPVOID lpvReserved)
39 { 44 {
40 @@ -157,8 +155,6 @@ 45 switch (fdwReason)
41 return TRUE; 46 {
42 }
43
44 -#endif
45 -
46 gchar *
47 _glib_get_dll_directory (void)
48 {
49 @@ -166,10 +162,8 @@
50 gchar *p;
51 wchar_t wc_fn[MAX_PATH];
52
53 -#ifdef DLL_EXPORT
54 if (glib_dll == NULL)
55 return NULL;
56 -#endif
57
58 /* This code is different from that in
59 * g_win32_get_package_installation_directory_of_module() in that