view src/libgsf-1-fixes.patch @ 4449:1933a9113e65

of-*: add octave as a dependancy to the of packages is binary enable is set (Bug #46235) * src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk, src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk, src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk, src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk, src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk, src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk, src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-queueing.mk, src/of-signal.mk, src/of-sockets.mk, src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk, src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk, src/of-zenity.mk, src/of-zeromq.mk: add $(PKG)_DEPS += $(OCTAVE_TARGET) if ENABLE_BINARY_PACKAGES = yes
author John D
date Mon, 14 Aug 2017 09:12:34 -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