Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 commit 908f4325d4977e67dc1d1840ce3e67bb9492de71
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 Author: Mark Brand <mabrand@mabrand.nl>
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Date: Fri Sep 24 23:34:26 2010 +0200
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 s,DllMain,static _disabled_DllMain,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 index 4e54b09..b8261e5 100644
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 --- a/gsf/gsf-utils.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 +++ b/gsf/gsf-utils.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 @@ -109,9 +109,9 @@ static GTypeModule *static_type_module = NULL;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 #include <windows.h>
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 static HMODULE gsf_dll_hmodule;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 {
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 return TRUE;