diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-06-23 08:00:32 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2015-06-23 08:03:55 (GMT) |
| commit | 20c129dfb686f03a6e6080c4cf12e1f175054a41 (patch) | |
| tree | a6d28874e81bfa78727816ff01a6108eb38f6dea /src/hdf4-2-dllimport.patch | |
| parent | 63692baca1210dad2d25abcc0b257c99096cc016 (diff) | |
| download | mxe-20c129dfb686f03a6e6080c4cf12e1f175054a41.zip mxe-20c129dfb686f03a6e6080c4cf12e1f175054a41.tar.gz mxe-20c129dfb686f03a6e6080c4cf12e1f175054a41.tar.bz2 | |
hdf4: Fix implicit dllimport
Fixes #732.
Diffstat (limited to 'src/hdf4-2-dllimport.patch')
| -rw-r--r-- | src/hdf4-2-dllimport.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/hdf4-2-dllimport.patch b/src/hdf4-2-dllimport.patch new file mode 100644 index 0000000..247be10 --- /dev/null +++ b/src/hdf4-2-dllimport.patch @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 64a2de1fe219d0b2717f5f79320467800501491c Mon Sep 17 00:00:00 2001 +From: MXE +Date: Tue, 23 Jun 2015 03:54:33 -0400 +Subject: [PATCH] Remove implicit _HDFDLL_ hack + + +diff --git a/hdf/src/H4api_adpt.h b/hdf/src/H4api_adpt.h +index e3f7f55..1c5d22d 100644 +--- a/hdf/src/H4api_adpt.h ++++ b/hdf/src/H4api_adpt.h +@@ -150,11 +150,6 @@ + * Under _WIN32 we have single threaded static libraries, or + * mutli-threaded DLLs using the multithreaded runtime DLLs. + **/ +-# if defined(_MT) && defined(_DLL) &&!defined(_HDFDLL_) +-/* If the user really meant to use _HDFDLL_, but he forgot, just define it. */ +-# define _HDFDLL_ +-# endif +- + # if !defined(_MT) && defined(_HDFDLL_) + # error To use the HDF libraries from a single-threaded project, you must use static HDF libraries + # error Undefine the macro "_HDFDLL_" +-- +1.9.1 + |