Mercurial > mxe-octave

annotate src/libgsf-2-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
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 908f4325d4977e67dc1d1840ce3e67bb9492de71 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:34:26 +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/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
13 index 4e54b09..b8261e5 100644
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/gsf/gsf-utils.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/gsf/gsf-utils.c
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -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
17 #include <windows.h>
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 static HMODULE gsf_dll_hmodule;
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -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 +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
22 BOOL WINAPI
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 -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 +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
25 {
92877f4655f9 remove stray DllMain from packages libgsf and gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 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
27 return TRUE;
1219
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
28 --
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
29 1.7.1
ffb6a86b8f9a improved patch layout
Mark Brand <mabrand@mabrand.nl>
parents: 1192
diff changeset
30