Mercurial > mxe-octave

annotate src/libgsf-1-fixes.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children f73f450e0115
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1888
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1220
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1888
diff changeset
7 From: MXE
1220
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Fri, 24 Sep 2010 23:34:26 +0200
1888
b2d6ef366242 package libgsf: gettext/intltool configure patch no longer required
Tony Theodore <tonyt@logyst.com>
parents: 1220
diff changeset
9 Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
1220
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index d7a7247..cc52d99 100644
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/gsf/gsf-utils.c
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/gsf/gsf-utils.c
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -119,9 +119,9 @@ static GTypeModule *static_type_module = NULL;
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 #include <windows.h>
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 static HMODULE gsf_dll_hmodule;
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 BOOL WINAPI
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 BOOL WINAPI
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 {
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 return TRUE;
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 --
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 1.7.1
7e21c525c51f combined patch files
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30