diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2002-09-20 20:36:09 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2002-09-20 20:36:09 (GMT) |
| commit | e5b28ef37b6cb97211e37f0900a97b14c97daf57 (patch) | |
| tree | 123dce5773a6041fd75d9572a553a044219b01a3 /src/H5api_adpt.h | |
| parent | 2aca3b77d63aa78d16262e23d929f2c13570a2d5 (diff) | |
| download | hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.zip hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.tar.gz hdf5-e5b28ef37b6cb97211e37f0900a97b14c97daf57.tar.bz2 | |
[svn-r5931]
Purpose:
__DLL__ is a keyword in some platforms and __DLL__ is also defined as a macro for windows DLL applications.
That causes problems.
Description:
Solution:
Use H5_DLL*** to replace __DLL***__ at all header files.
Change the macro defination at H5api_adpt.h.
Platforms tested:
linux2.2.18smp, irix64, solaris 2.7 and windows 2000
Diffstat (limited to 'src/H5api_adpt.h')
| -rw-r--r-- | src/H5api_adpt.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index 1c72c2e..0c553b3 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -10,29 +10,29 @@ #if defined(_HDF5DLL_) #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ -#define __DLL__ __declspec(dllexport) -#define __DLLVAR__ __declspec(dllexport) +#define H5_DLL __declspec(dllexport) +#define H5_DLLVAR __declspec(dllexport) #elif defined(_HDF5USEDLL_) -#define __DLL__ __declspec(dllimport) -#define __DLLVAR__ __declspec(dllimport) +#define H5_DLL __declspec(dllimport) +#define H5_DLLVAR __declspec(dllimport) #else -#define __DLL__ -#define __DLLVAR__ extern +#define H5_DLL +#define H5_DLLVAR extern #endif /* _HDF5DLL_ */ // Added to export or to import C++ APIs - BMR (02-15-2002) #if defined(HDF5_CPPDLL_EXPORTS) // this name is generated at creation -#define __DLLCPP__ __declspec(dllexport) +#define H5_DLLCPP __declspec(dllexport) #elif defined(HDF5CPP_USEDLL) -#define __DLLCPP__ __declspec(dllimport) +#define H5_DLLCPP __declspec(dllimport) #else -#define __DLLCPP__ +#define H5_DLLCPP #endif /* HDF5_CPPDLL_EXPORTS */ #else /*WIN32*/ -#define __DLL__ -#define __DLLVAR__ extern -#define __DLLCPP__ +#define H5_DLL +#define H5_DLLVAR extern +#define H5_DLLCPP #endif #endif /* H5API_ADPT_H */ |