Mercurial > mxe-octave

comparison src/libgsf-2-fixes.patch @ 1192:92877f4655f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove stray DllMain from packages libgsf and gdk-pixbuf These caused a problem linking librsvg.
author Mark Brand <mabrand@mabrand.nl>
date Fri, 24 Sep 2010 23:54:15 +0200
parents
children ffb6a86b8f9a
comparison
equal deleted inserted replaced
1191:1acdcff4d88a 1192:92877f4655f9
1 This file is part of mingw-cross-env.
2 See doc/index.html for further information.
3
4 Contains ad hoc patches for cross building.
5 commit 908f4325d4977e67dc1d1840ce3e67bb9492de71
6 Author: Mark Brand <mabrand@mabrand.nl>
7 Date: Fri Sep 24 23:34:26 2010 +0200
8
9 s,DllMain,static _disabled_DllMain,
10
11 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
12 index 4e54b09..b8261e5 100644
13 --- a/gsf/gsf-utils.c
14 +++ b/gsf/gsf-utils.c
15 @@ -109,9 +109,9 @@ static GTypeModule *static_type_module = NULL;
16 #include <windows.h>
17 static HMODULE gsf_dll_hmodule;
18 BOOL WINAPI
19 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
20 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
21 BOOL WINAPI
22 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
23 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
24 {
25 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
26 return TRUE;