philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r5931]

Browse Source 
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
This commit is contained in:
MuQun Yang
2002-09-20 15:36:09 -05:00
parent 2aca3b77d6
commit e5b28ef37b
51 changed files with 1042 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/H5api_adpt.h
View File

@@ -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 */