summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuQun Yang <ymuqun@hdfgroup.org>2003-05-13 14:26:44 (GMT)
committerMuQun Yang <ymuqun@hdfgroup.org>2003-05-13 14:26:44 (GMT)
commitf666340233a3695d4a4cca683d4597e901c007cf (patch)
treeead1d9a5e265e74cd68091df31760cbfef247121
parent2ee6cdd91b10de605d187675ae2555ada896d635 (diff)
downloadhdf5-f666340233a3695d4a4cca683d4597e901c007cf.zip
hdf5-f666340233a3695d4a4cca683d4597e901c007cf.tar.gz
hdf5-f666340233a3695d4a4cca683d4597e901c007cf.tar.bz2
[svn-r6851] Purpose:
To add macro HDF5TESTDLL for windows libtest library. Description: Many HDF5 tests will use h5test.c. So we create a libtest library to 1) make tests more organized and 2) make tests more consistent with other platforms 3) reduce compiling times 4) reduce dumplicated warnings possibily generated by h5test.c However, we didn't create the corresponding libtest DLL correctly, now, some warnings are generated because of this; so for this release, we follow exactly DLL-DLL rules, to create an internal libtest DLL for our test suites. The application who used HDF5DLL will not have extra burdens to add HDF5TESTDLL and this will reflect in the release.txt Solution: USE DLL import and export library by defining macro HDF5TESTDLL and HDF5TESTUSEDLL Platforms tested: Windows 2000(the macro will not affect on non-WIN32 platforms). Misc. update:
-rw-r--r--src/H5api_adpt.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h
index 642f26e..d7f2bdf 100644
--- a/src/H5api_adpt.h
+++ b/src/H5api_adpt.h
@@ -34,6 +34,18 @@
#define H5_DLLVAR extern
#endif /* _HDF5DLL_ */
+#if defined(_HDF5TESTDLL_)
+#pragma warning(disable: 4273) /* Disable the dll linkage warnings */
+#define H5TEST_DLL __declspec(dllexport)
+#define H5TEST_DLLVAR __declspec(dllexport)
+#elif defined(_HDF5TESTUSEDLL_)
+#define H5TEST_DLL __declspec(dllimport)
+#define H5TEST_DLLVAR __declspec(dllimport)
+#else
+#define H5TEST_DLL
+#define H5TEST_DLLVAR extern
+#endif /* _HDF5TESTDLL_ */
+
// 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)