Mercurial > mxe-octave

annotate src/gdk-pixbuf-1-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 d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80
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:31:24 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/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 index aa4964f..c925934 100644
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 --- a/gdk-pixbuf/gdk-pixbuf-io.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 +++ b/gdk-pixbuf/gdk-pixbuf-io.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 @@ -226,12 +226,12 @@ skip_space (const char **pos)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 #ifdef G_OS_WIN32
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 -/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 +/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 static HMODULE gdk_pixbuf_dll;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 -DllMain (HINSTANCE hinstDLL,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 +static _disabled_DllMain (HINSTANCE hinstDLL,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 DWORD fdwReason,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 LPVOID lpvReserved)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 {