[svn-r1050] made all non static functions and globals accessible to the dll.

changed the HDF5DLL and HDF5GLOBAL to __DLL__ and __DLLVAR__

12 files changed, 149 insertions, 149 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 5b6bb2b..be2b4b8 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -106,21 +106,21 @@ typedef struct H5AC_t {
 /*
  * Library prototypes.
  */
-herr_t H5AC_dest (H5F_t *f);
-void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
+__DLL__ herr_t H5AC_dest (H5F_t *f);
+__DLL__ void *H5AC_find_f (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		   const void *udata1, void *udata2);
-void *H5AC_protect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
+__DLL__ void *H5AC_protect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		    const void *udata1, void *udata2);
-herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type,
+__DLL__ herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type,
 		       const haddr_t *addr, void *thing);
-HDF5API herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type,
+__DLL__ herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type,
 			   const haddr_t *addr, hbool_t destroy);
-herr_t H5AC_create (H5F_t *f, intn size_hint);
-herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type,
+__DLL__ herr_t H5AC_create (H5F_t *f, intn size_hint);
+__DLL__ herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type,
 		    const haddr_t *old_addr, const haddr_t *new_addr);
-herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
+__DLL__ herr_t H5AC_set (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
 		 void *thing);
-herr_t H5AC_debug (H5F_t *f);
+__DLL__ herr_t H5AC_debug (H5F_t *f);
 
 #define H5AC_find(F,TYPE,ADDR_P,UDATA1,UDATA2)				      \
    (((F)->shared->cache->slot[H5AC_HASH(F,ADDR_P)].type==(TYPE) &&	      \
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index ce73c3b..8c01bae 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -70,21 +70,21 @@ typedef struct H5G_stat_t {
 typedef herr_t (*H5G_iterate_t)(hid_t group, const char *group_name,
 				void *op_data);
 
-HDF5API hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint);
-HDF5API hid_t H5Gopen (hid_t loc_id, const char *name);
-HDF5API herr_t H5Gclose (hid_t group_id);
-HDF5API herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op,
+__DLL__ hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint);
+__DLL__ hid_t H5Gopen (hid_t loc_id, const char *name);
+__DLL__ herr_t H5Gclose (hid_t group_id);
+__DLL__ herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op,
 		   void *op_data);
-HDF5API herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
-HDF5API herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
+__DLL__ herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
+__DLL__ herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
 		const char *new_name);
-HDF5API herr_t H5Gunlink (hid_t loc_id, const char *name);
-HDF5API herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link,
+__DLL__ herr_t H5Gunlink (hid_t loc_id, const char *name);
+__DLL__ herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link,
 		H5G_stat_t *statbuf/*out*/);
-HDF5API herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
+__DLL__ herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
 		       char *buf/*out*/);
-HDF5API herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
-HDF5API int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf);
+__DLL__ herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
+__DLL__ int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index a22f265..6b64e8d 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -92,14 +92,14 @@ typedef struct H5HG_t {
 
 typedef struct H5HG_heap_t H5HG_heap_t;
 
-H5HG_heap_t *H5HG_create (H5F_t *f, size_t size);
-HDF5API herr_t H5HG_insert (H5F_t *f, size_t size, void *obj,
+__DLL__ H5HG_heap_t *H5HG_create (H5F_t *f, size_t size);
+__DLL__ herr_t H5HG_insert (H5F_t *f, size_t size, void *obj,
 			    H5HG_t *hobj/*out*/);
-void *H5HG_peek (H5F_t *f, H5HG_t *hobj);
-HDF5API void *H5HG_read (H5F_t *f, H5HG_t *hobj, void *object);
-intn H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust);
-HDF5API herr_t H5HG_remove (H5F_t *f, H5HG_t *hobj);
-HDF5API herr_t H5HG_debug(H5F_t *f, const haddr_t *addr, FILE *stream,
+__DLL__ void *H5HG_peek (H5F_t *f, H5HG_t *hobj);
+__DLL__ void *H5HG_read (H5F_t *f, H5HG_t *hobj, void *object);
+__DLL__ intn H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust);
+__DLL__ herr_t H5HG_remove (H5F_t *f, H5HG_t *hobj);
+__DLL__ herr_t H5HG_debug(H5F_t *f, const haddr_t *addr, FILE *stream,
 			  intn indent, intn fwidth);
 
 #endif
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 3ac2e7a..8f7aa59 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -50,15 +50,15 @@
 /*
  * Library prototypes...
  */
-HDF5API herr_t H5HL_create (H5F_t *f, size_t size_hint, haddr_t *addr/*out*/);
+__DLL__ herr_t H5HL_create (H5F_t *f, size_t size_hint, haddr_t *addr/*out*/);
 void *H5HL_read (H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
 		 void *buf);
-HDF5API const void *H5HL_peek (H5F_t *f, const haddr_t *addr, size_t offset);
-HDF5API size_t H5HL_insert (H5F_t *f, const haddr_t *addr, size_t size,
+__DLL__ const void *H5HL_peek (H5F_t *f, const haddr_t *addr, size_t offset);
+__DLL__ size_t H5HL_insert (H5F_t *f, const haddr_t *addr, size_t size,
 			    const void *buf);
-herr_t H5HL_write (H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
+__DLL__ herr_t H5HL_write (H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
 		   const void *buf);
-herr_t H5HL_remove (H5F_t *f, const haddr_t *addr, size_t offset, size_t size);
-HDF5API herr_t H5HL_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
+__DLL__ herr_t H5HL_remove (H5F_t *f, const haddr_t *addr, size_t offset, size_t size);
+__DLL__ herr_t H5HL_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
 			   intn indent, intn fwidth);
 #endif
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index 8895378..8b47dd5 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -62,15 +62,15 @@ typedef struct {
 typedef intn (*H5I_search_func_t) (void * obj, const void * key);
 
 /* Private Functions in H5I.c */
-intn H5I_init_group (H5I_type_t grp, size_t hash_size, uintn reserved,
+__DLL__ intn H5I_init_group (H5I_type_t grp, size_t hash_size, uintn reserved,
 		     herr_t (*free_func)(void *));
-herr_t H5I_destroy_group (H5I_type_t grp);
-hid_t H5I_register (H5I_type_t grp, void *object);
-HDF5API void *H5I_object (hid_t id);
-H5I_type_t H5I_get_type (hid_t id);
-void *H5I_remove (hid_t id);
-void *H5I_search (H5I_type_t grp, H5I_search_func_t func, const void *key);
-intn H5I_dec_ref (hid_t id);
-hid_t H5I_inc_ref (hid_t id);
+__DLL__ herr_t H5I_destroy_group (H5I_type_t grp);
+__DLL__ hid_t H5I_register (H5I_type_t grp, void *object);
+__DLL__ void *H5I_object (hid_t id);
+__DLL__ H5I_type_t H5I_get_type (hid_t id);
+__DLL__ void *H5I_remove (hid_t id);
+__DLL__ void *H5I_search (H5I_type_t grp, H5I_search_func_t func, const void *key);
+__DLL__ intn H5I_dec_ref (hid_t id);
+__DLL__ hid_t H5I_inc_ref (hid_t id);
 
 #endif
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index cdacad1..03b2717 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -57,7 +57,7 @@ typedef int hid_t;
 extern "C" {
 #endif
 
-HDF5API H5I_type_t H5Iget_type(hid_t id);
+__DLL__ H5I_type_t H5Iget_type(hid_t id);
 
 
 #ifdef __cplusplus
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index f739467..38f8fb7 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -37,9 +37,9 @@
 /*
  * Library prototypes...
  */
-herr_t H5MF_alloc (H5F_t *f, intn, hsize_t size, haddr_t *addr/*out*/);
-herr_t H5MF_xfree (H5F_t *f, const haddr_t *addr, hsize_t size);
-herr_t H5MF_realloc (H5F_t *f, intn op, hsize_t orig_size,
+__DLL__ herr_t H5MF_alloc (H5F_t *f, intn, hsize_t size, haddr_t *addr/*out*/);
+__DLL__ herr_t H5MF_xfree (H5F_t *f, const haddr_t *addr, hsize_t size);
+__DLL__ herr_t H5MF_realloc (H5F_t *f, intn op, hsize_t orig_size,
 		     const haddr_t *orig_addr, hsize_t new_size,
 		     haddr_t *new_addr/*out*/);
 
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 6c13966..a6778cb 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -114,13 +114,13 @@ typedef struct H5O_t {
  * Null Message.
  */
 #define H5O_NULL_ID	0x0000
-extern const H5O_class_t H5O_NULL[1];
+__DLLVAR__ const H5O_class_t H5O_NULL[1];
 
 /*
  * Simple Data Space Message.
  */
 #define H5O_SDSPACE_ID	0x0001
-extern const H5O_class_t H5O_SDSPACE[1];
+__DLLVAR__ const H5O_class_t H5O_SDSPACE[1];
 
 /* operates on an H5S_simple_t struct */
 
@@ -128,7 +128,7 @@ extern const H5O_class_t H5O_SDSPACE[1];
  * Data Type Message.
  */
 #define H5O_DTYPE_ID	0x0003
-extern const H5O_class_t H5O_DTYPE[1];
+__DLLVAR__ const H5O_class_t H5O_DTYPE[1];
 
 /* operates on an H5T_t struct */
 
@@ -136,7 +136,7 @@ extern const H5O_class_t H5O_DTYPE[1];
  * Fill Value Message.
  */
 #define H5O_FILL_ID		0x0004
-extern const H5O_class_t	H5O_FILL[1];
+__DLLVAR__ const H5O_class_t	H5O_FILL[1];
 
 typedef struct H5O_fill_t {
     H5T_t	*type;			/*type. Null implies same as dataset */
@@ -151,7 +151,7 @@ typedef struct H5O_fill_t {
 #define H5O_EFL_ID		0x0007	/*external file list id		     */
 #define H5O_EFL_ALLOC		16	/*number of slots to alloc at once   */
 #define H5O_EFL_UNLIMITED	H5F_UNLIMITED /*max possible file size	     */
-extern const H5O_class_t H5O_EFL[1];	/*external file list class	     */
+__DLLVAR__ const H5O_class_t H5O_EFL[1];	/*external file list class	     */
 
 typedef struct H5O_efl_entry_t {
     size_t	name_offset;		/*offset of name within heap	     */
@@ -172,7 +172,7 @@ typedef struct H5O_efl_t {
  */
 #define H5O_LAYOUT_ID		0x0008
 #define H5O_LAYOUT_NDIMS	(H5S_MAX_RANK+1)
-HDF5GLOBAL const H5O_class_t H5O_LAYOUT[1];
+__DLLVAR__ const H5O_class_t H5O_LAYOUT[1];
 
 typedef struct H5O_layout_t {
     int		type;			/*type of layout, H5D_layout_t	     */
@@ -185,7 +185,7 @@ typedef struct H5O_layout_t {
  * Filter pipeline message.
  */
 #define H5O_PLINE_ID	0x000b
-extern const H5O_class_t H5O_PLINE[1];
+__DLLVAR__ const H5O_class_t H5O_PLINE[1];
 
 typedef struct H5O_pline_t {
     size_t	nfilters;		/*num filters defined		     */
@@ -203,7 +203,7 @@ typedef struct H5O_pline_t {
  * Attribute Message.
  */
 #define H5O_ATTR_ID	0x000c
-extern const H5O_class_t H5O_ATTR[1];
+__DLLVAR__ const H5O_class_t H5O_ATTR[1];
 
 /* operates on an H5A_t struct */
 
@@ -211,7 +211,7 @@ extern const H5O_class_t H5O_ATTR[1];
  * Object name message.
  */
 #define H5O_NAME_ID	0x000d
-extern const H5O_class_t H5O_NAME[1];
+__DLLVAR__ const H5O_class_t H5O_NAME[1];
 
 typedef struct H5O_name_t {
     char	*s;			/*ptr to malloc'd memory	     */
@@ -221,7 +221,7 @@ typedef struct H5O_name_t {
  * Modification time message.  The message is just a `time_t'.
  */
 #define H5O_MTIME_ID	0x000e
-extern const H5O_class_t H5O_MTIME[1];
+__DLLVAR__ const H5O_class_t H5O_MTIME[1];
 
 /*
  * Shared object message.  This message ID never really appears in an object
@@ -229,7 +229,7 @@ extern const H5O_class_t H5O_MTIME[1];
  * will be the ID of the pointed-to message.
  */
 #define H5O_SHARED_ID	0x000f
-extern const H5O_class_t H5O_SHARED[1];
+__DLLVAR__ const H5O_class_t H5O_SHARED[1];
 
 typedef struct H5O_shared_t {
     hbool_t		in_gh;		/*shared by global heap?	     */
@@ -243,7 +243,7 @@ typedef struct H5O_shared_t {
  * Object header continuation message.
  */
 #define H5O_CONT_ID	0x0010
-extern const H5O_class_t H5O_CONT[1];
+__DLLVAR__ const H5O_class_t H5O_CONT[1];
 
 typedef struct H5O_cont_t {
     haddr_t	addr;			/*address of continuation block	     */
@@ -257,7 +257,7 @@ typedef struct H5O_cont_t {
  * Symbol table message.
  */
 #define H5O_STAB_ID	0x0011
-HDF5GLOBAL const H5O_class_t H5O_STAB[1];
+__DLLVAR__ const H5O_class_t H5O_STAB[1];
 
 void *H5O_stab_fast (const H5G_cache_t *cache, const H5O_class_t *type,
 		     void *_mesg);
@@ -268,36 +268,36 @@ typedef struct H5O_stab_t {
 } H5O_stab_t;
 
 /* General message operators */
-HDF5API herr_t H5O_create (H5F_t *f, size_t size_hint,
+__DLL__ herr_t H5O_create (H5F_t *f, size_t size_hint,
 			   H5G_entry_t *ent/*out*/);
-herr_t H5O_open (H5G_entry_t *ent);
-HDF5API herr_t H5O_close (H5G_entry_t *ent);
-intn H5O_link (H5G_entry_t *ent, intn adjust);
-intn H5O_count (H5G_entry_t *ent, const H5O_class_t *type);
-htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence);
-HDF5API void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type,
+__DLL__ herr_t H5O_open (H5G_entry_t *ent);
+__DLL__ herr_t H5O_close (H5G_entry_t *ent);
+__DLL__ intn H5O_link (H5G_entry_t *ent, intn adjust);
+__DLL__ intn H5O_count (H5G_entry_t *ent, const H5O_class_t *type);
+__DLL__ htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence);
+__DLL__ void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type,
 			intn sequence, void *mesg);
-HDF5API intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type,
+__DLL__ intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type,
 			 intn overwrite, uintn flags, const void *mesg);
-herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
-HDF5API herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type,
+__DLL__ herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
+__DLL__ herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type,
 			   intn sequence);
-herr_t H5O_reset (const H5O_class_t *type, void *native);
-void *H5O_free (const H5O_class_t *type, void *mesg);
-void *H5O_copy (const H5O_class_t *type, const void *mesg, void *dst);
-herr_t H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg,
+__DLL__ herr_t H5O_reset (const H5O_class_t *type, void *native);
+__DLL__ void *H5O_free (const H5O_class_t *type, void *mesg);
+__DLL__ void *H5O_copy (const H5O_class_t *type, const void *mesg, void *dst);
+__DLL__ herr_t H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg,
 		  H5HG_t *hobj/*out*/);
-HDF5API herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
+__DLL__ herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream,
 			  intn indent, intn fwidth);
 
 /* EFL operators */
-hsize_t H5O_efl_total_size (H5O_efl_t *efl);
-herr_t H5O_efl_read (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
+__DLL__ hsize_t H5O_efl_total_size (H5O_efl_t *efl);
+__DLL__ herr_t H5O_efl_read (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
 		     hsize_t size, uint8_t *buf);
-herr_t H5O_efl_write (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
+__DLL__ herr_t H5O_efl_write (H5F_t *f, const H5O_efl_t *efl, haddr_t *addr,
 		      hsize_t size, const uint8_t *buf);
 
 /* Fill value operators */
-herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *type);
+__DLL__ herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *type);
 
 #endif
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 36c8652..283f00a 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -22,9 +22,9 @@
 #include <H5private.h>
 #include <H5Fprivate.h>
 
-hid_t H5P_create (H5P_class_t type, void *tmpl);
-void *H5P_copy (H5P_class_t type, const void *src);
-herr_t H5P_close (H5P_class_t type, void *tmpl);
-H5P_class_t H5P_get_class(hid_t tid);
+__DLL__ hid_t H5P_create (H5P_class_t type, void *tmpl);
+__DLL__ void *H5P_copy (H5P_class_t type, const void *src);
+__DLL__ herr_t H5P_close (H5P_class_t type, void *tmpl);
+__DLL__ H5P_class_t H5P_get_class(hid_t tid);
 
 #endif
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index d22ba2e..4dfe932 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -44,103 +44,103 @@ extern "C" {
 #endif
 
 /* Public functions */
-HDF5API hid_t H5Pcreate (H5P_class_t type);
-HDF5API herr_t H5Pclose (hid_t plist_id);
-HDF5API hid_t H5Pcopy (hid_t plist_id);
-HDF5API H5P_class_t H5Pget_class (hid_t plist_id);
-HDF5API herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/,
+__DLL__ hid_t H5Pcreate (H5P_class_t type);
+__DLL__ herr_t H5Pclose (hid_t plist_id);
+__DLL__ hid_t H5Pcopy (hid_t plist_id);
+__DLL__ H5P_class_t H5Pget_class (hid_t plist_id);
+__DLL__ herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/,
 			       int *freelist/*out*/, int *stab/*out*/,
 			       int *shhdr/*out*/);
-HDF5API herr_t H5Pset_userblock (hid_t plist_id, hsize_t size);
-HDF5API herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size);
-HDF5API herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold,
+__DLL__ herr_t H5Pset_userblock (hid_t plist_id, hsize_t size);
+__DLL__ herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size);
+__DLL__ herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold,
 				 hsize_t alignment);
-HDF5API herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/,
+__DLL__ herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/,
 				 hsize_t *alignment/*out*/);
-HDF5API herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr,
+__DLL__ herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr,
 			     size_t sizeof_size);
-HDF5API herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/,
+__DLL__ herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/,
 			     size_t *sizeof_size/*out*/);
-HDF5API herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk);
-HDF5API herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
-HDF5API herr_t H5Pset_istore_k (hid_t plist_id, int ik);
-HDF5API herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/);
-HDF5API herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout);
-HDF5API H5D_layout_t H5Pget_layout (hid_t plist_id);
-HDF5API herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]);
-HDF5API int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
-HDF5API herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset,
+__DLL__ herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk);
+__DLL__ herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
+__DLL__ herr_t H5Pset_istore_k (hid_t plist_id, int ik);
+__DLL__ herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/);
+__DLL__ herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout);
+__DLL__ H5D_layout_t H5Pget_layout (hid_t plist_id);
+__DLL__ herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]);
+__DLL__ int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
+__DLL__ herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset,
 				hsize_t size);
-HDF5API int H5Pget_external_count (hid_t plist_id);
-HDF5API herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size,
+__DLL__ int H5Pget_external_count (hid_t plist_id);
+__DLL__ herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size,
 				char *name/*out*/, off_t *offset/*out*/,
 				hsize_t *size/*out*/);
-HDF5API H5F_driver_t H5Pget_driver (hid_t plist_id);
-HDF5API herr_t H5Pset_stdio (hid_t plist_id);
-HDF5API herr_t H5Pget_stdio (hid_t plist_id);
-HDF5API herr_t H5Pset_sec2 (hid_t plist_id);
-HDF5API herr_t H5Pget_sec2 (hid_t plist_id);
-HDF5API herr_t H5Pset_core (hid_t plist_id, size_t increment);
-HDF5API herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/);
-HDF5API herr_t H5Pset_split (hid_t plist_id, const char *meta_ext,
+__DLL__ H5F_driver_t H5Pget_driver (hid_t plist_id);
+__DLL__ herr_t H5Pset_stdio (hid_t plist_id);
+__DLL__ herr_t H5Pget_stdio (hid_t plist_id);
+__DLL__ herr_t H5Pset_sec2 (hid_t plist_id);
+__DLL__ herr_t H5Pget_sec2 (hid_t plist_id);
+__DLL__ herr_t H5Pset_core (hid_t plist_id, size_t increment);
+__DLL__ herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/);
+__DLL__ herr_t H5Pset_split (hid_t plist_id, const char *meta_ext,
 			     hid_t meta_plist_id, const char *raw_ext,
 			     hid_t raw_plist_id);
-HDF5API herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size,
+__DLL__ herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size,
 			     char *meta_ext/*out*/,
 			     hid_t *meta_properties/*out*/,
 			     size_t raw_ext_size, char *raw_ext/*out*/,
 			     hid_t *raw_properties/*out*/);
 
-HDF5API herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size,
+__DLL__ herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size,
 			      hid_t memb_plist_id);
-HDF5API herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/,
+__DLL__ herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/,
 			      hid_t *memb_plist_id/*out*/);
-HDF5API herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv,
+__DLL__ herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv,
 			      void *bkg);
-HDF5API size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/,
+__DLL__ size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/,
 			      void **bkg/*out*/);
-HDF5API herr_t H5Pset_preserve (hid_t plist_id, hbool_t status);
-HDF5API int H5Pget_preserve (hid_t plist_id);
-HDF5API herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter,
+__DLL__ herr_t H5Pset_preserve (hid_t plist_id, hbool_t status);
+__DLL__ int H5Pget_preserve (hid_t plist_id);
+__DLL__ herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter,
 			      unsigned int flags, size_t cd_nelmts,
 			      const unsigned int c_values[]);
-HDF5API int H5Pget_nfilters(hid_t plist_id);
-HDF5API H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter,
+__DLL__ int H5Pget_nfilters(hid_t plist_id);
+__DLL__ H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter,
 				   unsigned int *flags/*out*/,
 				   size_t *cd_nelmts/*out*/,
 				   unsigned cd_values[]/*out*/,
 				   size_t namelen, char name[]);
-HDF5API herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression);
-HDF5API herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts,
+__DLL__ herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression);
+__DLL__ herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts,
 			     size_t rdcc_nbytes, double rdcc_w0);
-HDF5API herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/,
+__DLL__ herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/,
 			     int *rdcc_nelmts/*out*/,
 			     size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
-HDF5API herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache,
+__DLL__ herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache,
 				  unsigned limit);
-HDF5API herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache,
+__DLL__ herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache,
 				  unsigned *limit);
-HDF5API herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
+__DLL__ herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
 				   double right);
-HDF5API herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/,
+__DLL__ herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/,
 				   double *middle/*out*/,
 				   double *right/*out*/);
-HDF5API herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id,
+__DLL__ herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id,
 				 const void *value);
-HDF5API herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
+__DLL__ herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
 				 void *value/*out*/);
 
 #ifdef HAVE_PARALLEL
-HDF5API herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info);
-HDF5API herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/,
+__DLL__ herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info);
+__DLL__ herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/,
 			   MPI_Info *info/*out*/);
-HDF5API herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode);
-HDF5API herr_t H5Pget_xfer (hid_t plist_id,
+__DLL__ herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode);
+__DLL__ herr_t H5Pget_xfer (hid_t plist_id,
 			    H5D_transfer_t *data_xfer_mode/*out*/);
 #endif
 
-HDF5API herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
-HDF5API herr_t H5Pget_gc_reference(hid_t fapl_id, unsigned *gc_ref/*out*/);
+__DLL__ herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
+__DLL__ herr_t H5Pget_gc_reference(hid_t fapl_id, unsigned *gc_ref/*out*/);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5RAprivate.h b/src/H5RAprivate.h
index 89e83db..9b7cfb0 100644
--- a/src/H5RAprivate.h
+++ b/src/H5RAprivate.h
@@ -15,15 +15,15 @@
 
 typedef struct H5RA_t H5RA_t;
 
-herr_t H5RA_close(H5RA_t *ra);
-H5RA_t *H5RA_create(H5G_entry_t *loc, const char *name, H5T_t *type,
+__DLL__ herr_t H5RA_close(H5RA_t *ra);
+__DLL__ H5RA_t *H5RA_create(H5G_entry_t *loc, const char *name, H5T_t *type,
 		  const H5D_create_t *dcpl);
-H5RA_t *H5RA_open(H5G_entry_t *loc, const char *name);
-htri_t H5RA_isa(H5G_entry_t *ent);
-herr_t H5RA_write(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
+__DLL__ H5RA_t *H5RA_open(H5G_entry_t *loc, const char *name);
+__DLL__ htri_t H5RA_isa(H5G_entry_t *ent);
+__DLL__ herr_t H5RA_write(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
 		 hsize_t size[], void *buf[]);
-herr_t H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
+__DLL__ herr_t H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
 		hsize_t size[], void *buf[]);
-H5G_entry_t *H5RA_entof(H5RA_t *ra);
+__DLL__ H5G_entry_t *H5RA_entof(H5RA_t *ra);
 
 #endif
diff --git a/src/H5public.h b/src/H5public.h
index 8bf1b5c..57c88ef 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -99,12 +99,12 @@ extern "C" {
 #endif
 
 /* Functions in H5.c */
-HDF5API herr_t H5open (void);
-HDF5API herr_t H5close (void);
-HDF5API herr_t H5dont_atexit (void);
-HDF5API herr_t H5get_libversion (unsigned *majnum, unsigned *minnum,
+__DLL__ herr_t H5open (void);
+__DLL__ herr_t H5close (void);
+__DLL__ herr_t H5dont_atexit (void);
+__DLL__ herr_t H5get_libversion (unsigned *majnum, unsigned *minnum,
 				 unsigned *relnum);
-HDF5API herr_t H5check_version (unsigned majnum, unsigned minnum,
+__DLL__ herr_t H5check_version (unsigned majnum, unsigned minnum,
 				unsigned relnum);
 
 #ifdef __cplusplus