diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-09-25 13:51:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-09-25 13:51:40 (GMT) |
| commit | 510e79af7c180eae97ba5874a2659937e9101b4c (patch) | |
| tree | 5fbd2103d2d5eac33164c57a35d71398323ce529 | |
| parent | 0324181acc550459d21238759e4bbdf8c1cf37e5 (diff) | |
| download | hdf5-510e79af7c180eae97ba5874a2659937e9101b4c.zip hdf5-510e79af7c180eae97ba5874a2659937e9101b4c.tar.gz hdf5-510e79af7c180eae97ba5874a2659937e9101b4c.tar.bz2 | |
[svn-r25615] Include plugin header change. H5PLextern.h and H5PLprivate.h have two opposing use cases, only the enum is common.
Tested: local linux and windows
| -rw-r--r-- | src/H5PLextern.h | 40 | ||||
| -rw-r--r-- | src/H5PLprivate.h | 14 |
2 files changed, 18 insertions, 36 deletions
diff --git a/src/H5PLextern.h b/src/H5PLextern.h index 943e3aa..a204cb7 100644 --- a/src/H5PLextern.h +++ b/src/H5PLextern.h @@ -34,40 +34,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" { diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h index b117613..587a51b 100644 --- a/src/H5PLprivate.h +++ b/src/H5PLprivate.h @@ -19,8 +19,18 @@ #ifndef _H5PLprivate_H #define _H5PLprivate_H -/* Include package's "external" header */ -#include "H5PLextern.h" +/* Keep the following in sync with the package's "external" header */ + +/*******************/ +/* Public Typedefs */ +/*******************/ + +/* Plugin type */ +typedef enum H5PL_type_t { + H5PL_TYPE_ERROR = -1, /*error */ + H5PL_TYPE_FILTER = 0, /*filter */ + H5PL_TYPE_NONE = 1 /*this must be last! */ +} H5PL_type_t; /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ |