Mercurial > mxe-octave

comparison src/libgsf-1-fixes.patch @ 3135:8147e6f8659a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable libgsf compilation - bump version to 1.14.27 - update generic patch - add MSVC-specific patch
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 13 Jul 2013 00:35:02 -0400
parents f73f450e0115
children
comparison
equal deleted inserted replaced
3134:d0564e676d38 3135:8147e6f8659a
11 11
12 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c 12 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
13 index d7a7247..cc52d99 100644 13 index d7a7247..cc52d99 100644
14 --- a/gsf/gsf-utils.c 14 --- a/gsf/gsf-utils.c
15 +++ b/gsf/gsf-utils.c 15 +++ b/gsf/gsf-utils.c
16 @@ -115,9 +115,9 @@ static GTypeModule *static_type_module = NULL; 16 @@ -76,9 +76,17 @@ static GTypeModule *static_type_module = NULL;
17 #include <windows.h> 17 #include <windows.h>
18 static HMODULE gsf_dll_hmodule; 18 static HMODULE gsf_dll_hmodule;
19 BOOL WINAPI 19 BOOL WINAPI
20 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); 20 +#ifdef DLL_EXPORT
21 DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
22 +#else
21 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); 23 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
24 +#endif
22 BOOL WINAPI 25 BOOL WINAPI
23 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) 26 +#ifdef DLL_EXPORT
27 DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
28 +#else
24 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) 29 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
30 +#endif
25 { 31 {
26 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; 32 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
27 return TRUE; 33 return TRUE;
28 -- 34 --
29 1.7.1 35 1.7.1