Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
1218:e8e0dd3ce3e7 1219:ffb6a86b8f9a
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 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 5
9 s,DllMain,static _disabled_DllMain, 6 From 908f4325d4977e67dc1d1840ce3e67bb9492de71 Mon Sep 17 00:00:00 2001
7 From: mingw-cross-env
8 Date: Fri, 24 Sep 2010 23:34:26 +0200
9 Subject: [PATCH] s,DllMain,static _disabled_DllMain,
10
10 11
11 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c 12 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
12 index 4e54b09..b8261e5 100644 13 index 4e54b09..b8261e5 100644
13 --- a/gsf/gsf-utils.c 14 --- a/gsf/gsf-utils.c
14 +++ b/gsf/gsf-utils.c 15 +++ b/gsf/gsf-utils.c
22 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) 23 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
23 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) 24 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
24 { 25 {
25 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; 26 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
26 return TRUE; 27 return TRUE;
28 --
29 1.7.1
30