Mercurial > mxe-octave
view src/libgsf-1-fixes.patch @ 4467:b7d6a53fa46c
gcc: update to 7.1 with tools
* src/build-gcc.mk: update version 7.1.0
* src/cloog.mk: update 0.18.4
* src/gmp.mk: update 6.1.2
* src/isl.mk: update 0.16.1, add no-undefined flag
* src/mpfr.mk: update 3.1.6
* src/native-gcc.mk: update 7.1.0
* src/isl-1-fixes.patch: removed file
* dist-files.mk: remove reference to patch files, add mingw-w64 patch
* src/build-gcc-1-mingw-float.patch: removed patch
* src/native-gcc-1-mingw-float.patch: removed patch
* src/build-gcc-2-intrinsics.patch: removed patch
* src/native-gcc-2-intrinsics.patch: removed patch
* src/mingw-w64.mk: update to 5.0.2
* src/gcc-1-mingw-float.patch: remove patch
* src/gcc-2-darwin-no-pie.patch: remove patch
* src/mingw-w64-2-pthreads.patch: new file
* src/pthreads.mk: apply mingw patches to mingw sources before running configure
author | John D |
---|---|
date | Mon, 31 Jul 2017 16:53:21 -0400 |
parents | 8147e6f8659a |
children |
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 @@ -76,9 +76,17 @@ static GTypeModule *static_type_module = NULL; #include <windows.h> static HMODULE gsf_dll_hmodule; BOOL WINAPI +#ifdef DLL_EXPORT DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +#else +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +#endif BOOL WINAPI +#ifdef DLL_EXPORT DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) +#else +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) +#endif { if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; return TRUE; -- 1.7.1