Mercurial > mxe-octave
view src/libgsf-1-fixes.patch @ 2661:3567da505594
json-c update to version 0.10, using github downloads.
Squashed commit of the following:
commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 23:16:59 2012 +0200
Patches for:
- missing file
- remove check for rpl_* functions
commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 19:08:40 2012 +0200
Fixed indentation
commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 01:13:08 2012 +0200
json-c compiles correctly (finally).
commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date: Fri Jul 13 22:16:41 2012 +0200
Changes to json-c files according to current MXE standards.
commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date: Thu Jul 12 22:27:54 2012 +0200
Update to json-c 0.10, and use github repository.
author | Thomas Mayer <thomas@residuum.org> |
---|---|
date | Tue, 17 Jul 2012 23:18:18 +0200 |
parents | f73f450e0115 |
children | 8147e6f8659a |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 From: MXE Date: Fri, 24 Sep 2010 23:34:26 +0200 Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain, diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c index d7a7247..cc52d99 100644 --- a/gsf/gsf-utils.c +++ b/gsf/gsf-utils.c @@ -115,9 +115,9 @@ static GTypeModule *static_type_module = NULL; #include <windows.h> static HMODULE gsf_dll_hmodule; BOOL WINAPI -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) { if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; return TRUE; -- 1.7.1