diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2004-10-28 15:58:23 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2004-10-28 15:58:23 (GMT) |
| commit | f733047affdca1575fed02f4a6feaf65efd815ab (patch) | |
| tree | 4d7e607428c614e3116bcd301e7f6ad4e320f416 /src/H5api_adpt.h | |
| parent | d101a1d4d12a4b5901701c8ed7ff37bd8b20d9e2 (diff) | |
| download | hdf5-f733047affdca1575fed02f4a6feaf65efd815ab.zip hdf5-f733047affdca1575fed02f4a6feaf65efd815ab.tar.gz hdf5-f733047affdca1575fed02f4a6feaf65efd815ab.tar.bz2 | |
[svn-r9479] Purpose:
To help Fortran DLL supports with DEC Fortran 6.6c.
Description:
Need to export and import more symbols to make Fortran DLL work.
Solution:
Separate C and Fortran for both library and test.
Platforms tested:
VC 6.0 on windows XP + DEC fortran 6.6c
Linux 2.4 (gcc+ pgf90)
(no need for h5committest since the change is trivial)
Misc. update:
Diffstat (limited to 'src/H5api_adpt.h')
| -rw-r--r-- | src/H5api_adpt.h | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index d2af250..b02dd45 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -25,7 +25,7 @@ #if defined(_HDF5DLL_) #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ #define H5_DLL __declspec(dllexport) -#define H5_DLLVAR __declspec(dllexport) +#define H5_DLLVAR extern __declspec(dllexport) #elif defined(_HDF5USEDLL_) #define H5_DLL __declspec(dllimport) #define H5_DLLVAR __declspec(dllimport) @@ -37,7 +37,7 @@ #if defined(_HDF5TESTDLL_) #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ #define H5TEST_DLL __declspec(dllexport) -#define H5TEST_DLLVAR __declspec(dllexport) +#define H5TEST_DLLVAR extern __declspec(dllexport) #elif defined(_HDF5TESTUSEDLL_) #define H5TEST_DLL __declspec(dllimport) #define H5TEST_DLLVAR __declspec(dllimport) @@ -46,6 +46,32 @@ #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 extern __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_ */ + +#if defined(HDF5FORTTEST_CSTUB_DLL_EXPORTS) +#pragma warning(disable: 4273) /* Disable the dll linkage warnings */ +#define H5_FCTESTDLL __declspec(dllexport) +#define H5_FCTESTDLLVAR extern __declspec(dllexport) +#elif defined(HDF5FORTTEST_CSTUB_USEDLL) +#define H5_FCTESTDLL __declspec(dllimport) +#define H5_FCTESTDLLVAR __declspec(dllimport) +#else +#define H5_FCTESTDLL +#define H5_FCTESTDLLVAR 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 +87,10 @@ #define H5_DLLCPP #define H5TEST_DLL #define H5TEST_DLLVAR extern +#define H5_FCDLL +#define H5_FCDLLVAR extern +#define H5_FCTESTDLL +#define H5_FCTESTDLLVAR extern #endif #endif /* H5API_ADPT_H */ |