view src/libgsf-1-fixes.patch @ 3557:b1a7cff2d2a9

Add octave forge of-netcdf package (and support files) * src/of-netcdf.mk: New file. * src/netcdf.mk: Update checksum for version 4.3.0, install to DESTDIR. * src/hdf5.mk: make make and make install separate, modify libtool script to enable dynamic build of all sub libraries. * index.html: added of-netcdf * dist-files.mk: add of-netcdf.mk * Makefile.in: add of-netcdf * build_packages.m: add install of netcdf-1.0.2.tar.gz
author John Donoghue <john.donoghue@ieee.org>
date Thu, 06 Mar 2014 18:34:21 -0500
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