From 2a1e065579f9a001d1727ec3882225eb2c07f88f Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Mon, 3 May 2004 10:30:10 -0500 Subject: [svn-r8467] Purpose: Fixing building Fortran DLL on windows Description: Fortran DLL needs to separate C stub DLL from Fortran DLL. So we need to use another keyword H5_FCDLL to replace the old H5_DLL for C stub library. Solution: Add another section at H5api_adpt.h to define a macro block for Fortran C stub library. Platforms tested: Manual tests. Copper is not accessible. Only test on arabica and eirene with fortran enabled. Misc. update: --- src/H5api_adpt.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index d2af250..401dddf 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -46,6 +46,18 @@ #define H5TEST_DLLVAR extern #endif /* _HDF5TESTDLL_ */ +#if defined(HDF5FORT_CSTUB_DLL_EXPORTS) +#pragma warning(disable: 4273) /* Disable the dll linkage warnings */ +#define H5_FCDLL __declspec(dllexport) +#define H5_FCDLLVAR __declspec(dllexport) +#elif defined(HDF5FORT_CSTUB_USEDLL) +#define H5_FCDLL __declspec(dllimport) +#define H5_FCDLLVAR __declspec(dllimport) +#else +#define H5_FCDLL +#define H5_FCDLLVAR extern +#endif /* _HDF5_FORTRANDLL_EXPORTS_ */ + /* Added to export or to import C++ APIs - BMR (02-15-2002) */ #if defined(HDF5_CPPDLL_EXPORTS) /* this name is generated at creation */ #define H5_DLLCPP __declspec(dllexport) @@ -61,6 +73,8 @@ #define H5_DLLCPP #define H5TEST_DLL #define H5TEST_DLLVAR extern +#define H5_FCDLL +#define H5_FCDLLVAR extern #endif #endif /* H5API_ADPT_H */ -- cgit v0.12