Mercurial > mxe-octave

annotate src/gdk-pixbuf-1-fixes.patch @ 1219:ffb6a86b8f9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patch layout Use "git format-patch" instead of "git log -p --reverse" to generate patches which can be imported with with "git am". Also set author/from to "mingw-cross-env" since attribution is done in the mingw-cross-env repository.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 19:42:33 +0200
parents 92877f4655f9
children 10b34eba8a06
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
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
6 From d5e7a81cbe6339e1d0dbf97f8814c28e2c806d80 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
7 From: mingw-cross-env
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
8 Date: Fri, 24 Sep 2010 23:31:24 +0200
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
9 Subject: [PATCH] s,DllMain,static _disabled_DllMain,
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
10
1192
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 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
13 index aa4964f..c925934 100644
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- 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
15 +++ 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
16 @@ -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
17
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 #ifdef G_OS_WIN32
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -/* 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 +/* 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
22
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 static HMODULE gdk_pixbuf_dll;
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 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 -DllMain (HINSTANCE hinstDLL,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 +static _disabled_DllMain (HINSTANCE hinstDLL,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 DWORD fdwReason,
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 LPVOID lpvReserved)
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 {
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
31 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
32 1.7.1
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
33