summaryrefslogtreecommitdiffstats
path: root/src/H5PLextern.h
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-09-25 17:31:54 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-09-25 17:31:54 (GMT)
commit0773ea2f19f4338030b72ba0e99534253e38215f (patch)
tree3de8cb75095236955c70e442886261518dd644b3 /src/H5PLextern.h
parent39f52896fff40b50296ab9d6d75c4181b9c9c606 (diff)
downloadhdf5-0773ea2f19f4338030b72ba0e99534253e38215f.zip
hdf5-0773ea2f19f4338030b72ba0e99534253e38215f.tar.gz
hdf5-0773ea2f19f4338030b72ba0e99534253e38215f.tar.bz2
[svn-r25619] Include plugin header change. H5PLextern.h and H5PLprivate.h have two opposing use cases, only the enum is common.
Tested: local linux and windows
Diffstat (limited to 'src/H5PLextern.h')
-rw-r--r--src/H5PLextern.h40
1 files changed, 6 insertions, 34 deletions
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index f94101d..6a51a1d 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -36,40 +36,12 @@ typedef enum H5PL_type_t {
} H5PL_type_t;
-#ifdef H5_BUILT_AS_DYNAMIC_LIB
-
- #if defined (hdf5_EXPORTS)
- /* hdf5 library imports from plugin */
- #if defined (_MSC_VER) /* MSVC Compiler Case */
- #define H5PLUGIN_DLL __declspec(dllimport)
- #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
- #define H5PLUGIN_DLL __attribute__ ((visibility("default")))
- #endif
- #else
- /* plugins always export */
- #if defined (_MSC_VER) /* MSVC Compiler Case */
- #define H5PLUGIN_DLL __declspec(dllexport)
- #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
- #define H5PLUGIN_DLL __attribute__ ((visibility("default")))
- #endif
- #endif
-
-#elif defined(H5_BUILT_AS_STATIC_LIB)
- #define H5PLUGIN_DLL
-#else
-
- #if defined(H5_HAVE_WIN32_API)
- #if defined(_HDF5DLL_)
- #pragma warning(disable: 4273) /* Disable the dll linkage warnings */
- #define H5PLUGIN_DLL __declspec(dllimport)
- #elif defined(_HDF5USEDLL_)
- #define H5PLUGIN_DLL __declspec(dllexport)
- #endif /* _HDF5DLL_ */
- #else /*H5_HAVE_WIN32_API*/
- #define H5PLUGIN_DLL
- #endif /*H5_HAVE_WIN32_API*/
-
-#endif /* H5_BUILT_AS_xxx_LIB */
+/* plugins always export */
+#if defined (_MSC_VER) /* MSVC Compiler Case */
+ #define H5PLUGIN_DLL __declspec(dllexport)
+#elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+ #define H5PLUGIN_DLL __attribute__ ((visibility("default")))
+#endif
#ifdef __cplusplus
extern "C" {