[svn-r25634] merge from trunk.

5 files changed, 23 insertions, 39 deletions

diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 0a899a9..4a62bd8 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -491,7 +491,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
     }
     if (!memb_addr) {
 	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1))
-	    _memb_addr[mt] = (hsize_t)(mt ? (mt - 1) : 0) * HADDR_MAX / H5FD_MEM_NTYPES;
+	    _memb_addr[mt] = (hsize_t)(mt ? (mt - 1) : 0) * (HADDR_MAX / H5FD_MEM_NTYPES);
 	memb_addr = _memb_addr;
     }
 
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index b5563e4..d368cc0 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -35,40 +35,14 @@ 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
+/* 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")))
 #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 */
+  #define H5PLUGIN_DLL
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h
index 237408d..61fd0af 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                    */
diff --git a/src/H5public.h b/src/H5public.h
index 9adee12..b479fe5 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -94,10 +94,10 @@ extern "C" {
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	197	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_RELEASE	198	/* For tweaks, bug-fixes, or development     */
 #define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.9.197"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.9.198"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index 7e7a5e7..98c9cec 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -732,7 +732,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 187
+LT_VERS_REVISION = 188
 LT_VERS_AGE = 0
 
 # Our main target, the HDF5 library