From e5b28ef37b6cb97211e37f0900a97b14c97daf57 Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Fri, 20 Sep 2002 15:36:09 -0500 Subject: [svn-r5931] Purpose: __DLL__ is a keyword in some platforms and __DLL__ is also defined as a macro for windows DLL applications. That causes problems. Description: Solution: Use H5_DLL*** to replace __DLL***__ at all header files. Change the macro defination at H5api_adpt.h. Platforms tested: linux2.2.18smp, irix64, solaris 2.7 and windows 2000 --- src/H5ACprivate.h | 18 +-- src/H5Aprivate.h | 6 +- src/H5Apublic.h | 24 ++-- src/H5Bprivate.h | 14 +-- src/H5Dprivate.h | 46 ++++---- src/H5Dpublic.h | 34 +++--- src/H5Eprivate.h | 12 +- src/H5Epublic.h | 16 +-- src/H5FDcore.h | 6 +- src/H5FDfamily.h | 6 +- src/H5FDlog.h | 6 +- src/H5FDmpio.h | 24 ++-- src/H5FDmpiposix.h | 14 +-- src/H5FDmulti.h | 12 +- src/H5FDprivate.h | 48 ++++---- src/H5FDpublic.h | 30 ++--- src/H5FDsec2.h | 4 +- src/H5FDsrb.h | 6 +- src/H5FDstdio.h | 4 +- src/H5FDstream.h | 6 +- src/H5FLprivate.h | 22 ++-- src/H5Fpkg.h | 44 ++++---- src/H5Fprivate.h | 58 +++++----- src/H5Fpublic.h | 24 ++-- src/H5Gpkg.h | 20 ++-- src/H5Gprivate.h | 70 ++++++------ src/H5Gpublic.h | 22 ++-- src/H5HGprivate.h | 14 +-- src/H5HLprivate.h | 14 +-- src/H5Iprivate.h | 24 ++-- src/H5Ipublic.h | 8 +- src/H5MFprivate.h | 6 +- src/H5MMprivate.h | 8 +- src/H5Oprivate.h | 70 ++++++------ src/H5Pprivate.h | 46 ++++---- src/H5Ppublic.h | 194 ++++++++++++++++---------------- src/H5Rpublic.h | 10 +- src/H5Spkg.h | 124 ++++++++++---------- src/H5Sprivate.h | 72 ++++++------ src/H5Spublic.h | 58 +++++----- src/H5TBprivate.h | 34 +++--- src/H5TSprivate.h | 10 +- src/H5Tpkg.h | 324 ++++++++++++++++++++++++++--------------------------- src/H5Tprivate.h | 74 ++++++------ src/H5Tpublic.h | 286 +++++++++++++++++++++++----------------------- src/H5Vprivate.h | 24 ++-- src/H5Zprivate.h | 8 +- src/H5Zpublic.h | 2 +- src/H5api_adpt.h | 24 ++-- src/H5private.h | 46 ++++---- src/H5public.h | 14 +-- 51 files changed, 1045 insertions(+), 1045 deletions(-) diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 734e56a..44d4ca8 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -117,21 +117,21 @@ typedef struct H5AC_t { /* * Library prototypes. */ -__DLL__ herr_t H5AC_dest(H5F_t *f); -__DLL__ void *H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, +H5_DLL herr_t H5AC_dest(H5F_t *f); +H5_DLL void *H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, const void *udata1, void *udata2); -__DLL__ void *H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, +H5_DLL void *H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, const void *udata1, void *udata2); -__DLL__ herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, +H5_DLL herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing); -__DLL__ herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, +H5_DLL herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy); -__DLL__ herr_t H5AC_create(H5F_t *f, int size_hint); -__DLL__ herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, +H5_DLL herr_t H5AC_create(H5F_t *f, int size_hint); +H5_DLL herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr); -__DLL__ herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, +H5_DLL herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing); -__DLL__ herr_t H5AC_debug(H5F_t *f); +H5_DLL herr_t H5AC_debug(H5F_t *f); #define H5AC_find(F,TYPE,ADDR,UDATA1,UDATA2) \ ((F)->shared->cache->slot[H5AC_HASH(F,ADDR)]!=NULL && \ diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h index 9c24515..d94df90 100644 --- a/src/H5Aprivate.h +++ b/src/H5Aprivate.h @@ -25,8 +25,8 @@ typedef struct H5A_t H5A_t; /* Private headers needed by this file */ /* Functions defined in H5A.c */ -__DLL__ H5A_t * H5A_copy(const H5A_t *old_attr); -__DLL__ herr_t H5A_close(H5A_t *attr); -__DLL__ H5G_entry_t *H5A_entof(H5A_t *attr); +H5_DLL H5A_t * H5A_copy(const H5A_t *old_attr); +H5_DLL herr_t H5A_close(H5A_t *attr); +H5_DLL H5G_entry_t *H5A_entof(H5A_t *attr); #endif diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 0e2c7fd..aa7d0eb 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -27,20 +27,20 @@ typedef herr_t (*H5A_operator_t)(hid_t location_id/*in*/, const char *attr_name/*in*/, void *operator_data/*in,out*/); /* Public function prototypes */ -__DLL__ hid_t H5Acreate(hid_t loc_id, const char *name, hid_t type_id, +H5_DLL hid_t H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t plist_id); -__DLL__ hid_t H5Aopen_name(hid_t loc_id, const char *name); -__DLL__ hid_t H5Aopen_idx(hid_t loc_id, unsigned idx); -__DLL__ herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); -__DLL__ herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); -__DLL__ herr_t H5Aclose(hid_t attr_id); -__DLL__ hid_t H5Aget_space(hid_t attr_id); -__DLL__ hid_t H5Aget_type(hid_t attr_id); -__DLL__ ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf); -__DLL__ int H5Aget_num_attrs(hid_t loc_id); -__DLL__ herr_t H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, +H5_DLL hid_t H5Aopen_name(hid_t loc_id, const char *name); +H5_DLL hid_t H5Aopen_idx(hid_t loc_id, unsigned idx); +H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); +H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); +H5_DLL herr_t H5Aclose(hid_t attr_id); +H5_DLL hid_t H5Aget_space(hid_t attr_id); +H5_DLL hid_t H5Aget_type(hid_t attr_id); +H5_DLL ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf); +H5_DLL int H5Aget_num_attrs(hid_t loc_id); +H5_DLL herr_t H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data); -__DLL__ herr_t H5Adelete(hid_t loc_id, const char *name); +H5_DLL herr_t H5Adelete(hid_t loc_id, const char *name); #ifdef __cplusplus } diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index 0d509d6..9f2937c 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -120,19 +120,19 @@ typedef struct H5B_t { /* * Library prototypes. */ -__DLL__ herr_t H5B_debug (H5F_t *f, haddr_t addr, FILE * stream, +H5_DLL herr_t H5B_debug (H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth, const H5B_class_t *type, void *udata); -__DLL__ herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, +H5_DLL herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *addr_p/*out*/); -__DLL__ herr_t H5B_find (H5F_t *f, const H5B_class_t *type, haddr_t addr, +H5_DLL herr_t H5B_find (H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata); -__DLL__ herr_t H5B_insert (H5F_t *f, const H5B_class_t *type, haddr_t addr, +H5_DLL herr_t H5B_insert (H5F_t *f, const H5B_class_t *type, haddr_t addr, const double split_ratios[], void *udata); -__DLL__ herr_t H5B_remove(H5F_t *f, const H5B_class_t *type, haddr_t addr, +H5_DLL herr_t H5B_remove(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata); -__DLL__ herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type, H5B_operator_t +H5_DLL herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type, H5B_operator_t op, haddr_t addr, void *udata); -__DLL__ int H5B_Kvalue(H5F_t *f, const H5B_class_t *type); +H5_DLL int H5B_Kvalue(H5F_t *f, const H5B_class_t *type); #endif diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 0787c5b..6770af3 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -144,38 +144,38 @@ typedef struct H5D_t H5D_t; /* Functions defined in H5D.c */ -__DLL__ herr_t H5D_init(void); -__DLL__ H5D_t *H5D_create(H5G_entry_t *loc, const char *name, +H5_DLL herr_t H5D_init(void); +H5_DLL H5D_t *H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type, const H5S_t *space, hid_t dcpl_id); -__DLL__ H5D_t *H5D_open(H5G_entry_t *loc, const char *name); -__DLL__ herr_t H5D_close(H5D_t *dataset); -__DLL__ htri_t H5D_isa(H5G_entry_t *ent); -__DLL__ herr_t H5D_read(H5D_t *dataset, const H5T_t *mem_type, +H5_DLL H5D_t *H5D_open(H5G_entry_t *loc, const char *name); +H5_DLL herr_t H5D_close(H5D_t *dataset); +H5_DLL htri_t H5D_isa(H5G_entry_t *ent); +H5_DLL herr_t H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist, void *buf/*out*/); -__DLL__ herr_t H5D_write(H5D_t *dataset, const H5T_t *mem_type, +H5_DLL herr_t H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, const H5S_t *file_space, hid_t dset_xfer_plist, const void *buf); -__DLL__ herr_t H5D_extend(H5D_t *dataset, const hsize_t *size); -__DLL__ H5G_entry_t *H5D_entof(H5D_t *dataset); -__DLL__ H5T_t *H5D_typeof(H5D_t *dset); -__DLL__ H5S_t *H5D_get_space(H5D_t *dset); -__DLL__ H5D_t * H5D_open_oid(H5G_entry_t *ent); -__DLL__ H5F_t * H5D_get_file(const H5D_t *dset); -__DLL__ hsize_t H5D_get_storage_size(H5D_t *dset); -__DLL__ void *H5D_vlen_get_buf_size_alloc(size_t size, void *info); -__DLL__ herr_t H5D_vlen_get_buf_size(void *elem, hid_t type_id, hsize_t ndim, +H5_DLL herr_t H5D_extend(H5D_t *dataset, const hsize_t *size); +H5_DLL H5G_entry_t *H5D_entof(H5D_t *dataset); +H5_DLL H5T_t *H5D_typeof(H5D_t *dset); +H5_DLL H5S_t *H5D_get_space(H5D_t *dset); +H5_DLL H5D_t * H5D_open_oid(H5G_entry_t *ent); +H5_DLL H5F_t * H5D_get_file(const H5D_t *dset); +H5_DLL hsize_t H5D_get_storage_size(H5D_t *dset); +H5_DLL void *H5D_vlen_get_buf_size_alloc(size_t size, void *info); +H5_DLL herr_t H5D_vlen_get_buf_size(void *elem, hid_t type_id, hsize_t ndim, hssize_t *point, void *op_data); -__DLL__ herr_t H5D_crt_copy(hid_t new_plist_t, hid_t old_plist_t, +H5_DLL herr_t H5D_crt_copy(hid_t new_plist_t, hid_t old_plist_t, void *copy_data); -__DLL__ herr_t H5D_crt_close(hid_t dxpl_id, void *close_data); -__DLL__ herr_t H5D_xfer_create(hid_t dxpl_id, void *create_data); -__DLL__ herr_t H5D_xfer_copy(hid_t new_plist_id, hid_t old_plist_id, +H5_DLL herr_t H5D_crt_close(hid_t dxpl_id, void *close_data); +H5_DLL herr_t H5D_xfer_create(hid_t dxpl_id, void *create_data); +H5_DLL herr_t H5D_xfer_copy(hid_t new_plist_id, hid_t old_plist_id, void *copy_data); -__DLL__ herr_t H5D_xfer_close(hid_t dxpl_id, void *close_data); -__DLL__ herr_t H5D_set_extent(H5D_t *dataset, const hsize_t *size); -__DLL__ herr_t H5D_flush(H5F_t *f); +H5_DLL herr_t H5D_xfer_close(hid_t dxpl_id, void *close_data); +H5_DLL herr_t H5D_set_extent(H5D_t *dataset, const hsize_t *size); +H5_DLL herr_t H5D_flush(H5F_t *f); #endif diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index cf01aae..8bf09e1 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -70,29 +70,29 @@ typedef herr_t (*H5D_operator_t)(void *elem, hid_t type_id, hsize_t ndim, extern "C" { #endif -__DLL__ hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id, +H5_DLL hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id, hid_t space_id, hid_t plist_id); -__DLL__ hid_t H5Dopen (hid_t file_id, const char *name); -__DLL__ herr_t H5Dclose (hid_t dset_id); -__DLL__ hid_t H5Dget_space (hid_t dset_id); -__DLL__ herr_t H5Dget_space_status(hid_t dset_id, +H5_DLL hid_t H5Dopen (hid_t file_id, const char *name); +H5_DLL herr_t H5Dclose (hid_t dset_id); +H5_DLL hid_t H5Dget_space (hid_t dset_id); +H5_DLL herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation); -__DLL__ hid_t H5Dget_type (hid_t dset_id); -__DLL__ hid_t H5Dget_create_plist (hid_t dset_id); -__DLL__ hsize_t H5Dget_storage_size(hid_t dset_id); -__DLL__ herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, +H5_DLL hid_t H5Dget_type (hid_t dset_id); +H5_DLL hid_t H5Dget_create_plist (hid_t dset_id); +H5_DLL hsize_t H5Dget_storage_size(hid_t dset_id); +H5_DLL herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf/*out*/); -__DLL__ herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, +H5_DLL herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf); -__DLL__ herr_t H5Dextend (hid_t dset_id, const hsize_t *size); -__DLL__ herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id, +H5_DLL herr_t H5Dextend (hid_t dset_id, const hsize_t *size); +H5_DLL herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data); -__DLL__ herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf); -__DLL__ herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size); -__DLL__ herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf, +H5_DLL herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf); +H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size); +H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf, hid_t buf_type, hid_t space); -__DLL__ herr_t H5Ddebug(hid_t dset_id, unsigned int flags); -__DLL__ herr_t H5Dset_extent (hid_t dset_id, const hsize_t *size); +H5_DLL herr_t H5Ddebug(hid_t dset_id, unsigned int flags); +H5_DLL herr_t H5Dset_extent (hid_t dset_id, const hsize_t *size); #ifdef __cplusplus diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 424456e..db7f096 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -116,15 +116,15 @@ typedef struct H5E_t { H5E_error_t slot[H5E_NSLOTS]; /*array of error records */ } H5E_t; -__DLLVAR__ const hbool_t H5E_clearable_g;/*safe to call H5E_clear() on enter?*/ -__DLLVAR__ herr_t (*H5E_auto_g)(void *client_data); -__DLLVAR__ void *H5E_auto_data_g; +H5_DLLVAR const hbool_t H5E_clearable_g;/*safe to call H5E_clear() on enter?*/ +H5_DLLVAR herr_t (*H5E_auto_g)(void *client_data); +H5_DLLVAR void *H5E_auto_data_g; -__DLL__ herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num, +H5_DLL herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num, const char *func_name, const char *file_name, unsigned line, const char *desc); -__DLL__ herr_t H5E_clear (void); -__DLL__ herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, +H5_DLL herr_t H5E_clear (void); +H5_DLL herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, void *client_data); #endif diff --git a/src/H5Epublic.h b/src/H5Epublic.h index d6f1dc8..52e1e13 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -219,15 +219,15 @@ typedef herr_t (*H5E_auto_t)(void *client_data); extern "C" { #endif -__DLL__ herr_t H5Eset_auto (H5E_auto_t func, void *client_data); -__DLL__ herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); -__DLL__ herr_t H5Eclear (void); -__DLL__ herr_t H5Eprint (FILE *stream); -__DLL__ herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, +H5_DLL herr_t H5Eset_auto (H5E_auto_t func, void *client_data); +H5_DLL herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); +H5_DLL herr_t H5Eclear (void); +H5_DLL herr_t H5Eprint (FILE *stream); +H5_DLL herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, void *client_data); -__DLL__ const char *H5Eget_major (H5E_major_t major_number); -__DLL__ const char *H5Eget_minor (H5E_minor_t minor_number); -__DLL__ herr_t H5Epush(const char *file, const char *func, +H5_DLL const char *H5Eget_major (H5E_major_t major_number); +H5_DLL const char *H5Eget_minor (H5E_minor_t minor_number); +H5_DLL herr_t H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj, H5E_minor_t min, const char *str); #ifdef __cplusplus diff --git a/src/H5FDcore.h b/src/H5FDcore.h index b37a883..d1ef8d2 100644 --- a/src/H5FDcore.h +++ b/src/H5FDcore.h @@ -17,10 +17,10 @@ #ifdef __cplusplus extern "C" { #endif -__DLL__ hid_t H5FD_core_init(void); -__DLL__ herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, +H5_DLL hid_t H5FD_core_init(void); +H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store); -__DLL__ herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/, +H5_DLL herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/, hbool_t *backing_store/*out*/); #ifdef __cplusplus } diff --git a/src/H5FDfamily.h b/src/H5FDfamily.h index c1b6e13..b93b70f 100644 --- a/src/H5FDfamily.h +++ b/src/H5FDfamily.h @@ -18,10 +18,10 @@ extern "C" { #endif -__DLL__ hid_t H5FD_family_init(void); -__DLL__ herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, +H5_DLL hid_t H5FD_family_init(void); +H5_DLL herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id); -__DLL__ herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/, +H5_DLL herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/, hid_t *memb_fapl_id/*out*/); #ifdef __cplusplus diff --git a/src/H5FDlog.h b/src/H5FDlog.h index 07f43ae..adb4e0a 100644 --- a/src/H5FDlog.h +++ b/src/H5FDlog.h @@ -46,11 +46,11 @@ extern "C" { #endif -__DLL__ hid_t H5FD_log_init(void); +H5_DLL hid_t H5FD_log_init(void); #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity); +H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity); #else /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, unsigned flags, size_t buf_size); +H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, unsigned flags, size_t buf_size); #endif /* H5_WANT_H5_V1_4_COMPAT */ #ifdef __cplusplus diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index f1dd6f7..de55ccb 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -51,20 +51,20 @@ typedef struct H5FD_mpio_dxpl_t { #ifdef __cplusplus extern "C" { #endif -__DLL__ hid_t H5FD_mpio_init(void); -__DLL__ herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info); -__DLL__ herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, +H5_DLL hid_t H5FD_mpio_init(void); +H5_DLL herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info); +H5_DLL herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/); -__DLL__ herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode); -__DLL__ herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/); -__DLL__ MPI_Comm H5FD_mpio_communicator(H5FD_t *_file); -__DLL__ herr_t H5FD_mpio_setup(hid_t dxpl_id, MPI_Datatype btype, +H5_DLL herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode); +H5_DLL herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/); +H5_DLL MPI_Comm H5FD_mpio_communicator(H5FD_t *_file); +H5_DLL herr_t H5FD_mpio_setup(hid_t dxpl_id, MPI_Datatype btype, MPI_Datatype ftype, unsigned use_view); -__DLL__ herr_t H5FD_mpio_teardown(hid_t dxpl_id); -__DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); -__DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); -__DLL__ int H5FD_mpio_mpi_rank(H5FD_t *_file); -__DLL__ int H5FD_mpio_mpi_size(H5FD_t *_file); +H5_DLL herr_t H5FD_mpio_teardown(hid_t dxpl_id); +H5_DLL herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); +H5_DLL herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); +H5_DLL int H5FD_mpio_mpi_rank(H5FD_t *_file); +H5_DLL int H5FD_mpio_mpi_size(H5FD_t *_file); #ifdef __cplusplus } #endif diff --git a/src/H5FDmpiposix.h b/src/H5FDmpiposix.h index 3f262e1..2d1b677 100644 --- a/src/H5FDmpiposix.h +++ b/src/H5FDmpiposix.h @@ -43,13 +43,13 @@ extern "C" { #endif -__DLL__ hid_t H5FD_mpiposix_init(void); -__DLL__ herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm); -__DLL__ herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/); -__DLL__ MPI_Comm H5FD_mpiposix_communicator(H5FD_t *_file); -__DLL__ herr_t H5FD_mpiposix_closing(H5FD_t *file); -__DLL__ int H5FD_mpiposix_mpi_rank(H5FD_t *_file); -__DLL__ int H5FD_mpiposix_mpi_size(H5FD_t *_file); +H5_DLL hid_t H5FD_mpiposix_init(void); +H5_DLL herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm); +H5_DLL herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/); +H5_DLL MPI_Comm H5FD_mpiposix_communicator(H5FD_t *_file); +H5_DLL herr_t H5FD_mpiposix_closing(H5FD_t *file); +H5_DLL int H5FD_mpiposix_mpi_rank(H5FD_t *_file); +H5_DLL int H5FD_mpiposix_mpi_size(H5FD_t *_file); #ifdef __cplusplus } diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h index 9e908ba..3e06c59 100644 --- a/src/H5FDmulti.h +++ b/src/H5FDmulti.h @@ -17,17 +17,17 @@ #ifdef __cplusplus extern "C" { #endif -__DLL__ hid_t H5FD_multi_init(void); -__DLL__ herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, +H5_DLL hid_t H5FD_multi_init(void); +H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl, const char **memb_name, const haddr_t *memb_addr, hbool_t relax); -__DLL__ herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, +H5_DLL herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, hid_t *memb_fapl/*out*/, char **memb_name/*out*/, haddr_t *memb_addr/*out*/, hbool_t *relax/*out*/); -__DLL__ herr_t H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl); -__DLL__ herr_t H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/); +H5_DLL herr_t H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl); +H5_DLL herr_t H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/); -__DLL__ herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext, +H5_DLL herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext, hid_t raw_plist_id); #ifdef __cplusplus diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 19dd6b1..6e57189 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -12,33 +12,33 @@ #define H5FD_has_cmp(id) (NULL!=H5FD_get_class(id)->cmp) -__DLL__ int H5FD_term_interface(void); -__DLL__ H5FD_class_t *H5FD_get_class(hid_t id); -__DLL__ hsize_t H5FD_sb_size(H5FD_t *file); -__DLL__ herr_t H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf); -__DLL__ herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf); -__DLL__ void *H5FD_fapl_get(H5FD_t *file); -__DLL__ void *H5FD_fapl_copy(hid_t driver_id, const void *fapl); -__DLL__ herr_t H5FD_fapl_free(hid_t driver_id, void *fapl); -__DLL__ void *H5FD_dxpl_copy(hid_t driver_id, const void *dxpl); -__DLL__ herr_t H5FD_dxpl_free(hid_t driver_id, void *dxpl); -__DLL__ H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, +H5_DLL int H5FD_term_interface(void); +H5_DLL H5FD_class_t *H5FD_get_class(hid_t id); +H5_DLL hsize_t H5FD_sb_size(H5FD_t *file); +H5_DLL herr_t H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf); +H5_DLL herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf); +H5_DLL void *H5FD_fapl_get(H5FD_t *file); +H5_DLL void *H5FD_fapl_copy(hid_t driver_id, const void *fapl); +H5_DLL herr_t H5FD_fapl_free(hid_t driver_id, void *fapl); +H5_DLL void *H5FD_dxpl_copy(hid_t driver_id, const void *dxpl); +H5_DLL herr_t H5FD_dxpl_free(hid_t driver_id, void *dxpl); +H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); -__DLL__ herr_t H5FD_close(H5FD_t *file); -__DLL__ int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2); -__DLL__ int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/); -__DLL__ haddr_t H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size); -__DLL__ herr_t H5FD_free(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size); -__DLL__ haddr_t H5FD_realloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, +H5_DLL herr_t H5FD_close(H5FD_t *file); +H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2); +H5_DLL int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/); +H5_DLL haddr_t H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size); +H5_DLL herr_t H5FD_free(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size); +H5_DLL haddr_t H5FD_realloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size, hsize_t new_size); -__DLL__ haddr_t H5FD_get_eoa(H5FD_t *file); -__DLL__ herr_t H5FD_set_eoa(H5FD_t *file, haddr_t addr); -__DLL__ haddr_t H5FD_get_eof(H5FD_t *file); -__DLL__ herr_t H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, +H5_DLL haddr_t H5FD_get_eoa(H5FD_t *file); +H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, haddr_t addr); +H5_DLL haddr_t H5FD_get_eof(H5FD_t *file); +H5_DLL herr_t H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf/*out*/); -__DLL__ herr_t H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, +H5_DLL herr_t H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf); -__DLL__ herr_t H5FD_flush(H5FD_t *file, unsigned closing); -__DLL__ herr_t H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum); +H5_DLL herr_t H5FD_flush(H5FD_t *file, unsigned closing); +H5_DLL herr_t H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum); #endif /* !_H5FDprivate_H */ diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 52a8dec..fa4c5ad 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -200,25 +200,25 @@ extern "C" { #endif /* Function prototypes */ -__DLL__ hid_t H5FDregister(const H5FD_class_t *cls); -__DLL__ herr_t H5FDunregister(hid_t driver_id); -__DLL__ H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id, +H5_DLL hid_t H5FDregister(const H5FD_class_t *cls); +H5_DLL herr_t H5FDunregister(hid_t driver_id); +H5_DLL H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); -__DLL__ herr_t H5FDclose(H5FD_t *file); -__DLL__ int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2); -__DLL__ int H5FDquery(const H5FD_t *f, unsigned long *flags); -__DLL__ haddr_t H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size); -__DLL__ herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size); -__DLL__ haddr_t H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5FDclose(H5FD_t *file); +H5_DLL int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2); +H5_DLL int H5FDquery(const H5FD_t *f, unsigned long *flags); +H5_DLL haddr_t H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size); +H5_DLL herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size); +H5_DLL haddr_t H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t old_size, hsize_t new_size); -__DLL__ haddr_t H5FDget_eoa(H5FD_t *file); -__DLL__ herr_t H5FDset_eoa(H5FD_t *file, haddr_t eof); -__DLL__ haddr_t H5FDget_eof(H5FD_t *file); -__DLL__ herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, +H5_DLL haddr_t H5FDget_eoa(H5FD_t *file); +H5_DLL herr_t H5FDset_eoa(H5FD_t *file, haddr_t eof); +H5_DLL haddr_t H5FDget_eof(H5FD_t *file); +H5_DLL herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf/*out*/); -__DLL__ herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, +H5_DLL herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf); -__DLL__ herr_t H5FDflush(H5FD_t *file, unsigned closing); +H5_DLL herr_t H5FDflush(H5FD_t *file, unsigned closing); #ifdef __cplusplus } diff --git a/src/H5FDsec2.h b/src/H5FDsec2.h index e1484d1..5306eb7 100644 --- a/src/H5FDsec2.h +++ b/src/H5FDsec2.h @@ -18,8 +18,8 @@ extern "C" { #endif -__DLL__ hid_t H5FD_sec2_init(void); -__DLL__ herr_t H5Pset_fapl_sec2(hid_t fapl_id); +H5_DLL hid_t H5FD_sec2_init(void); +H5_DLL herr_t H5Pset_fapl_sec2(hid_t fapl_id); #ifdef __cplusplus } diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h index 162b030..6b15d82 100644 --- a/src/H5FDsrb.h +++ b/src/H5FDsrb.h @@ -30,9 +30,9 @@ typedef struct SRB_Info { /* Define the SRB info object. */ extern "C" { #endif -__DLL__ hid_t H5FD_srb_init(void); -__DLL__ herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info); -__DLL__ herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info); +H5_DLL hid_t H5FD_srb_init(void); +H5_DLL herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info); +H5_DLL herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info); #ifdef __cplusplus } diff --git a/src/H5FDstdio.h b/src/H5FDstdio.h index ffeef16..0780796 100644 --- a/src/H5FDstdio.h +++ b/src/H5FDstdio.h @@ -18,8 +18,8 @@ extern "C" { #endif -__DLL__ hid_t H5FD_stdio_init(void); -__DLL__ herr_t H5Pset_fapl_stdio(hid_t fapl_id); +H5_DLL hid_t H5FD_stdio_init(void); +H5_DLL herr_t H5Pset_fapl_stdio(hid_t fapl_id); #ifdef __cplusplus } diff --git a/src/H5FDstream.h b/src/H5FDstream.h index 50d0686..3641e08 100644 --- a/src/H5FDstream.h +++ b/src/H5FDstream.h @@ -68,10 +68,10 @@ typedef struct H5FD_stream_fapl_t /* prototypes of exported functions */ -__DLL__ hid_t H5FD_stream_init (void); -__DLL__ herr_t H5Pset_fapl_stream (hid_t fapl_id, +H5_DLL hid_t H5FD_stream_init (void); +H5_DLL herr_t H5Pset_fapl_stream (hid_t fapl_id, H5FD_stream_fapl_t *fapl); -__DLL__ herr_t H5Pget_fapl_stream (hid_t fapl_id, +H5_DLL herr_t H5Pget_fapl_stream (hid_t fapl_id, H5FD_stream_fapl_t *fapl /*out*/ ); #ifdef __cplusplus diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index bc58d1d..8a8427a 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -197,17 +197,17 @@ typedef struct H5FL_arr_head_t { /* * Library prototypes. */ -__DLL__ void * H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear); -__DLL__ void * H5FL_blk_free(H5FL_blk_head_t *head, void *block); -__DLL__ void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size); -__DLL__ void * H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear); -__DLL__ void * H5FL_reg_free(H5FL_reg_head_t *head, void *obj); -__DLL__ void * H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear); -__DLL__ void * H5FL_arr_free(H5FL_arr_head_t *head, void *obj); -__DLL__ void * H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem); -__DLL__ herr_t H5FL_garbage_coll(void); -__DLL__ herr_t H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, +H5_DLL void * H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear); +H5_DLL void * H5FL_blk_free(H5FL_blk_head_t *head, void *block); +H5_DLL void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size); +H5_DLL void * H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear); +H5_DLL void * H5FL_reg_free(H5FL_reg_head_t *head, void *obj); +H5_DLL void * H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear); +H5_DLL void * H5FL_arr_free(H5FL_arr_head_t *head, void *obj); +H5_DLL void * H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem); +H5_DLL herr_t H5FL_garbage_coll(void); +H5_DLL herr_t H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim, int blk_global_lim, int blk_list_lim); -__DLL__ int H5FL_term_interface(void); +H5_DLL int H5FL_term_interface(void); #endif diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index fb2c58d..4c42ced 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -160,36 +160,36 @@ struct H5F_t { }; #ifdef H5_HAVE_PARALLEL -__DLLVAR__ hbool_t H5_mpi_1_metawrite_g; -__DLLVAR__ hbool_t H5_mpiposix_1_metawrite_g; +H5_DLLVAR hbool_t H5_mpi_1_metawrite_g; +H5_DLLVAR hbool_t H5_mpiposix_1_metawrite_g; #endif /* H5_HAVE_PARALLEL */ /* Private functions, not part of the publicly documented API */ -__DLL__ void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, +H5_DLL void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l); -__DLL__ H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, +H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); -__DLL__ herr_t H5F_close(H5F_t *f); -__DLL__ herr_t H5F_close_all(void); -__DLL__ herr_t H5F_flush_all(hbool_t invalidate); -__DLL__ herr_t H5F_debug(H5F_t *f, haddr_t addr, FILE * stream, +H5_DLL herr_t H5F_close(H5F_t *f); +H5_DLL herr_t H5F_close_all(void); +H5_DLL herr_t H5F_flush_all(hbool_t invalidate); +H5_DLL herr_t H5F_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth); -__DLL__ herr_t H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, +H5_DLL herr_t H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth, int ndims); -__DLL__ herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); +H5_DLL herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); /* Functions that operate on indexed storage */ -__DLL__ herr_t H5F_istore_init (H5F_t *f); -__DLL__ herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt); -__DLL__ herr_t H5F_istore_dest (H5F_t *f); -__DLL__ herr_t H5F_istore_stats (H5F_t *f, hbool_t headers); -__DLL__ herr_t H5F_istore_read(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_istore_init (H5F_t *f); +H5_DLL herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt); +H5_DLL herr_t H5F_istore_dest (H5F_t *f); +H5_DLL herr_t H5F_istore_stats (H5F_t *f, hbool_t headers); +H5_DLL herr_t H5F_istore_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const hsize_t size_m[], const hssize_t offset_m[], const hssize_t offset_f[], const hsize_t size[], void *buf/*out*/); -__DLL__ herr_t H5F_istore_write(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_istore_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const hsize_t size_m[], const hssize_t offset_m[], @@ -197,22 +197,22 @@ __DLL__ herr_t H5F_istore_write(H5F_t *f, hid_t dxpl_id, const void *buf); /* Functions that operate on contiguous storage wrt boot block */ -__DLL__ herr_t H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, void *_buf/*out*/); -__DLL__ herr_t H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, const void *buf); /* Functions that operate on contiguous storage wrt boot block */ -__DLL__ herr_t H5F_contig_readv(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_contig_readv(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size_t nseq, size_t size[], hsize_t offset[], hid_t dxpl_id, void *_buf/*out*/); -__DLL__ herr_t H5F_contig_writev(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_contig_writev(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size_t nseq, size_t size[], hsize_t offset[], hid_t dxpl_id, const void *buf); /* Functions that operate on compact dataset storage */ -__DLL__ herr_t H5F_compact_readv(H5F_t *f, const struct H5O_layout_t *layout, size_t nseq, +H5_DLL herr_t H5F_compact_readv(H5F_t *f, const struct H5O_layout_t *layout, size_t nseq, size_t size_arr[], hsize_t offset_arr[], hid_t dxpl_id, void *_buf/*out*/); -__DLL__ herr_t H5F_compact_writev(H5F_t *f, struct H5O_layout_t *layout, size_t nseq, +H5_DLL herr_t H5F_compact_writev(H5F_t *f, struct H5O_layout_t *layout, size_t nseq, size_t size_arr[], hsize_t offset_arr[], hid_t dxpl_id, const void *_buf); diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index b3a48f3..32c9759 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -178,8 +178,8 @@ typedef struct H5F_t H5F_t; #define H5F_SIZEOF_ADDR(F) (H5F_sizeof_addr(F)) #define H5F_SIZEOF_SIZE(F) (H5F_sizeof_size(F)) -__DLL__ size_t H5F_sizeof_addr(const H5F_t *f); -__DLL__ size_t H5F_sizeof_size(const H5F_t *f); +H5_DLL size_t H5F_sizeof_addr(const H5F_t *f); +H5_DLL size_t H5F_sizeof_size(const H5F_t *f); /* Macros to encode/decode offset/length's for storing in the file */ #ifdef NOT_YET @@ -336,23 +336,23 @@ struct H5P_genplist_t; struct H5S_t; /* Private functions, not part of the publicly documented API */ -__DLL__ herr_t H5F_init(void); -__DLL__ unsigned H5F_get_intent(const H5F_t *f); -__DLL__ hid_t H5F_get_driver_id(const H5F_t *f); -__DLL__ herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum); -__DLL__ herr_t H5F_get_obj_count(H5F_t *f, unsigned types, +H5_DLL herr_t H5F_init(void); +H5_DLL unsigned H5F_get_intent(const H5F_t *f); +H5_DLL hid_t H5F_get_driver_id(const H5F_t *f); +H5_DLL herr_t H5F_get_fileno(const H5F_t *f, unsigned long *filenum); +H5_DLL herr_t H5F_get_obj_count(H5F_t *f, unsigned types, unsigned *obj_id_count); -__DLL__ herr_t H5F_get_obj_ids(H5F_t *f, unsigned types, hid_t *obj_id_list); +H5_DLL herr_t H5F_get_obj_ids(H5F_t *f, unsigned types, hid_t *obj_id_list); /* Functions that operate on array storage */ -__DLL__ herr_t H5F_arr_read (H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_arr_read (H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const hsize_t _hslab_size[], const hsize_t mem_size[], const hssize_t mem_offset[], const hssize_t file_offset[], void *_buf/*out*/); -__DLL__ herr_t H5F_arr_write (H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_arr_write (H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const hsize_t _hslab_size[], @@ -361,30 +361,30 @@ __DLL__ herr_t H5F_arr_write (H5F_t *f, hid_t dxpl_id, const hssize_t file_offset[], const void *_buf); /* Functions that operate on blocks of bytes wrt boot block */ -__DLL__ herr_t H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, void *buf/*out*/); -__DLL__ herr_t H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, +H5_DLL herr_t H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, const void *buf); /* Functions that operate on byte sequences */ -__DLL__ herr_t H5F_seq_read(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_seq_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, void *_buf/*out*/); -__DLL__ herr_t H5F_seq_write (H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_seq_write (H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, const void *_buf); /* Functions that operate on vectors of byte sequences */ -__DLL__ herr_t H5F_seq_readv(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *file_space, size_t elmt_size, size_t nseq, size_t seq_len[], hsize_t file_offset[], void *_buf/*out*/); -__DLL__ herr_t H5F_seq_writev(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_seq_writev(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *file_space, size_t elmt_size, size_t nseq, @@ -392,37 +392,37 @@ __DLL__ herr_t H5F_seq_writev(H5F_t *f, hid_t dxpl_id, /* Functions that operate on contiguous storage */ -__DLL__ herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *space, size_t elmt_size); /* Functions that operate on indexed storage */ -__DLL__ herr_t H5F_istore_create(H5F_t *f, +H5_DLL herr_t H5F_istore_create(H5F_t *f, struct H5O_layout_t *layout/*in,out*/); -__DLL__ herr_t H5F_istore_allocate (H5F_t *f, hid_t dxpl_id, +H5_DLL herr_t H5F_istore_allocate (H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, const hsize_t *space_dim, struct H5P_genplist_t *dc_plist); -__DLL__ hsize_t H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr); -__DLL__ herr_t H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, +H5_DLL hsize_t H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr); +H5_DLL herr_t H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr); -__DLL__ herr_t H5F_istore_prune_by_extent( H5F_t *f, +H5_DLL herr_t H5F_istore_prune_by_extent( H5F_t *f, const struct H5O_layout_t *layout, const struct H5S_t *space); -__DLL__ herr_t H5F_istore_initialize_by_extent( H5F_t *f, +H5_DLL herr_t H5F_istore_initialize_by_extent( H5F_t *f, const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, const struct H5S_t *space ); /* Address-related functions */ -__DLL__ void H5F_addr_encode(H5F_t *, uint8_t** /*in,out*/, haddr_t); -__DLL__ void H5F_addr_decode(H5F_t *, const uint8_t** /*in,out*/, +H5_DLL void H5F_addr_encode(H5F_t *, uint8_t** /*in,out*/, haddr_t); +H5_DLL void H5F_addr_decode(H5F_t *, const uint8_t** /*in,out*/, haddr_t* /*out*/); -__DLL__ herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr_p /*out*/, +H5_DLL herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr_p /*out*/, const unsigned long objno[2]); /* callback Functions for file access class */ -__DLL__ herr_t H5F_acs_create(hid_t fapl_id, void *close_data); -__DLL__ herr_t H5F_acs_close(hid_t fapl_id, void *close_data); -__DLL__ herr_t H5F_acs_copy(hid_t new_fapl_id, hid_t old_fapl_id, +H5_DLL herr_t H5F_acs_create(hid_t fapl_id, void *close_data); +H5_DLL herr_t H5F_acs_close(hid_t fapl_id, void *close_data); +H5_DLL herr_t H5F_acs_copy(hid_t new_fapl_id, hid_t old_fapl_id, void *close_data); #endif diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 72a0011..fc23620 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -82,21 +82,21 @@ extern "C" { #endif /* Functions in H5F.c */ -__DLL__ htri_t H5Fis_hdf5 (const char *filename); -__DLL__ hid_t H5Fcreate (const char *filename, unsigned flags, +H5_DLL htri_t H5Fis_hdf5 (const char *filename); +H5_DLL hid_t H5Fcreate (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist); -__DLL__ hid_t H5Fopen (const char *filename, unsigned flags, +H5_DLL hid_t H5Fopen (const char *filename, unsigned flags, hid_t access_plist); -__DLL__ hid_t H5Freopen(hid_t file_id); -__DLL__ herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); -__DLL__ herr_t H5Fclose (hid_t file_id); -__DLL__ hid_t H5Fget_create_plist (hid_t file_id); -__DLL__ hid_t H5Fget_access_plist (hid_t file_id); -__DLL__ herr_t H5Fget_obj_count(hid_t file_id, unsigned types, +H5_DLL hid_t H5Freopen(hid_t file_id); +H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); +H5_DLL herr_t H5Fclose (hid_t file_id); +H5_DLL hid_t H5Fget_create_plist (hid_t file_id); +H5_DLL hid_t H5Fget_access_plist (hid_t file_id); +H5_DLL herr_t H5Fget_obj_count(hid_t file_id, unsigned types, unsigned *obj_id_count); -__DLL__ herr_t H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *obj_id_list); -__DLL__ herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); -__DLL__ herr_t H5Funmount(hid_t loc, const char *name); +H5_DLL herr_t H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *obj_id_list); +H5_DLL herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); +H5_DLL herr_t H5Funmount(hid_t loc, const char *name); #ifdef __cplusplus } diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index c861188..9d2b98c 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -112,35 +112,35 @@ typedef struct H5G_bt_ud2_t { /* * This is the class identifier to give to the B-tree functions. */ -__DLLVAR__ H5B_class_t H5B_SNODE[1]; +H5_DLLVAR H5B_class_t H5B_SNODE[1]; /* The cache subclass */ -__DLLVAR__ const H5AC_class_t H5AC_SNODE[1]; +H5_DLLVAR const H5AC_class_t H5AC_SNODE[1]; /* * Functions that understand symbol tables but not names. The * functions that understand names are exported to the rest of * the library and appear in H5Gprivate.h. */ -__DLL__ herr_t H5G_stab_create(H5F_t *f, size_t size_hint, +H5_DLL herr_t H5G_stab_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); -__DLL__ herr_t H5G_stab_find(H5G_entry_t *grp_ent, const char *name, +H5_DLL herr_t H5G_stab_find(H5G_entry_t *grp_ent, const char *name, H5G_entry_t *obj_ent/*out*/); -__DLL__ herr_t H5G_stab_insert(H5G_entry_t *grp_ent, const char *name, +H5_DLL herr_t H5G_stab_insert(H5G_entry_t *grp_ent, const char *name, H5G_entry_t *obj_ent); -__DLL__ herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name); +H5_DLL herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name); /* * Functions that understand symbol table entries. */ -__DLL__ herr_t H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, +H5_DLL herr_t H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, int n); -__DLL__ herr_t H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, +H5_DLL herr_t H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, int n); /* Functions that understand symbol table nodes */ -__DLL__ unsigned H5G_node_k(const H5F_t *f); -__DLL__ herr_t H5G_node_iterate (H5F_t *f, void UNUSED *_lt_key, haddr_t addr, +H5_DLL unsigned H5G_node_k(const H5F_t *f); +H5_DLL herr_t H5G_node_iterate (H5F_t *f, void UNUSED *_lt_key, haddr_t addr, void UNUSED *_rt_key, void *_udata); #endif diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index fe32237..20ea00b 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -135,52 +135,52 @@ typedef struct H5G_names_t { * Library prototypes... These are the ones that other packages routinely * call. */ -__DLL__ herr_t H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), +H5_DLL herr_t H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), const char *desc); -__DLL__ H5G_entry_t *H5G_loc(hid_t loc_id); -__DLL__ herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry); -__DLL__ H5G_entry_t *H5G_entof(H5G_t *grp); -__DLL__ H5F_t *H5G_fileof(H5G_t *grp); -__DLL__ H5G_t *H5G_create(H5G_entry_t *loc, const char *name, +H5_DLL H5G_entry_t *H5G_loc(hid_t loc_id); +H5_DLL herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry); +H5_DLL H5G_entry_t *H5G_entof(H5G_t *grp); +H5_DLL H5F_t *H5G_fileof(H5G_t *grp); +H5_DLL H5G_t *H5G_create(H5G_entry_t *loc, const char *name, size_t size_hint); -__DLL__ H5G_t *H5G_open(H5G_entry_t *loc, const char *name); -__DLL__ H5G_t *H5G_open_oid(H5G_entry_t *ent); -__DLL__ H5G_t *H5G_reopen(H5G_t *grp); -__DLL__ herr_t H5G_close(H5G_t *grp); -__DLL__ H5G_t *H5G_rootof(H5F_t *f); -__DLL__ htri_t H5G_isa(H5G_entry_t *ent); -__DLL__ herr_t H5G_link(H5G_entry_t *cur_loc, const char *cur_name, +H5_DLL H5G_t *H5G_open(H5G_entry_t *loc, const char *name); +H5_DLL H5G_t *H5G_open_oid(H5G_entry_t *ent); +H5_DLL H5G_t *H5G_reopen(H5G_t *grp); +H5_DLL herr_t H5G_close(H5G_t *grp); +H5_DLL H5G_t *H5G_rootof(H5F_t *f); +H5_DLL htri_t H5G_isa(H5G_entry_t *ent); +H5_DLL herr_t H5G_link(H5G_entry_t *cur_loc, const char *cur_name, H5G_entry_t *new_loc, const char *new_name, H5G_link_t type, unsigned namei_flags); -__DLL__ int H5G_get_type(H5G_entry_t *ent); -__DLL__ herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name, +H5_DLL int H5G_get_type(H5G_entry_t *ent); +H5_DLL herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name, hbool_t follow_link, H5G_stat_t *statbuf/*out*/); -__DLL__ herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size, +H5_DLL herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size, char *buf/*out*/); -__DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, +H5_DLL herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf); -__DLL__ int H5G_get_comment(H5G_entry_t *loc, const char *name, +H5_DLL int H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf); -__DLL__ herr_t H5G_insert(H5G_entry_t *loc, const char *name, +H5_DLL herr_t H5G_insert(H5G_entry_t *loc, const char *name, H5G_entry_t *ent); -__DLL__ herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name, +H5_DLL herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name, H5G_entry_t *dst_loc, const char *dst_name); -__DLL__ herr_t H5G_unlink(H5G_entry_t *loc, const char *name); -__DLL__ herr_t H5G_find(H5G_entry_t *loc, const char *name, +H5_DLL herr_t H5G_unlink(H5G_entry_t *loc, const char *name); +H5_DLL herr_t H5G_find(H5G_entry_t *loc, const char *name, H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/); -__DLL__ H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name); -__DLL__ herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/, +H5_DLL H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name); +H5_DLL herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/, H5G_entry_t *obj_ent/*in,out*/, int *nlinks/*in,out*/); -__DLL__ herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent); -__DLL__ herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp, +H5_DLL herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent); +H5_DLL herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent/*out*/); /* * These functions operate on symbol table nodes. */ -__DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, +H5_DLL herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t heap); /* @@ -188,15 +188,15 @@ __DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, * in the H5O package where header messages are cached in symbol table * entries. The subclasses of H5O probably don't need them though. */ -__DLL__ H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type); -__DLL__ herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type); -__DLL__ herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream, +H5_DLL H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type); +H5_DLL herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type); +H5_DLL herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream, int indent, int fwidth, haddr_t heap); -__DLL__ herr_t H5G_replace_name( int type, H5G_entry_t *loc, const char *src_name, +H5_DLL herr_t H5G_replace_name( int type, H5G_entry_t *loc, const char *src_name, const char *dst_name, int op ); -__DLL__ herr_t H5G_insert_name( H5G_entry_t *loc, H5G_entry_t *obj, const char *name); -__DLL__ herr_t H5G_ent_copy( const H5G_entry_t *src, H5G_entry_t *dst ); +H5_DLL herr_t H5G_insert_name( H5G_entry_t *loc, H5G_entry_t *obj, const char *name); +H5_DLL herr_t H5G_ent_copy( const H5G_entry_t *src, H5G_entry_t *dst ); /*Free the ID to name buffer */ -__DLL__ herr_t H5G_free_grp_name(H5G_t *grp); -__DLL__ herr_t H5G_free_ent_name(H5G_entry_t *ent); +H5_DLL herr_t H5G_free_grp_name(H5G_t *grp); +H5_DLL herr_t H5G_free_ent_name(H5G_entry_t *ent); #endif diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 943aaa5..96ed37f 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -76,23 +76,23 @@ typedef struct H5G_stat_t { typedef herr_t (*H5G_iterate_t)(hid_t group, const char *name, void *op_data); -__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, +H5_DLL hid_t H5Gcreate(hid_t loc_id, const char *name, size_t size_hint); +H5_DLL hid_t H5Gopen(hid_t loc_id, const char *name); +H5_DLL herr_t H5Gclose(hid_t group_id); +H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, void *op_data); -__DLL__ herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, +H5_DLL herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, const char *dst); -__DLL__ herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type, +H5_DLL herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type, hid_t dst_loc, const char *new_name); -__DLL__ herr_t H5Gunlink(hid_t loc_id, const char *name); -__DLL__ herr_t H5Gget_objinfo(hid_t loc_id, const char *name, +H5_DLL herr_t H5Gunlink(hid_t loc_id, const char *name); +H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *statbuf/*out*/); -__DLL__ herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size, +H5_DLL herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/); -__DLL__ herr_t H5Gset_comment(hid_t loc_id, const char *name, +H5_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, +H5_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 e255afe..28c6736 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -96,14 +96,14 @@ typedef struct H5HG_t { typedef struct H5HG_heap_t H5HG_heap_t; -__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, +H5_DLL H5HG_heap_t *H5HG_create(H5F_t *f, size_t size); +H5_DLL herr_t H5HG_insert(H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/); -__DLL__ void *H5HG_peek(H5F_t *f, H5HG_t *hobj); -__DLL__ void *H5HG_read(H5F_t *f, H5HG_t *hobj, void *object); -__DLL__ int H5HG_link(H5F_t *f, H5HG_t *hobj, int adjust); -__DLL__ herr_t H5HG_remove(H5F_t *f, H5HG_t *hobj); -__DLL__ herr_t H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, +H5_DLL void *H5HG_peek(H5F_t *f, H5HG_t *hobj); +H5_DLL void *H5HG_read(H5F_t *f, H5HG_t *hobj, void *object); +H5_DLL int H5HG_link(H5F_t *f, H5HG_t *hobj, int adjust); +H5_DLL herr_t H5HG_remove(H5F_t *f, H5HG_t *hobj); +H5_DLL herr_t H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth); #endif diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index ba659ba..3aa630e 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -50,15 +50,15 @@ /* * Library prototypes... */ -__DLL__ herr_t H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/); -__DLL__ void *H5HL_read(H5F_t *f, haddr_t addr, size_t offset, size_t size, +H5_DLL herr_t H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/); +H5_DLL void *H5HL_read(H5F_t *f, haddr_t addr, size_t offset, size_t size, void *buf); -__DLL__ const void *H5HL_peek(H5F_t *f, haddr_t addr, size_t offset); -__DLL__ size_t H5HL_insert(H5F_t *f, haddr_t addr, size_t size, +H5_DLL const void *H5HL_peek(H5F_t *f, haddr_t addr, size_t offset); +H5_DLL size_t H5HL_insert(H5F_t *f, haddr_t addr, size_t size, const void *buf); -__DLL__ herr_t H5HL_write(H5F_t *f, haddr_t addr, size_t offset, size_t size, +H5_DLL herr_t H5HL_write(H5F_t *f, haddr_t addr, size_t offset, size_t size, const void *buf); -__DLL__ herr_t H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size); -__DLL__ herr_t H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, +H5_DLL herr_t H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size); +H5_DLL herr_t H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth); #endif diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index 0589cc6..e13ab32 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -123,18 +123,18 @@ typedef struct { } H5I_id_group_t; /* Private Functions in H5I.c */ -__DLL__ int H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved, +H5_DLL int H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved, H5I_free_t func); -__DLL__ int H5I_nmembers(H5I_type_t grp); -__DLL__ herr_t H5I_clear_group(H5I_type_t grp, hbool_t force); -__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__ void *H5I_object_verify(hid_t id, H5I_type_t id_type); -__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, +H5_DLL int H5I_nmembers(H5I_type_t grp); +H5_DLL herr_t H5I_clear_group(H5I_type_t grp, hbool_t force); +H5_DLL herr_t H5I_destroy_group(H5I_type_t grp); +H5_DLL hid_t H5I_register(H5I_type_t grp, void *object); +H5_DLL void *H5I_object(hid_t id); +H5_DLL void *H5I_object_verify(hid_t id, H5I_type_t id_type); +H5_DLL H5I_type_t H5I_get_type(hid_t id); +H5_DLL void *H5I_remove(hid_t id); +H5_DLL void *H5I_search(H5I_type_t grp, H5I_search_func_t func, const void *key); -__DLL__ int H5I_inc_ref(hid_t id); -__DLL__ int H5I_dec_ref(hid_t id); +H5_DLL int H5I_inc_ref(hid_t id); +H5_DLL int H5I_dec_ref(hid_t id); #endif diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h index 2773f66..9110004 100644 --- a/src/H5Ipublic.h +++ b/src/H5Ipublic.h @@ -51,10 +51,10 @@ typedef int hid_t; extern "C" { #endif -__DLL__ H5I_type_t H5Iget_type(hid_t id); -__DLL__ ssize_t H5Iget_name(hid_t object_id, char *name/*out*/, size_t size); -__DLL__ herr_t H5Idebug_name(hid_t id); -__DLL__ herr_t H5Idebug_grp(H5I_type_t grp); +H5_DLL H5I_type_t H5Iget_type(hid_t id); +H5_DLL ssize_t H5Iget_name(hid_t object_id, char *name/*out*/, size_t size); +H5_DLL herr_t H5Idebug_name(hid_t id); +H5_DLL herr_t H5Idebug_grp(H5I_type_t grp); diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h index ee4d884..1c72507 100644 --- a/src/H5MFprivate.h +++ b/src/H5MFprivate.h @@ -33,10 +33,10 @@ /* * Library prototypes... */ -__DLL__ haddr_t H5MF_alloc(H5F_t *f, H5FD_mem_t type, hsize_t size); -__DLL__ herr_t H5MF_xfree(H5F_t *f, H5FD_mem_t type, haddr_t addr, +H5_DLL haddr_t H5MF_alloc(H5F_t *f, H5FD_mem_t type, hsize_t size); +H5_DLL herr_t H5MF_xfree(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size); -__DLL__ haddr_t H5MF_realloc(H5F_t *f, H5FD_mem_t type, haddr_t old_addr, +H5_DLL haddr_t H5MF_realloc(H5F_t *f, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size, hsize_t new_size); #endif diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h index 0f1a597..1dac78e 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -34,9 +34,9 @@ /* * Library prototypes... */ -__DLL__ void *H5MM_realloc(void *mem, size_t size); -__DLL__ char *H5MM_xstrdup(const char *s); -__DLL__ char *H5MM_strdup(const char *s); -__DLL__ void *H5MM_xfree(void *mem); +H5_DLL void *H5MM_realloc(void *mem, size_t size); +H5_DLL char *H5MM_xstrdup(const char *s); +H5_DLL char *H5MM_strdup(const char *s); +H5_DLL void *H5MM_xfree(void *mem); #endif diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index f7b8d9a..365a65f 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -119,13 +119,13 @@ typedef struct H5O_t { * Null Message. */ #define H5O_NULL_ID 0x0000 -__DLLVAR__ const H5O_class_t H5O_NULL[1]; +H5_DLLVAR const H5O_class_t H5O_NULL[1]; /* * Simple Data Space Message. */ #define H5O_SDSPACE_ID 0x0001 -__DLLVAR__ const H5O_class_t H5O_SDSPACE[1]; +H5_DLLVAR const H5O_class_t H5O_SDSPACE[1]; /* operates on an H5S_t struct */ @@ -133,7 +133,7 @@ __DLLVAR__ const H5O_class_t H5O_SDSPACE[1]; * Data Type Message. */ #define H5O_DTYPE_ID 0x0003 -__DLLVAR__ const H5O_class_t H5O_DTYPE[1]; +H5_DLLVAR const H5O_class_t H5O_DTYPE[1]; /* operates on an H5T_t struct */ @@ -141,7 +141,7 @@ __DLLVAR__ const H5O_class_t H5O_DTYPE[1]; * Old Fill Value Message. */ #define H5O_FILL_ID 0x0004 -__DLLVAR__ const H5O_class_t H5O_FILL[1]; +H5_DLLVAR const H5O_class_t H5O_FILL[1]; typedef struct H5O_fill_t { H5T_t *type; /*type. Null implies same as dataset */ @@ -155,7 +155,7 @@ typedef struct H5O_fill_t { * value is defined. */ #define H5O_FILL_NEW_ID 0x0005 -__DLLVAR__ const H5O_class_t H5O_FILL_NEW[1]; +H5_DLLVAR const H5O_class_t H5O_FILL_NEW[1]; typedef struct H5O_fill_new_t { H5T_t *type; /*type. Null implies same as dataset */ @@ -172,7 +172,7 @@ typedef struct H5O_fill_new_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 */ -__DLLVAR__ const H5O_class_t H5O_EFL[1];/*external file list class */ +H5_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 */ @@ -193,7 +193,7 @@ typedef struct H5O_efl_t { */ #define H5O_LAYOUT_ID 0x0008 #define H5O_LAYOUT_NDIMS (H5S_MAX_RANK+1) -__DLLVAR__ const H5O_class_t H5O_LAYOUT[1]; +H5_DLLVAR const H5O_class_t H5O_LAYOUT[1]; typedef struct H5O_layout_t { int type; /*type of layout, H5D_layout_t */ @@ -209,7 +209,7 @@ typedef struct H5O_layout_t { * Filter pipeline message. */ #define H5O_PLINE_ID 0x000b -__DLLVAR__ const H5O_class_t H5O_PLINE[1]; +H5_DLLVAR const H5O_class_t H5O_PLINE[1]; typedef struct H5O_pline_t { size_t nfilters; /*num filters defined */ @@ -227,7 +227,7 @@ typedef struct H5O_pline_t { * Attribute Message. */ #define H5O_ATTR_ID 0x000c -__DLLVAR__ const H5O_class_t H5O_ATTR[1]; +H5_DLLVAR const H5O_class_t H5O_ATTR[1]; /* operates on an H5A_t struct */ @@ -235,7 +235,7 @@ __DLLVAR__ const H5O_class_t H5O_ATTR[1]; * Object name message. */ #define H5O_NAME_ID 0x000d -__DLLVAR__ const H5O_class_t H5O_NAME[1]; +H5_DLLVAR const H5O_class_t H5O_NAME[1]; typedef struct H5O_name_t { char *s; /*ptr to malloc'd memory */ @@ -245,7 +245,7 @@ typedef struct H5O_name_t { * Modification time message. The message is just a `time_t'. */ #define H5O_MTIME_ID 0x000e -__DLLVAR__ const H5O_class_t H5O_MTIME[1]; +H5_DLLVAR const H5O_class_t H5O_MTIME[1]; /* * Shared object message. This message ID never really appears in an object @@ -253,7 +253,7 @@ __DLLVAR__ const H5O_class_t H5O_MTIME[1]; * will be the ID of the pointed-to message. */ #define H5O_SHARED_ID 0x000f -__DLLVAR__ const H5O_class_t H5O_SHARED[1]; +H5_DLLVAR const H5O_class_t H5O_SHARED[1]; typedef struct H5O_shared_t { hbool_t in_gh; /*shared by global heap? */ @@ -267,7 +267,7 @@ typedef struct H5O_shared_t { * Object header continuation message. */ #define H5O_CONT_ID 0x0010 -__DLLVAR__ const H5O_class_t H5O_CONT[1]; +H5_DLLVAR const H5O_class_t H5O_CONT[1]; typedef struct H5O_cont_t { haddr_t addr; /*address of continuation block */ @@ -281,9 +281,9 @@ typedef struct H5O_cont_t { * Symbol table message. */ #define H5O_STAB_ID 0x0011 -__DLLVAR__ const H5O_class_t H5O_STAB[1]; +H5_DLLVAR const H5O_class_t H5O_STAB[1]; -__DLL__ void *H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, +H5_DLL void *H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg); typedef struct H5O_stab_t { @@ -292,40 +292,40 @@ typedef struct H5O_stab_t { } H5O_stab_t; /* General message operators */ -__DLL__ herr_t H5O_create(H5F_t *f, size_t size_hint, +H5_DLL herr_t H5O_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); -__DLL__ herr_t H5O_open(H5G_entry_t *ent); -__DLL__ herr_t H5O_close(H5G_entry_t *ent); -__DLL__ int H5O_link(H5G_entry_t *ent, int adjust); -__DLL__ int 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, +H5_DLL herr_t H5O_open(H5G_entry_t *ent); +H5_DLL herr_t H5O_close(H5G_entry_t *ent); +H5_DLL int H5O_link(H5G_entry_t *ent, int adjust); +H5_DLL int H5O_count(H5G_entry_t *ent, const H5O_class_t *type); +H5_DLL htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, int sequence); -__DLL__ void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type, +H5_DLL void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mesg); -__DLL__ int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, +H5_DLL int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, int overwrite, unsigned flags, const void *mesg); -__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, +H5_DLL herr_t H5O_touch(H5G_entry_t *ent, hbool_t force); +H5_DLL herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, int sequence); -__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, +H5_DLL herr_t H5O_reset(const H5O_class_t *type, void *native); +H5_DLL void *H5O_free(const H5O_class_t *type, void *mesg); +H5_DLL void *H5O_copy(const H5O_class_t *type, const void *mesg, void *dst); +H5_DLL herr_t H5O_share(H5F_t *f, const H5O_class_t *type, const void *mesg, H5HG_t *hobj/*out*/); -__DLL__ herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, +H5_DLL herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth); /* Layout operators */ -__DLL__ size_t H5O_layout_meta_size(H5F_t *f, const void *_mesg); +H5_DLL size_t H5O_layout_meta_size(H5F_t *f, const void *_mesg); /* EFL operators */ -__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, +H5_DLL hsize_t H5O_efl_total_size(H5O_efl_t *efl); +H5_DLL herr_t H5O_efl_read(H5F_t *f, const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf); -__DLL__ herr_t H5O_efl_write(H5F_t *f, const H5O_efl_t *efl, haddr_t addr, +H5_DLL herr_t H5O_efl_write(H5F_t *f, const H5O_efl_t *efl, haddr_t addr, size_t size, const uint8_t *buf); /* Fill value operators */ -__DLL__ herr_t H5O_fill_convert(void *_fill, H5T_t *type); +H5_DLL herr_t H5O_fill_convert(void *_fill, H5T_t *type); #endif diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index fc0d64f..03ab355 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -26,45 +26,45 @@ typedef struct H5P_genplist_t H5P_genplist_t; typedef struct H5P_genclass_t H5P_genclass_t; /* Private functions, not part of the publicly documented API */ -__DLL__ herr_t H5P_init(void); +H5_DLL herr_t H5P_init(void); /* Internal versions of API routines */ -__DLL__ hid_t H5P_create_id(H5P_genclass_t *pclass); -__DLL__ hid_t H5P_copy_plist(H5P_genplist_t *old_plist); -__DLL__ herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value); -__DLL__ herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value); -__DLL__ herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, +H5_DLL hid_t H5P_create_id(H5P_genclass_t *pclass); +H5_DLL hid_t H5P_copy_plist(H5P_genplist_t *old_plist); +H5_DLL herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value); +H5_DLL herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value); +H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close); -__DLL__ herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name); -__DLL__ htri_t H5P_exist_plist(H5P_genplist_t *plist, const char *name); -__DLL__ char *H5P_get_class_name(H5P_genclass_t *pclass); -__DLL__ herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops); -__DLL__ herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size, +H5_DLL herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name); +H5_DLL htri_t H5P_exist_plist(H5P_genplist_t *plist, const char *name); +H5_DLL char *H5P_get_class_name(H5P_genclass_t *pclass); +H5_DLL herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops); +H5_DLL herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size, void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close); -__DLL__ hid_t H5P_get_driver(H5P_genplist_t *plist); -__DLL__ void * H5P_get_driver_info(H5P_genplist_t *plist); -__DLL__ herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, +H5_DLL hid_t H5P_get_driver(H5P_genplist_t *plist); +H5_DLL void * H5P_get_driver_info(H5P_genplist_t *plist); +H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_driver_info); -__DLL__ herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist, +H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func, void *free_info); -__DLL__ herr_t H5P_fill_value_defined(H5P_genplist_t *plist, +H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status); /* *SPECIAL* Don't make more of these! -QAK */ -__DLL__ htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id); -__DLL__ void *H5P_object_verify(hid_t plist_id, hid_t pclass_id); +H5_DLL htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id); +H5_DLL void *H5P_object_verify(hid_t plist_id, hid_t pclass_id); /* Private functions to "peek" at properties of a certain type */ -__DLL__ unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name); -__DLL__ hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name); -__DLL__ void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name); -__DLL__ hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name); -__DLL__ size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name); +H5_DLL unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name); +H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name); +H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name); +H5_DLL hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name); +H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name); #endif diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 9692ae4..f09356d 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -85,12 +85,12 @@ extern "C" { #define H5P_DATASET_XFER_HASH_SIZE 17 #define H5P_MOUNT (H5open(), H5P_CLS_MOUNT_g) #define H5P_MOUNT_HASH_SIZE 17 -__DLLVAR__ hid_t H5P_CLS_NO_CLASS_g; -__DLLVAR__ hid_t H5P_CLS_FILE_CREATE_g; -__DLLVAR__ hid_t H5P_CLS_FILE_ACCESS_g; -__DLLVAR__ hid_t H5P_CLS_DATASET_CREATE_g; -__DLLVAR__ hid_t H5P_CLS_DATASET_XFER_g; -__DLLVAR__ hid_t H5P_CLS_MOUNT_g; +H5_DLLVAR hid_t H5P_CLS_NO_CLASS_g; +H5_DLLVAR hid_t H5P_CLS_FILE_CREATE_g; +H5_DLLVAR hid_t H5P_CLS_FILE_ACCESS_g; +H5_DLLVAR hid_t H5P_CLS_DATASET_CREATE_g; +H5_DLLVAR hid_t H5P_CLS_DATASET_XFER_g; +H5_DLLVAR hid_t H5P_CLS_MOUNT_g; /* * The library created default property lists @@ -101,169 +101,169 @@ __DLLVAR__ hid_t H5P_CLS_MOUNT_g; #define H5P_DATASET_CREATE_DEFAULT (H5open(), H5P_LST_DATASET_CREATE_g) #define H5P_DATASET_XFER_DEFAULT (H5open(), H5P_LST_DATASET_XFER_g) #define H5P_MOUNT_DEFAULT (H5open(), H5P_LST_MOUNT_g) -__DLLVAR__ hid_t H5P_LST_NO_CLASS_g; -__DLLVAR__ hid_t H5P_LST_FILE_CREATE_g; -__DLLVAR__ hid_t H5P_LST_FILE_ACCESS_g; -__DLLVAR__ hid_t H5P_LST_DATASET_CREATE_g; -__DLLVAR__ hid_t H5P_LST_DATASET_XFER_g; -__DLLVAR__ hid_t H5P_LST_MOUNT_g; +H5_DLLVAR hid_t H5P_LST_NO_CLASS_g; +H5_DLLVAR hid_t H5P_LST_FILE_CREATE_g; +H5_DLLVAR hid_t H5P_LST_FILE_ACCESS_g; +H5_DLLVAR hid_t H5P_LST_DATASET_CREATE_g; +H5_DLLVAR hid_t H5P_LST_DATASET_XFER_g; +H5_DLLVAR hid_t H5P_LST_MOUNT_g; /* Public functions */ -__DLL__ hid_t H5Pcreate_class(hid_t parent, const char *name, unsigned hashsize, +H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name, unsigned hashsize, H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data, H5P_cls_close_func_t cls_close, void *close_data); -__DLL__ char *H5Pget_class_name(hid_t pclass_id); -__DLL__ hid_t H5Pcreate(hid_t cls_id); -__DLL__ herr_t H5Pregister(hid_t cls_id, const char *name, size_t size, +H5_DLL char *H5Pget_class_name(hid_t pclass_id); +H5_DLL hid_t H5Pcreate(hid_t cls_id); +H5_DLL herr_t H5Pregister(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close); -__DLL__ herr_t H5Pinsert(hid_t plist_id, const char *name, size_t size, +H5_DLL herr_t H5Pinsert(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close); -__DLL__ herr_t H5Pset(hid_t plist_id, const char *name, void *value); -__DLL__ htri_t H5Pexist(hid_t plist_id, const char *name); -__DLL__ herr_t H5Pget_size(hid_t id, const char *name, size_t *size); -__DLL__ herr_t H5Pget_nprops(hid_t id, size_t *nprops); -__DLL__ hid_t H5Pget_class(hid_t plist_id); -__DLL__ hid_t H5Pget_class_parent(hid_t pclass_id); -__DLL__ herr_t H5Pget(hid_t plist_id, const char *name, void * value); -__DLL__ htri_t H5Pequal(hid_t id1, hid_t id2); -__DLL__ htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id); -__DLL__ int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, +H5_DLL herr_t H5Pset(hid_t plist_id, const char *name, void *value); +H5_DLL htri_t H5Pexist(hid_t plist_id, const char *name); +H5_DLL herr_t H5Pget_size(hid_t id, const char *name, size_t *size); +H5_DLL herr_t H5Pget_nprops(hid_t id, size_t *nprops); +H5_DLL hid_t H5Pget_class(hid_t plist_id); +H5_DLL hid_t H5Pget_class_parent(hid_t pclass_id); +H5_DLL herr_t H5Pget(hid_t plist_id, const char *name, void * value); +H5_DLL htri_t H5Pequal(hid_t id1, hid_t id2); +H5_DLL htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id); +H5_DLL int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data); -__DLL__ herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name); -__DLL__ herr_t H5Premove(hid_t plist_id, const char *name); -__DLL__ herr_t H5Punregister(hid_t pclass_id, const char *name); -__DLL__ herr_t H5Pclose_class(hid_t plist_id); -__DLL__ herr_t H5Pclose(hid_t plist_id); -__DLL__ hid_t H5Pcopy(hid_t plist_id); -__DLL__ herr_t H5Pget_version(hid_t plist_id, int *boot/*out*/, +H5_DLL herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name); +H5_DLL herr_t H5Premove(hid_t plist_id, const char *name); +H5_DLL herr_t H5Punregister(hid_t pclass_id, const char *name); +H5_DLL herr_t H5Pclose_class(hid_t plist_id); +H5_DLL herr_t H5Pclose(hid_t plist_id); +H5_DLL hid_t H5Pcopy(hid_t plist_id); +H5_DLL herr_t H5Pget_version(hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, int *stab/*out*/, int *shhdr/*out*/); -__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, +H5_DLL herr_t H5Pset_userblock(hid_t plist_id, hsize_t size); +H5_DLL herr_t H5Pget_userblock(hid_t plist_id, hsize_t *size); +H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment); -__DLL__ herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/, +H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/, hsize_t *alignment/*out*/); -__DLL__ herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, +H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size); -__DLL__ herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/, +H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/, size_t *sizeof_size/*out*/); #ifdef H5_WANT_H5_V1_4_COMPAT -__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*/); +H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, int lk); +H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, int *lk/*out*/); #else /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk); -__DLL__ herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, unsigned *lk/*out*/); +H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk); +H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, unsigned *lk/*out*/); #endif /* H5_WANT_H5_V1_4_COMPAT */ -__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, +H5_DLL herr_t H5Pset_istore_k(hid_t plist_id, int ik); +H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, int *ik/*out*/); +H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout); +H5_DLL H5D_layout_t H5Pget_layout(hid_t plist_id); +H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[]); +H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/); +H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t 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, +H5_DLL int H5Pget_external_count(hid_t plist_id); +H5_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*/); -__DLL__ herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id, +H5_DLL herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id, const void *driver_info); -__DLL__ hid_t H5Pget_driver(hid_t plist_id); -__DLL__ void *H5Pget_driver_info(hid_t plist_id); +H5_DLL hid_t H5Pget_driver(hid_t plist_id); +H5_DLL void *H5Pget_driver_info(hid_t plist_id); #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ herr_t H5Pset_buffer(hid_t plist_id, hsize_t size, void *tconv, +H5_DLL herr_t H5Pset_buffer(hid_t plist_id, hsize_t size, void *tconv, void *bkg); -__DLL__ hsize_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, +H5_DLL hsize_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); #else /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, +H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg); -__DLL__ size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, +H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); #endif /* H5_WANT_H5_V1_4_COMPAT */ -__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, +H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status); +H5_DLL int H5Pget_preserve(hid_t plist_id); +H5_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[]); -__DLL__ int H5Pget_nfilters(hid_t plist_id); -__DLL__ H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter, +H5_DLL int H5Pget_nfilters(hid_t plist_id); +H5_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[]); -__DLL__ herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression); +H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned aggression); #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, +H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0); -__DLL__ herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/, +H5_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); #else /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nelmts, +H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0); -__DLL__ herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/, +H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/, size_t *rdcc_nelmts/*out*/, size_t *rdcc_nbytes/*out*/, double *rdcc_w0); #endif /* H5_WANT_H5_V1_4_COMPAT */ #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, +H5_DLL herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit); -__DLL__ herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, +H5_DLL herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, unsigned *limit); #endif /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, +H5_DLL herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right); -__DLL__ herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, +H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/, double *right/*out*/); -__DLL__ herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, +H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value); -__DLL__ herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, +H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/); -__DLL__ herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status); -__DLL__ herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t +H5_DLL herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status); +H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time); -__DLL__ herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t +H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/); -__DLL__ herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time); -__DLL__ herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t +H5_DLL herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time); +H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/); -__DLL__ herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); -__DLL__ herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/); -__DLL__ herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree); -__DLL__ herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree); -__DLL__ herr_t H5Pset_vlen_mem_manager(hid_t plist_id, +H5_DLL herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); +H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/); +H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree); +H5_DLL herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree); +H5_DLL herr_t H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func, void *free_info); -__DLL__ herr_t H5Pget_vlen_mem_manager(hid_t plist_id, +H5_DLL herr_t H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func, void **alloc_info, H5MM_free_t *free_func, void **free_info); -__DLL__ herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size); -__DLL__ herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/); +H5_DLL herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size); +H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/); #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ herr_t H5Pset_sieve_buf_size(hid_t fapl_id, hsize_t size); -__DLL__ herr_t H5Pget_sieve_buf_size(hid_t fapl_id, hsize_t *size/*out*/); +H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, hsize_t size); +H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, hsize_t *size/*out*/); #else /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size); -__DLL__ herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/); +H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size); +H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/); #endif /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size); -__DLL__ herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/); -__DLL__ herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size); -__DLL__ herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/); +H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size); +H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/); +H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size); +H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/); #ifdef __cplusplus } diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index a33378d..0f6f920 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -66,14 +66,14 @@ extern "C" { #endif /* Functions in H5R.c */ -__DLL__ herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, +H5_DLL herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id); -__DLL__ hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); -__DLL__ hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); +H5_DLL hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); +H5_DLL hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); #ifdef H5_WANT_H5_V1_4_COMPAT -__DLL__ int H5Rget_object_type(hid_t dataset, void *_ref); +H5_DLL int H5Rget_object_type(hid_t dataset, void *_ref); #endif /* H5_WANT_H5_V1_4_COMPAT */ -__DLL__ int H5Rget_obj_type(hid_t dataset, H5R_type_t ref_type, void *_ref); +H5_DLL int H5Rget_obj_type(hid_t dataset, H5R_type_t ref_type, void *_ref); #ifdef __cplusplus } diff --git a/src/H5Spkg.h b/src/H5Spkg.h index 288fffe..97b5052 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -158,88 +158,88 @@ struct H5S_t { }; /* Extent functions */ -__DLL__ herr_t H5S_close_simple(H5S_simple_t *simple); -__DLL__ herr_t H5S_release_simple(H5S_simple_t *simple); -__DLL__ herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src); +H5_DLL herr_t H5S_close_simple(H5S_simple_t *simple); +H5_DLL herr_t H5S_release_simple(H5S_simple_t *simple); +H5_DLL herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src); /* Point select functions */ -__DLL__ herr_t H5S_point_iter_init (const H5S_t *space, size_t elmt_size, +H5_DLL herr_t H5S_point_iter_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *iter); -__DLL__ hsize_t H5S_point_iter_nelmts (const H5S_sel_iter_t *iter); -__DLL__ herr_t H5S_point_iter_release(H5S_sel_iter_t *sel_iter); -__DLL__ herr_t H5S_point_release(H5S_t *space); -__DLL__ hsize_t H5S_point_npoints(const H5S_t *space); -__DLL__ herr_t H5S_point_copy(H5S_t *dst, const H5S_t *src); -__DLL__ htri_t H5S_point_is_valid(const H5S_t *space); -__DLL__ hssize_t H5S_point_serial_size(const H5S_t *space); -__DLL__ herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf); -__DLL__ herr_t H5S_point_deserialize(H5S_t *space, const uint8_t *buf); -__DLL__ herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); -__DLL__ htri_t H5S_point_is_contiguous(const H5S_t *space); -__DLL__ htri_t H5S_point_is_single(const H5S_t *space); -__DLL__ htri_t H5S_point_is_regular(const H5S_t *space); -__DLL__ herr_t H5S_point_get_seq_list(const H5S_t *space, unsigned flags, +H5_DLL hsize_t H5S_point_iter_nelmts (const H5S_sel_iter_t *iter); +H5_DLL herr_t H5S_point_iter_release(H5S_sel_iter_t *sel_iter); +H5_DLL herr_t H5S_point_release(H5S_t *space); +H5_DLL hsize_t H5S_point_npoints(const H5S_t *space); +H5_DLL herr_t H5S_point_copy(H5S_t *dst, const H5S_t *src); +H5_DLL htri_t H5S_point_is_valid(const H5S_t *space); +H5_DLL hssize_t H5S_point_serial_size(const H5S_t *space); +H5_DLL herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf); +H5_DLL herr_t H5S_point_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); +H5_DLL htri_t H5S_point_is_contiguous(const H5S_t *space); +H5_DLL htri_t H5S_point_is_single(const H5S_t *space); +H5_DLL htri_t H5S_point_is_regular(const H5S_t *space); +H5_DLL herr_t H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t elem_size, size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len); /* "All" select functions */ -__DLL__ herr_t H5S_all_iter_init (const H5S_t *space, size_t elmt_size, +H5_DLL herr_t H5S_all_iter_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *iter); -__DLL__ hsize_t H5S_all_iter_nelmts (const H5S_sel_iter_t *iter); -__DLL__ herr_t H5S_all_iter_release(H5S_sel_iter_t *sel_iter); -__DLL__ herr_t H5S_all_release(H5S_t *space); -__DLL__ hsize_t H5S_all_npoints(const H5S_t *space); -__DLL__ htri_t H5S_all_is_valid(const H5S_t *space); -__DLL__ hssize_t H5S_all_serial_size(const H5S_t *space); -__DLL__ herr_t H5S_all_serialize(const H5S_t *space, uint8_t *buf); -__DLL__ herr_t H5S_all_deserialize(H5S_t *space, const uint8_t *buf); -__DLL__ herr_t H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); -__DLL__ htri_t H5S_all_is_contiguous(const H5S_t *space); -__DLL__ htri_t H5S_all_is_single(const H5S_t *space); -__DLL__ htri_t H5S_all_is_regular(const H5S_t *space); -__DLL__ herr_t H5S_all_get_seq_list(const H5S_t *space, unsigned flags, +H5_DLL hsize_t H5S_all_iter_nelmts (const H5S_sel_iter_t *iter); +H5_DLL herr_t H5S_all_iter_release(H5S_sel_iter_t *sel_iter); +H5_DLL herr_t H5S_all_release(H5S_t *space); +H5_DLL hsize_t H5S_all_npoints(const H5S_t *space); +H5_DLL htri_t H5S_all_is_valid(const H5S_t *space); +H5_DLL hssize_t H5S_all_serial_size(const H5S_t *space); +H5_DLL herr_t H5S_all_serialize(const H5S_t *space, uint8_t *buf); +H5_DLL herr_t H5S_all_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL herr_t H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); +H5_DLL htri_t H5S_all_is_contiguous(const H5S_t *space); +H5_DLL htri_t H5S_all_is_single(const H5S_t *space); +H5_DLL htri_t H5S_all_is_regular(const H5S_t *space); +H5_DLL herr_t H5S_all_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t elem_size, size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len); /* Hyperslab selection functions */ -__DLL__ herr_t H5S_hyper_iter_init (const H5S_t *space, size_t elmt_size, +H5_DLL herr_t H5S_hyper_iter_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *iter); -__DLL__ hsize_t H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter); -__DLL__ herr_t H5S_hyper_iter_release(H5S_sel_iter_t *sel_iter); -__DLL__ herr_t H5S_hyper_release(H5S_t *space); -__DLL__ hsize_t H5S_hyper_npoints(const H5S_t *space); -__DLL__ herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src); -__DLL__ htri_t H5S_hyper_is_valid(const H5S_t *space); -__DLL__ hssize_t H5S_hyper_serial_size(const H5S_t *space); -__DLL__ herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t *buf); -__DLL__ herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf); -__DLL__ herr_t H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); -__DLL__ htri_t H5S_hyper_is_contiguous(const H5S_t *space); -__DLL__ htri_t H5S_hyper_is_single(const H5S_t *space); -__DLL__ htri_t H5S_hyper_is_regular(const H5S_t *space); -__DLL__ herr_t H5S_hyper_get_seq_list(const H5S_t *space, unsigned flags, +H5_DLL hsize_t H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter); +H5_DLL herr_t H5S_hyper_iter_release(H5S_sel_iter_t *sel_iter); +H5_DLL herr_t H5S_hyper_release(H5S_t *space); +H5_DLL hsize_t H5S_hyper_npoints(const H5S_t *space); +H5_DLL herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src); +H5_DLL htri_t H5S_hyper_is_valid(const H5S_t *space); +H5_DLL hssize_t H5S_hyper_serial_size(const H5S_t *space); +H5_DLL herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t *buf); +H5_DLL herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL herr_t H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); +H5_DLL htri_t H5S_hyper_is_contiguous(const H5S_t *space); +H5_DLL htri_t H5S_hyper_is_single(const H5S_t *space); +H5_DLL htri_t H5S_hyper_is_regular(const H5S_t *space); +H5_DLL herr_t H5S_hyper_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t elem_size, size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len); /* "None" selection functions */ -__DLL__ herr_t H5S_none_iter_init (const H5S_t *space, size_t elmt_size, +H5_DLL herr_t H5S_none_iter_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *iter); -__DLL__ hsize_t H5S_none_iter_nelmts (const H5S_sel_iter_t *iter); -__DLL__ herr_t H5S_none_iter_release(H5S_sel_iter_t *sel_iter); -__DLL__ herr_t H5S_none_release(H5S_t *space); -__DLL__ hsize_t H5S_none_npoints(const H5S_t *space); -__DLL__ htri_t H5S_none_is_valid(const H5S_t *space); -__DLL__ hssize_t H5S_none_serial_size(const H5S_t *space); -__DLL__ herr_t H5S_none_serialize(const H5S_t *space, uint8_t *buf); -__DLL__ herr_t H5S_none_deserialize(H5S_t *space, const uint8_t *buf); -__DLL__ herr_t H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); -__DLL__ htri_t H5S_none_is_contiguous(const H5S_t *space); -__DLL__ htri_t H5S_none_is_single(const H5S_t *space); -__DLL__ htri_t H5S_none_is_regular(const H5S_t *space); -__DLL__ herr_t H5S_none_get_seq_list(const H5S_t *space, unsigned flags, +H5_DLL hsize_t H5S_none_iter_nelmts (const H5S_sel_iter_t *iter); +H5_DLL herr_t H5S_none_iter_release(H5S_sel_iter_t *sel_iter); +H5_DLL herr_t H5S_none_release(H5S_t *space); +H5_DLL hsize_t H5S_none_npoints(const H5S_t *space); +H5_DLL htri_t H5S_none_is_valid(const H5S_t *space); +H5_DLL hssize_t H5S_none_serial_size(const H5S_t *space); +H5_DLL herr_t H5S_none_serialize(const H5S_t *space, uint8_t *buf); +H5_DLL herr_t H5S_none_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL herr_t H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); +H5_DLL htri_t H5S_none_is_contiguous(const H5S_t *space); +H5_DLL htri_t H5S_none_is_single(const H5S_t *space); +H5_DLL htri_t H5S_none_is_regular(const H5S_t *space); +H5_DLL herr_t H5S_none_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t elem_size, size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len); /* Needed for use in hyperslab code (H5Shyper.c) */ -__DLL__ herr_t H5S_select_none(H5S_t *space); +H5_DLL herr_t H5S_select_none(H5S_t *space); #endif diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index d5028b6..1daaf04 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -137,67 +137,67 @@ typedef struct H5S_conv_t { /* We get the declaration of H5G_entry_t from the H5Oprivate.h file */ -__DLL__ H5S_t *H5S_create(H5S_class_t type); -__DLL__ H5S_t *H5S_copy(const H5S_t *src); -__DLL__ herr_t H5S_close(H5S_t *ds); -__DLL__ H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space, +H5_DLL H5S_t *H5S_create(H5S_class_t type); +H5_DLL H5S_t *H5S_copy(const H5S_t *src); +H5_DLL herr_t H5S_close(H5S_t *ds); +H5_DLL H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space, unsigned flags); -__DLL__ H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds); -__DLL__ hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds); -__DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds); -__DLL__ int H5S_get_simple_extent_ndims(const H5S_t *ds); -__DLL__ int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/, +H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds); +H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds); +H5_DLL hsize_t H5S_get_npoints_max(const H5S_t *ds); +H5_DLL int H5S_get_simple_extent_ndims(const H5S_t *ds); +H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/, hsize_t max_dims[]/*out*/); -__DLL__ herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims, +H5_DLL herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims, const hsize_t *max); -__DLL__ herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space); -__DLL__ H5S_t *H5S_read(struct H5G_entry_t *ent); -__DLL__ int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2); -__DLL__ htri_t H5S_is_simple(const H5S_t *sdim); -__DLL__ herr_t H5S_extent_release(H5S_t *space); -__DLL__ int H5S_extend(H5S_t *space, const hsize_t *size); -__DLL__ int H5S_set_extent(H5S_t *space, const hsize_t *size); -__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, +H5_DLL herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space); +H5_DLL H5S_t *H5S_read(struct H5G_entry_t *ent); +H5_DLL int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2); +H5_DLL htri_t H5S_is_simple(const H5S_t *sdim); +H5_DLL herr_t H5S_extent_release(H5S_t *space); +H5_DLL int H5S_extend(H5S_t *space, const hsize_t *size); +H5_DLL int H5S_set_extent(H5S_t *space, const hsize_t *size); +H5_DLL herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); /* Operations on selections */ -__DLL__ herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src); -__DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); -__DLL__ htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2); -__DLL__ herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, +H5_DLL herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src); +H5_DLL herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2); +H5_DLL herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op, void *operator_data); -__DLL__ herr_t H5S_select_fill(void *fill, size_t fill_size, +H5_DLL herr_t H5S_select_fill(void *fill, size_t fill_size, const H5S_t *space, void *buf); -__DLL__ herr_t H5S_select_fscat (H5F_t *f, struct H5O_layout_t *layout, +H5_DLL herr_t H5S_select_fscat (H5F_t *f, struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id, const void *_buf); -__DLL__ hsize_t H5S_select_fgath (H5F_t *f, const struct H5O_layout_t *layout, +H5_DLL hsize_t H5S_select_fgath (H5F_t *f, const struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id, void *buf); -__DLL__ herr_t H5S_select_mscat (const void *_tscat_buf, size_t elmt_size, +H5_DLL herr_t H5S_select_mscat (const void *_tscat_buf, size_t elmt_size, const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts, hid_t dxpl_id, void *_buf/*out*/); -__DLL__ hsize_t H5S_select_mgath (const void *_buf, size_t elmt_size, +H5_DLL hsize_t H5S_select_mgath (const void *_buf, size_t elmt_size, const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts, hid_t dxpl_id, void *_tgath_buf/*out*/); -__DLL__ herr_t H5S_select_read(H5F_t *f, const struct H5O_layout_t *layout, +H5_DLL herr_t H5S_select_read(H5F_t *f, const struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id, void *buf/*out*/); -__DLL__ herr_t H5S_select_write(H5F_t *f, struct H5O_layout_t *layout, +H5_DLL herr_t H5S_select_write(H5F_t *f, struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id, const void *buf/*out*/); /* Needed for internal use of selections in H5Fistore code */ -__DLL__ herr_t H5S_select_all(H5S_t *space, unsigned rel_prev); -__DLL__ herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hssize_t start[], +H5_DLL herr_t H5S_select_all(H5S_t *space, unsigned rel_prev); +H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hssize_t start[], const hsize_t *stride, const hsize_t count[], const hsize_t *block); #ifdef H5_HAVE_PARALLEL /* MPI-IO function to read directly from app buffer to file rky980813 */ -__DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f, +H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f, const struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, @@ -205,7 +205,7 @@ __DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f, void *buf/*out*/); /* MPI-IO function to write directly from app buffer to file rky980813 */ -__DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, +H5_DLL herr_t H5S_mpio_spaces_write(H5F_t *f, struct H5O_layout_t *layout, H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space, @@ -214,14 +214,14 @@ __DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, /* MPI-IO function to check if a direct I/O transfer is possible between * memory and the file */ -__DLL__ htri_t H5S_mpio_opt_possible(const H5S_t *mem_space, +H5_DLL htri_t H5S_mpio_opt_possible(const H5S_t *mem_space, const H5S_t *file_space, const unsigned flags); #ifndef _H5S_IN_H5S_C /* Global vars whose value comes from environment variable */ /* (Defined in H5S.c) */ -__DLLVAR__ hbool_t H5S_mpi_opt_types_g; -__DLLVAR__ hbool_t H5S_mpi_prefer_derived_types_g; +H5_DLLVAR hbool_t H5S_mpi_opt_types_g; +H5_DLLVAR hbool_t H5S_mpi_prefer_derived_types_g; #endif /* _H5S_IN_H5S_C */ #endif /* H5_HAVE_PARALLEL */ diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 283096f..2736c42 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -89,53 +89,53 @@ extern "C" { #endif /* Functions in H5S.c */ -__DLL__ hid_t H5Screate(H5S_class_t type); -__DLL__ hid_t H5Screate_simple(int rank, const hsize_t dims[], +H5_DLL hid_t H5Screate(H5S_class_t type); +H5_DLL hid_t H5Screate_simple(int rank, const hsize_t dims[], const hsize_t maxdims[]); -__DLL__ herr_t H5Sset_extent_simple(hid_t space_id, int rank, +H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]); -__DLL__ hid_t H5Scopy(hid_t space_id); -__DLL__ herr_t H5Sclose(hid_t space_id); -__DLL__ hssize_t H5Sget_simple_extent_npoints(hid_t space_id); -__DLL__ int H5Sget_simple_extent_ndims(hid_t space_id); -__DLL__ int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], +H5_DLL hid_t H5Scopy(hid_t space_id); +H5_DLL herr_t H5Sclose(hid_t space_id); +H5_DLL hssize_t H5Sget_simple_extent_npoints(hid_t space_id); +H5_DLL int H5Sget_simple_extent_ndims(hid_t space_id); +H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], hsize_t maxdims[]); -__DLL__ htri_t H5Sis_simple(hid_t space_id); -__DLL__ herr_t H5Sset_space(hid_t space_id, int rank, const hsize_t *dims); -__DLL__ hssize_t H5Sget_select_npoints(hid_t spaceid); -__DLL__ herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, +H5_DLL htri_t H5Sis_simple(hid_t space_id); +H5_DLL herr_t H5Sset_space(hid_t space_id, int rank, const hsize_t *dims); +H5_DLL hssize_t H5Sget_select_npoints(hid_t spaceid); +H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[], const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]); #ifdef NEW_HYPERSLAB_API -__DLL__ hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, +H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[], const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]); -__DLL__ herr_t H5Sselect_select(hid_t space1_id, H5S_seloper_t op, +H5_DLL herr_t H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id); -__DLL__ hid_t H5Scombine_select(hid_t space1_id, H5S_seloper_t op, +H5_DLL hid_t H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id); #endif /* NEW_HYPERSLAB_API */ -__DLL__ herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, +H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, size_t num_elemn, const hssize_t **coord); -__DLL__ H5S_class_t H5Sget_simple_extent_type(hid_t space_id); -__DLL__ herr_t H5Sset_extent_none(hid_t space_id); -__DLL__ herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id); -__DLL__ herr_t H5Sselect_all(hid_t spaceid); -__DLL__ herr_t H5Sselect_none(hid_t spaceid); -__DLL__ herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset); -__DLL__ htri_t H5Sselect_valid(hid_t spaceid); -__DLL__ hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); -__DLL__ hssize_t H5Sget_select_elem_npoints(hid_t spaceid); -__DLL__ herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf); -__DLL__ herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf); -__DLL__ herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end); -__DLL__ H5S_sel_type H5Sget_select_type(hid_t spaceid); +H5_DLL H5S_class_t H5Sget_simple_extent_type(hid_t space_id); +H5_DLL herr_t H5Sset_extent_none(hid_t space_id); +H5_DLL herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id); +H5_DLL herr_t H5Sselect_all(hid_t spaceid); +H5_DLL herr_t H5Sselect_none(hid_t spaceid); +H5_DLL herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset); +H5_DLL htri_t H5Sselect_valid(hid_t spaceid); +H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); +H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid); +H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf); +H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf); +H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end); +H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid); #ifdef __cplusplus } diff --git a/src/H5TBprivate.h b/src/H5TBprivate.h index f4faa3b..f1d6bef 100644 --- a/src/H5TBprivate.h +++ b/src/H5TBprivate.h @@ -95,27 +95,27 @@ extern "C" { #endif /* c_plusplus || __cplusplus */ -__DLL__ H5TB_TREE *H5TB_dmake (H5TB_cmp_t cmp, int arg, unsigned fast_compare); -__DLL__ H5TB_NODE *H5TB_dfind (H5TB_TREE * tree, void * key, H5TB_NODE ** pp); -__DLL__ H5TB_NODE *H5TB_find(H5TB_NODE * root, void * key, H5TB_cmp_t cmp, +H5_DLL H5TB_TREE *H5TB_dmake (H5TB_cmp_t cmp, int arg, unsigned fast_compare); +H5_DLL H5TB_NODE *H5TB_dfind (H5TB_TREE * tree, void * key, H5TB_NODE ** pp); +H5_DLL H5TB_NODE *H5TB_find(H5TB_NODE * root, void * key, H5TB_cmp_t cmp, int arg, H5TB_NODE ** pp); -__DLL__ H5TB_NODE *H5TB_dless (H5TB_TREE * tree, void * key, H5TB_NODE ** pp); -__DLL__ H5TB_NODE *H5TB_less (H5TB_NODE * root, void * key, H5TB_cmp_t cmp, +H5_DLL H5TB_NODE *H5TB_dless (H5TB_TREE * tree, void * key, H5TB_NODE ** pp); +H5_DLL H5TB_NODE *H5TB_less (H5TB_NODE * root, void * key, H5TB_cmp_t cmp, int arg, H5TB_NODE ** pp); -__DLL__ H5TB_NODE *H5TB_index (H5TB_NODE * root, unsigned indx); -__DLL__ H5TB_NODE *H5TB_dins (H5TB_TREE * tree, void * item, void * key); -__DLL__ H5TB_NODE *H5TB_ins (H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t cmp, int arg); -__DLL__ void *H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp); -__DLL__ H5TB_NODE *H5TB_first (H5TB_NODE * root); -__DLL__ H5TB_NODE *H5TB_last (H5TB_NODE * root); -__DLL__ H5TB_NODE *H5TB_next (H5TB_NODE * node); -__DLL__ H5TB_NODE *H5TB_prev (H5TB_NODE * node); -__DLL__ H5TB_TREE *H5TB_dfree (H5TB_TREE * tree, void(*fd) (void *), void(*fk) (void *)); -__DLL__ void *H5TB_free (H5TB_NODE ** root, void(*fd) (void *), void(*fk) (void *)); -__DLL__ long H5TB_count (H5TB_TREE * tree); +H5_DLL H5TB_NODE *H5TB_index (H5TB_NODE * root, unsigned indx); +H5_DLL H5TB_NODE *H5TB_dins (H5TB_TREE * tree, void * item, void * key); +H5_DLL H5TB_NODE *H5TB_ins (H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t cmp, int arg); +H5_DLL void *H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp); +H5_DLL H5TB_NODE *H5TB_first (H5TB_NODE * root); +H5_DLL H5TB_NODE *H5TB_last (H5TB_NODE * root); +H5_DLL H5TB_NODE *H5TB_next (H5TB_NODE * node); +H5_DLL H5TB_NODE *H5TB_prev (H5TB_NODE * node); +H5_DLL H5TB_TREE *H5TB_dfree (H5TB_TREE * tree, void(*fd) (void *), void(*fk) (void *)); +H5_DLL void *H5TB_free (H5TB_NODE ** root, void(*fd) (void *), void(*fk) (void *)); +H5_DLL long H5TB_count (H5TB_TREE * tree); #ifdef H5TB_DEBUG -__DLL__ herr_t H5TB_dump(H5TB_TREE *ptree, void (*key_dump)(void *,void *), int method); +H5_DLL herr_t H5TB_dump(H5TB_TREE *ptree, void (*key_dump)(void *,void *), int method); #endif /* H5TB_DEBUG */ #if defined c_plusplus || defined __cplusplus diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h index 60ec0af..c9a8c20 100644 --- a/src/H5TSprivate.h +++ b/src/H5TSprivate.h @@ -40,11 +40,11 @@ extern "C" { #endif /* c_plusplus || __cplusplus */ -__DLL__ void H5TS_first_thread_init(void); -__DLL__ herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex); -__DLL__ herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex); -__DLL__ herr_t H5TS_cancel_count_inc(void); -__DLL__ herr_t H5TS_cancel_count_dec(void); +H5_DLL void H5TS_first_thread_init(void); +H5_DLL herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex); +H5_DLL herr_t H5TS_mutex_unlock(H5TS_mutex_t *mutex); +H5_DLL herr_t H5TS_cancel_count_inc(void); +H5_DLL herr_t H5TS_cancel_count_dec(void); #if defined c_plusplus || defined __cplusplus } diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index f322641..8356f78 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -169,7 +169,7 @@ typedef enum H5T_sdir_t { } H5T_sdir_t; /* The overflow handler */ -__DLLVAR__ H5T_overflow_t H5T_overflow_g; +H5_DLLVAR H5T_overflow_t H5T_overflow_g; /* * Alignment information for native types. A value of N indicates that the @@ -177,597 +177,597 @@ __DLLVAR__ H5T_overflow_t H5T_overflow_g; * N=1 no alignment is required; N=0 implies that alignment constraints were * not calculated. */ -__DLLVAR__ size_t H5T_NATIVE_SCHAR_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UCHAR_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_SHORT_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_USHORT_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_LONG_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_ULONG_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_LLONG_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_ULLONG_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_FLOAT_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_DOUBLE_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_LDOUBLE_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_SCHAR_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UCHAR_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_SHORT_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_USHORT_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_LONG_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_ULONG_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_LLONG_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_ULLONG_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_FLOAT_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_DOUBLE_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_LDOUBLE_ALIGN_g; /* C9x alignment constraints */ -__DLLVAR__ size_t H5T_NATIVE_INT8_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT8_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_LEAST8_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_FAST8_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_FAST8_ALIGN_g; - -__DLLVAR__ size_t H5T_NATIVE_INT16_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT16_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_LEAST16_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_FAST16_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_FAST16_ALIGN_g; - -__DLLVAR__ size_t H5T_NATIVE_INT32_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT32_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_LEAST32_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_FAST32_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_FAST32_ALIGN_g; - -__DLLVAR__ size_t H5T_NATIVE_INT64_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT64_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_LEAST64_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_INT_FAST64_ALIGN_g; -__DLLVAR__ size_t H5T_NATIVE_UINT_FAST64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT8_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT8_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_LEAST8_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST8_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_FAST8_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_FAST8_ALIGN_g; + +H5_DLLVAR size_t H5T_NATIVE_INT16_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT16_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_LEAST16_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST16_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_FAST16_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_FAST16_ALIGN_g; + +H5_DLLVAR size_t H5T_NATIVE_INT32_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT32_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_LEAST32_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST32_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_FAST32_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_FAST32_ALIGN_g; + +H5_DLLVAR size_t H5T_NATIVE_INT64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_LEAST64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_LEAST64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_INT_FAST64_ALIGN_g; +H5_DLLVAR size_t H5T_NATIVE_UINT_FAST64_ALIGN_g; /* Conversion functions */ -__DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_order_opt(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +H5_DLL herr_t H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_float_double(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_float_double(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_double_float(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_double_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_conv_i32le_f64le(hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_conv_i32le_f64le(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *bkg, hid_t dset_xfer_plist); /* Bit twiddling functions */ -__DLL__ void H5T_bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src, +H5_DLL void H5T_bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset, size_t size); -__DLL__ void H5T_bit_set(uint8_t *buf, size_t offset, size_t size, +H5_DLL void H5T_bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value); -__DLL__ hsize_t H5T_bit_get_d(uint8_t *buf, size_t offset, size_t size); -__DLL__ void H5T_bit_set_d(uint8_t *buf, size_t offset, size_t size, +H5_DLL hsize_t H5T_bit_get_d(uint8_t *buf, size_t offset, size_t size); +H5_DLL void H5T_bit_set_d(uint8_t *buf, size_t offset, size_t size, hsize_t val); -__DLL__ ssize_t H5T_bit_find(uint8_t *buf, size_t offset, size_t size, +H5_DLL ssize_t H5T_bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, hbool_t value); -__DLL__ htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size); +H5_DLL htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size); /* VL functions */ -__DLL__ hssize_t H5T_vlen_seq_mem_getlen(H5F_t *f, void *vl_addr); -__DLL__ herr_t H5T_vlen_seq_mem_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); -__DLL__ herr_t H5T_vlen_seq_mem_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); -__DLL__ hssize_t H5T_vlen_str_mem_getlen(H5F_t *f, void *vl_addr); -__DLL__ herr_t H5T_vlen_str_mem_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); -__DLL__ herr_t H5T_vlen_str_mem_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); -__DLL__ hssize_t H5T_vlen_disk_getlen(H5F_t *f, void *vl_addr); -__DLL__ herr_t H5T_vlen_disk_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); -__DLL__ herr_t H5T_vlen_disk_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); +H5_DLL hssize_t H5T_vlen_seq_mem_getlen(H5F_t *f, void *vl_addr); +H5_DLL herr_t H5T_vlen_seq_mem_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); +H5_DLL herr_t H5T_vlen_seq_mem_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); +H5_DLL hssize_t H5T_vlen_str_mem_getlen(H5F_t *f, void *vl_addr); +H5_DLL herr_t H5T_vlen_str_mem_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); +H5_DLL herr_t H5T_vlen_str_mem_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); +H5_DLL hssize_t H5T_vlen_disk_getlen(H5F_t *f, void *vl_addr); +H5_DLL herr_t H5T_vlen_disk_read(H5F_t *f, void *vl_addr, void *_buf, size_t len); +H5_DLL herr_t H5T_vlen_disk_write(hid_t dxpl_id, H5F_t *f, void *vl_addr, void *_buf, void *bg_addr, hsize_t seq_len, hsize_t base_size); /* Array functions */ -__DLL__ H5T_t * H5T_array_create(H5T_t *base, int ndims, +H5_DLL H5T_t * H5T_array_create(H5T_t *base, int ndims, const hsize_t dim[/* ndims */], const int perm[/* ndims */]); #endif diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 60747ca..b4606cb 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -92,51 +92,51 @@ typedef struct { #define H5T_IS_NOOP(P) ((P)->is_hard && 0==H5T_cmp((P)->src, (P)->dst)) /* Private functions */ -__DLL__ herr_t H5TN_init_interface(void); -__DLL__ herr_t H5T_init(void); -__DLL__ htri_t H5T_isa(H5G_entry_t *ent); -__DLL__ H5T_t *H5T_open(H5G_entry_t *loc, const char *name); -__DLL__ H5T_t *H5T_open_oid(H5G_entry_t *ent); -__DLL__ H5T_t *H5T_create(H5T_class_t type, size_t size); -__DLL__ H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); -__DLL__ herr_t H5T_commit(H5G_entry_t *loc, const char *name, H5T_t *type); -__DLL__ herr_t H5T_lock(H5T_t *dt, hbool_t immutable); -__DLL__ herr_t H5T_close(H5T_t *dt); -__DLL__ herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, +H5_DLL herr_t H5TN_init_interface(void); +H5_DLL herr_t H5T_init(void); +H5_DLL htri_t H5T_isa(H5G_entry_t *ent); +H5_DLL H5T_t *H5T_open(H5G_entry_t *loc, const char *name); +H5_DLL H5T_t *H5T_open_oid(H5G_entry_t *ent); +H5_DLL H5T_t *H5T_create(H5T_class_t type, size_t size); +H5_DLL H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); +H5_DLL herr_t H5T_commit(H5G_entry_t *loc, const char *name, H5T_t *type); +H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); +H5_DLL herr_t H5T_close(H5T_t *dt); +H5_DLL herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func); -__DLL__ herr_t H5T_path_force_reinit(H5T_t *dt); -__DLL__ H5T_class_t H5T_get_class(const H5T_t *dt); -__DLL__ htri_t H5T_detect_class (const H5T_t *dt, H5T_class_t cls); -__DLL__ size_t H5T_get_size(const H5T_t *dt); -__DLL__ int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); -__DLL__ htri_t H5T_is_atomic(const H5T_t *dt); -__DLL__ herr_t H5T_insert(H5T_t *parent, const char *name, size_t offset, +H5_DLL herr_t H5T_path_force_reinit(H5T_t *dt); +H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt); +H5_DLL htri_t H5T_detect_class (const H5T_t *dt, H5T_class_t cls); +H5_DLL size_t H5T_get_size(const H5T_t *dt); +H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); +H5_DLL htri_t H5T_is_atomic(const H5T_t *dt); +H5_DLL herr_t H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member); -__DLL__ herr_t H5T_enum_insert(H5T_t *dt, const char *name, void *value); -__DLL__ herr_t H5T_pack(H5T_t *dt); -__DLL__ herr_t H5T_debug(const H5T_t *dt, FILE * stream); -__DLL__ H5G_entry_t *H5T_entof(H5T_t *dt); -__DLL__ htri_t H5T_is_immutable(H5T_t *dt); -__DLL__ htri_t H5T_is_named(H5T_t *dt); -__DLL__ H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, +H5_DLL herr_t H5T_enum_insert(H5T_t *dt, const char *name, void *value); +H5_DLL herr_t H5T_pack(H5T_t *dt); +H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE * stream); +H5_DLL H5G_entry_t *H5T_entof(H5T_t *dt); +H5_DLL htri_t H5T_is_immutable(H5T_t *dt); +H5_DLL htri_t H5T_is_named(H5T_t *dt); +H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func); -__DLL__ herr_t H5T_sort_value(H5T_t *dt, int *map); -__DLL__ herr_t H5T_sort_name(H5T_t *dt, int *map); -__DLL__ herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, +H5_DLL herr_t H5T_sort_value(H5T_t *dt, int *map); +H5_DLL herr_t H5T_sort_name(H5T_t *dt, int *map); +H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); -__DLL__ herr_t H5T_set_size(H5T_t *dt, size_t size); -__DLL__ herr_t H5T_set_precision(H5T_t *dt, size_t prec); -__DLL__ herr_t H5T_set_offset(H5T_t *dt, size_t offset); -__DLL__ char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, +H5_DLL herr_t H5T_set_size(H5T_t *dt, size_t size); +H5_DLL herr_t H5T_set_precision(H5T_t *dt, size_t prec); +H5_DLL herr_t H5T_set_offset(H5T_t *dt, size_t offset); +H5_DLL char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size); -__DLL__ herr_t H5T_enum_valueof(H5T_t *dt, const char *name, +H5_DLL herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/); -__DLL__ herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t ndim, hssize_t *point, void *_op_data); -__DLL__ htri_t H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc); -__DLL__ htri_t H5T_is_sensible(const H5T_t *dt); +H5_DLL herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t ndim, hssize_t *point, void *_op_data); +H5_DLL htri_t H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc); +H5_DLL htri_t H5T_is_sensible(const H5T_t *dt); /* Reference specific functions */ -__DLL__ H5R_type_t H5T_get_ref_type(const H5T_t *dt); +H5_DLL H5R_type_t H5T_get_ref_type(const H5T_t *dt); #endif diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index b6f9c58..1d66054 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -196,10 +196,10 @@ extern "C" { #define H5T_IEEE_F32LE (H5open(), H5T_IEEE_F32LE_g) #define H5T_IEEE_F64BE (H5open(), H5T_IEEE_F64BE_g) #define H5T_IEEE_F64LE (H5open(), H5T_IEEE_F64LE_g) -__DLLVAR__ hid_t H5T_IEEE_F32BE_g; -__DLLVAR__ hid_t H5T_IEEE_F32LE_g; -__DLLVAR__ hid_t H5T_IEEE_F64BE_g; -__DLLVAR__ hid_t H5T_IEEE_F64LE_g; +H5_DLLVAR hid_t H5T_IEEE_F32BE_g; +H5_DLLVAR hid_t H5T_IEEE_F32LE_g; +H5_DLLVAR hid_t H5T_IEEE_F64BE_g; +H5_DLLVAR hid_t H5T_IEEE_F64LE_g; /* * These are "standard" types. For instance, signed (2's complement) and @@ -231,32 +231,32 @@ __DLLVAR__ hid_t H5T_IEEE_F64LE_g; #define H5T_STD_B64LE (H5open(), H5T_STD_B64LE_g) #define H5T_STD_REF_OBJ (H5open(), H5T_STD_REF_OBJ_g) #define H5T_STD_REF_DSETREG (H5open(), H5T_STD_REF_DSETREG_g) -__DLLVAR__ hid_t H5T_STD_I8BE_g; -__DLLVAR__ hid_t H5T_STD_I8LE_g; -__DLLVAR__ hid_t H5T_STD_I16BE_g; -__DLLVAR__ hid_t H5T_STD_I16LE_g; -__DLLVAR__ hid_t H5T_STD_I32BE_g; -__DLLVAR__ hid_t H5T_STD_I32LE_g; -__DLLVAR__ hid_t H5T_STD_I64BE_g; -__DLLVAR__ hid_t H5T_STD_I64LE_g; -__DLLVAR__ hid_t H5T_STD_U8BE_g; -__DLLVAR__ hid_t H5T_STD_U8LE_g; -__DLLVAR__ hid_t H5T_STD_U16BE_g; -__DLLVAR__ hid_t H5T_STD_U16LE_g; -__DLLVAR__ hid_t H5T_STD_U32BE_g; -__DLLVAR__ hid_t H5T_STD_U32LE_g; -__DLLVAR__ hid_t H5T_STD_U64BE_g; -__DLLVAR__ hid_t H5T_STD_U64LE_g; -__DLLVAR__ hid_t H5T_STD_B8BE_g; -__DLLVAR__ hid_t H5T_STD_B8LE_g; -__DLLVAR__ hid_t H5T_STD_B16BE_g; -__DLLVAR__ hid_t H5T_STD_B16LE_g; -__DLLVAR__ hid_t H5T_STD_B32BE_g; -__DLLVAR__ hid_t H5T_STD_B32LE_g; -__DLLVAR__ hid_t H5T_STD_B64BE_g; -__DLLVAR__ hid_t H5T_STD_B64LE_g; -__DLLVAR__ hid_t H5T_STD_REF_OBJ_g; -__DLLVAR__ hid_t H5T_STD_REF_DSETREG_g; +H5_DLLVAR hid_t H5T_STD_I8BE_g; +H5_DLLVAR hid_t H5T_STD_I8LE_g; +H5_DLLVAR hid_t H5T_STD_I16BE_g; +H5_DLLVAR hid_t H5T_STD_I16LE_g; +H5_DLLVAR hid_t H5T_STD_I32BE_g; +H5_DLLVAR hid_t H5T_STD_I32LE_g; +H5_DLLVAR hid_t H5T_STD_I64BE_g; +H5_DLLVAR hid_t H5T_STD_I64LE_g; +H5_DLLVAR hid_t H5T_STD_U8BE_g; +H5_DLLVAR hid_t H5T_STD_U8LE_g; +H5_DLLVAR hid_t H5T_STD_U16BE_g; +H5_DLLVAR hid_t H5T_STD_U16LE_g; +H5_DLLVAR hid_t H5T_STD_U32BE_g; +H5_DLLVAR hid_t H5T_STD_U32LE_g; +H5_DLLVAR hid_t H5T_STD_U64BE_g; +H5_DLLVAR hid_t H5T_STD_U64LE_g; +H5_DLLVAR hid_t H5T_STD_B8BE_g; +H5_DLLVAR hid_t H5T_STD_B8LE_g; +H5_DLLVAR hid_t H5T_STD_B16BE_g; +H5_DLLVAR hid_t H5T_STD_B16LE_g; +H5_DLLVAR hid_t H5T_STD_B32BE_g; +H5_DLLVAR hid_t H5T_STD_B32LE_g; +H5_DLLVAR hid_t H5T_STD_B64BE_g; +H5_DLLVAR hid_t H5T_STD_B64LE_g; +H5_DLLVAR hid_t H5T_STD_REF_OBJ_g; +H5_DLLVAR hid_t H5T_STD_REF_DSETREG_g; /* * Types which are particular to Unix. @@ -265,23 +265,23 @@ __DLLVAR__ hid_t H5T_STD_REF_DSETREG_g; #define H5T_UNIX_D32LE (H5open(), H5T_UNIX_D32LE_g) #define H5T_UNIX_D64BE (H5open(), H5T_UNIX_D64BE_g) #define H5T_UNIX_D64LE (H5open(), H5T_UNIX_D64LE_g) -__DLLVAR__ hid_t H5T_UNIX_D32BE_g; -__DLLVAR__ hid_t H5T_UNIX_D32LE_g; -__DLLVAR__ hid_t H5T_UNIX_D64BE_g; -__DLLVAR__ hid_t H5T_UNIX_D64LE_g; +H5_DLLVAR hid_t H5T_UNIX_D32BE_g; +H5_DLLVAR hid_t H5T_UNIX_D32LE_g; +H5_DLLVAR hid_t H5T_UNIX_D64BE_g; +H5_DLLVAR hid_t H5T_UNIX_D64LE_g; /* * Types particular to the C language. String types use `bytes' instead * of `bits' as their size. */ #define H5T_C_S1 (H5open(), H5T_C_S1_g) -__DLLVAR__ hid_t H5T_C_S1_g; +H5_DLLVAR hid_t H5T_C_S1_g; /* * Types particular to Fortran. */ #define H5T_FORTRAN_S1 (H5open(), H5T_FORTRAN_S1_g) -__DLLVAR__ hid_t H5T_FORTRAN_S1_g; +H5_DLLVAR hid_t H5T_FORTRAN_S1_g; /* * These types are for Intel CPU's. They are little endian with IEEE @@ -373,29 +373,29 @@ __DLLVAR__ hid_t H5T_FORTRAN_S1_g; #define H5T_NATIVE_HSSIZE (H5open(), H5T_NATIVE_HSSIZE_g) #define H5T_NATIVE_HERR (H5open(), H5T_NATIVE_HERR_g) #define H5T_NATIVE_HBOOL (H5open(), H5T_NATIVE_HBOOL_g) -__DLLVAR__ hid_t H5T_NATIVE_SCHAR_g; -__DLLVAR__ hid_t H5T_NATIVE_UCHAR_g; -__DLLVAR__ hid_t H5T_NATIVE_SHORT_g; -__DLLVAR__ hid_t H5T_NATIVE_USHORT_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_g; -__DLLVAR__ hid_t H5T_NATIVE_LONG_g; -__DLLVAR__ hid_t H5T_NATIVE_ULONG_g; -__DLLVAR__ hid_t H5T_NATIVE_LLONG_g; -__DLLVAR__ hid_t H5T_NATIVE_ULLONG_g; -__DLLVAR__ hid_t H5T_NATIVE_FLOAT_g; -__DLLVAR__ hid_t H5T_NATIVE_DOUBLE_g; -__DLLVAR__ hid_t H5T_NATIVE_LDOUBLE_g; -__DLLVAR__ hid_t H5T_NATIVE_B8_g; -__DLLVAR__ hid_t H5T_NATIVE_B16_g; -__DLLVAR__ hid_t H5T_NATIVE_B32_g; -__DLLVAR__ hid_t H5T_NATIVE_B64_g; -__DLLVAR__ hid_t H5T_NATIVE_OPAQUE_g; -__DLLVAR__ hid_t H5T_NATIVE_HADDR_g; -__DLLVAR__ hid_t H5T_NATIVE_HSIZE_g; -__DLLVAR__ hid_t H5T_NATIVE_HSSIZE_g; -__DLLVAR__ hid_t H5T_NATIVE_HERR_g; -__DLLVAR__ hid_t H5T_NATIVE_HBOOL_g; +H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g; +H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g; +H5_DLLVAR hid_t H5T_NATIVE_SHORT_g; +H5_DLLVAR hid_t H5T_NATIVE_USHORT_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_g; +H5_DLLVAR hid_t H5T_NATIVE_LONG_g; +H5_DLLVAR hid_t H5T_NATIVE_ULONG_g; +H5_DLLVAR hid_t H5T_NATIVE_LLONG_g; +H5_DLLVAR hid_t H5T_NATIVE_ULLONG_g; +H5_DLLVAR hid_t H5T_NATIVE_FLOAT_g; +H5_DLLVAR hid_t H5T_NATIVE_DOUBLE_g; +H5_DLLVAR hid_t H5T_NATIVE_LDOUBLE_g; +H5_DLLVAR hid_t H5T_NATIVE_B8_g; +H5_DLLVAR hid_t H5T_NATIVE_B16_g; +H5_DLLVAR hid_t H5T_NATIVE_B32_g; +H5_DLLVAR hid_t H5T_NATIVE_B64_g; +H5_DLLVAR hid_t H5T_NATIVE_OPAQUE_g; +H5_DLLVAR hid_t H5T_NATIVE_HADDR_g; +H5_DLLVAR hid_t H5T_NATIVE_HSIZE_g; +H5_DLLVAR hid_t H5T_NATIVE_HSSIZE_g; +H5_DLLVAR hid_t H5T_NATIVE_HERR_g; +H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g; /* C9x integer types */ #define H5T_NATIVE_INT8 (H5open(), H5T_NATIVE_INT8_g) @@ -404,12 +404,12 @@ __DLLVAR__ hid_t H5T_NATIVE_HBOOL_g; #define H5T_NATIVE_UINT_LEAST8 (H5open(), H5T_NATIVE_UINT_LEAST8_g) #define H5T_NATIVE_INT_FAST8 (H5open(), H5T_NATIVE_INT_FAST8_g) #define H5T_NATIVE_UINT_FAST8 (H5open(), H5T_NATIVE_UINT_FAST8_g) -__DLLVAR__ hid_t H5T_NATIVE_INT8_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT8_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST8_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST8_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_FAST8_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_g; +H5_DLLVAR hid_t H5T_NATIVE_INT8_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT8_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST8_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_FAST8_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g; #define H5T_NATIVE_INT16 (H5open(), H5T_NATIVE_INT16_g) #define H5T_NATIVE_UINT16 (H5open(), H5T_NATIVE_UINT16_g) @@ -417,12 +417,12 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST8_g; #define H5T_NATIVE_UINT_LEAST16 (H5open(), H5T_NATIVE_UINT_LEAST16_g) #define H5T_NATIVE_INT_FAST16 (H5open(), H5T_NATIVE_INT_FAST16_g) #define H5T_NATIVE_UINT_FAST16 (H5open(), H5T_NATIVE_UINT_FAST16_g) -__DLLVAR__ hid_t H5T_NATIVE_INT16_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT16_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST16_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST16_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_FAST16_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_g; +H5_DLLVAR hid_t H5T_NATIVE_INT16_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT16_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST16_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_FAST16_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g; #define H5T_NATIVE_INT32 (H5open(), H5T_NATIVE_INT32_g) #define H5T_NATIVE_UINT32 (H5open(), H5T_NATIVE_UINT32_g) @@ -430,12 +430,12 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST16_g; #define H5T_NATIVE_UINT_LEAST32 (H5open(), H5T_NATIVE_UINT_LEAST32_g) #define H5T_NATIVE_INT_FAST32 (H5open(), H5T_NATIVE_INT_FAST32_g) #define H5T_NATIVE_UINT_FAST32 (H5open(), H5T_NATIVE_UINT_FAST32_g) -__DLLVAR__ hid_t H5T_NATIVE_INT32_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT32_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST32_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST32_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_FAST32_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_g; +H5_DLLVAR hid_t H5T_NATIVE_INT32_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT32_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST32_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_FAST32_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g; #define H5T_NATIVE_INT64 (H5open(), H5T_NATIVE_INT64_g) #define H5T_NATIVE_UINT64 (H5open(), H5T_NATIVE_UINT64_g) @@ -443,102 +443,102 @@ __DLLVAR__ hid_t H5T_NATIVE_UINT_FAST32_g; #define H5T_NATIVE_UINT_LEAST64 (H5open(), H5T_NATIVE_UINT_LEAST64_g) #define H5T_NATIVE_INT_FAST64 (H5open(), H5T_NATIVE_INT_FAST64_g) #define H5T_NATIVE_UINT_FAST64 (H5open(), H5T_NATIVE_UINT_FAST64_g) -__DLLVAR__ hid_t H5T_NATIVE_INT64_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT64_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_LEAST64_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_LEAST64_g; -__DLLVAR__ hid_t H5T_NATIVE_INT_FAST64_g; -__DLLVAR__ hid_t H5T_NATIVE_UINT_FAST64_g; +H5_DLLVAR hid_t H5T_NATIVE_INT64_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT64_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST64_g; +H5_DLLVAR hid_t H5T_NATIVE_INT_FAST64_g; +H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST64_g; /* Operations defined on all data types */ -__DLL__ hid_t H5Topen(hid_t loc_id, const char *name); -__DLL__ hid_t H5Tcreate(H5T_class_t type, size_t size); -__DLL__ hid_t H5Tcopy(hid_t type_id); -__DLL__ herr_t H5Tclose(hid_t type_id); -__DLL__ htri_t H5Tequal(hid_t type1_id, hid_t type2_id); -__DLL__ herr_t H5Tlock(hid_t type_id); -__DLL__ herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id); -__DLL__ htri_t H5Tcommitted(hid_t type_id); +H5_DLL hid_t H5Topen(hid_t loc_id, const char *name); +H5_DLL hid_t H5Tcreate(H5T_class_t type, size_t size); +H5_DLL hid_t H5Tcopy(hid_t type_id); +H5_DLL herr_t H5Tclose(hid_t type_id); +H5_DLL htri_t H5Tequal(hid_t type1_id, hid_t type2_id); +H5_DLL herr_t H5Tlock(hid_t type_id); +H5_DLL herr_t H5Tcommit(hid_t loc_id, const char *name, hid_t type_id); +H5_DLL htri_t H5Tcommitted(hid_t type_id); /* Operations defined on compound data types */ -__DLL__ herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset, +H5_DLL herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id); -__DLL__ herr_t H5Tpack(hid_t type_id); +H5_DLL herr_t H5Tpack(hid_t type_id); /* Operations defined on enumeration data types */ -__DLL__ hid_t H5Tenum_create(hid_t base_id); -__DLL__ herr_t H5Tenum_insert(hid_t type, const char *name, void *value); -__DLL__ herr_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, +H5_DLL hid_t H5Tenum_create(hid_t base_id); +H5_DLL herr_t H5Tenum_insert(hid_t type, const char *name, void *value); +H5_DLL herr_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size); -__DLL__ herr_t H5Tenum_valueof(hid_t type, const char *name, +H5_DLL herr_t H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/); /* Operations defined on variable-length data types */ -__DLL__ hid_t H5Tvlen_create(hid_t base_id); +H5_DLL hid_t H5Tvlen_create(hid_t base_id); /* Operations defined on array data types */ -__DLL__ hid_t H5Tarray_create(hid_t base_id, int ndims, +H5_DLL hid_t H5Tarray_create(hid_t base_id, int ndims, const hsize_t dim[/* ndims */], const int perm[/* ndims */]); -__DLL__ int H5Tget_array_ndims(hid_t type_id); -__DLL__ herr_t H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]); +H5_DLL int H5Tget_array_ndims(hid_t type_id); +H5_DLL herr_t H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]); /* Operations defined on opaque data types */ -__DLL__ herr_t H5Tset_tag(hid_t type, const char *tag); -__DLL__ char *H5Tget_tag(hid_t type); +H5_DLL herr_t H5Tset_tag(hid_t type, const char *tag); +H5_DLL char *H5Tget_tag(hid_t type); /* Querying property values */ -__DLL__ hid_t H5Tget_super(hid_t type); -__DLL__ H5T_class_t H5Tget_class(hid_t type_id); -__DLL__ htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls); -__DLL__ size_t H5Tget_size(hid_t type_id); -__DLL__ H5T_order_t H5Tget_order(hid_t type_id); -__DLL__ size_t H5Tget_precision(hid_t type_id); -__DLL__ int H5Tget_offset(hid_t type_id); -__DLL__ herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, +H5_DLL hid_t H5Tget_super(hid_t type); +H5_DLL H5T_class_t H5Tget_class(hid_t type_id); +H5_DLL htri_t H5Tdetect_class(hid_t type_id, H5T_class_t cls); +H5_DLL size_t H5Tget_size(hid_t type_id); +H5_DLL H5T_order_t H5Tget_order(hid_t type_id); +H5_DLL size_t H5Tget_precision(hid_t type_id); +H5_DLL int H5Tget_offset(hid_t type_id); +H5_DLL herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/); -__DLL__ H5T_sign_t H5Tget_sign(hid_t type_id); -__DLL__ herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/, +H5_DLL H5T_sign_t H5Tget_sign(hid_t type_id); +H5_DLL herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/, size_t *epos/*out*/, size_t *esize/*out*/, size_t *mpos/*out*/, size_t *msize/*out*/); -__DLL__ size_t H5Tget_ebias(hid_t type_id); -__DLL__ H5T_norm_t H5Tget_norm(hid_t type_id); -__DLL__ H5T_pad_t H5Tget_inpad(hid_t type_id); -__DLL__ H5T_str_t H5Tget_strpad(hid_t type_id); -__DLL__ int H5Tget_nmembers(hid_t type_id); -__DLL__ char *H5Tget_member_name(hid_t type_id, int membno); -__DLL__ int H5Tget_member_index(hid_t type_id, const char *name); -__DLL__ size_t H5Tget_member_offset(hid_t type_id, int membno); -__DLL__ H5T_class_t H5Tget_member_class(hid_t type_id, int membno); -__DLL__ hid_t H5Tget_member_type(hid_t type_id, int membno); -__DLL__ herr_t H5Tget_member_value(hid_t type_id, int membno, +H5_DLL size_t H5Tget_ebias(hid_t type_id); +H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id); +H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id); +H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id); +H5_DLL int H5Tget_nmembers(hid_t type_id); +H5_DLL char *H5Tget_member_name(hid_t type_id, int membno); +H5_DLL int H5Tget_member_index(hid_t type_id, const char *name); +H5_DLL size_t H5Tget_member_offset(hid_t type_id, int membno); +H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, int membno); +H5_DLL hid_t H5Tget_member_type(hid_t type_id, int membno); +H5_DLL herr_t H5Tget_member_value(hid_t type_id, int membno, void *value/*out*/); -__DLL__ H5T_cset_t H5Tget_cset(hid_t type_id); +H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id); /* Setting property values */ -__DLL__ herr_t H5Tset_size(hid_t type_id, size_t size); -__DLL__ herr_t H5Tset_order(hid_t type_id, H5T_order_t order); -__DLL__ herr_t H5Tset_precision(hid_t type_id, size_t prec); -__DLL__ herr_t H5Tset_offset(hid_t type_id, size_t offset); -__DLL__ herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb); -__DLL__ herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign); -__DLL__ herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos, +H5_DLL herr_t H5Tset_size(hid_t type_id, size_t size); +H5_DLL herr_t H5Tset_order(hid_t type_id, H5T_order_t order); +H5_DLL herr_t H5Tset_precision(hid_t type_id, size_t prec); +H5_DLL herr_t H5Tset_offset(hid_t type_id, size_t offset); +H5_DLL herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb); +H5_DLL herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign); +H5_DLL herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize); -__DLL__ herr_t H5Tset_ebias(hid_t type_id, size_t ebias); -__DLL__ herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm); -__DLL__ herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad); -__DLL__ herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset); -__DLL__ herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad); +H5_DLL herr_t H5Tset_ebias(hid_t type_id, size_t ebias); +H5_DLL herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm); +H5_DLL herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad); +H5_DLL herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset); +H5_DLL herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad); /* Type conversion database */ -__DLL__ herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, +H5_DLL herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -__DLL__ herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, +H5_DLL herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -__DLL__ H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata); -__DLL__ herr_t H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts, +H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata); +H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts, void *buf, void *background, hid_t plist_id); -__DLL__ H5T_overflow_t H5Tget_overflow(void); -__DLL__ herr_t H5Tset_overflow(H5T_overflow_t func); +H5_DLL H5T_overflow_t H5Tget_overflow(void); +H5_DLL herr_t H5Tset_overflow(H5T_overflow_t func); #ifdef __cplusplus } diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index ffc17dc..4fab3ba 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -34,45 +34,45 @@ /* A null pointer is equivalent to a zero vector */ #define H5V_ZERO NULL -__DLL__ hsize_t H5V_hyper_stride(unsigned n, const hsize_t *size, +H5_DLL hsize_t H5V_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size, const hssize_t *offset, hssize_t *stride); -__DLL__ htri_t H5V_hyper_disjointp(unsigned n, const hssize_t *offset1, +H5_DLL htri_t H5V_hyper_disjointp(unsigned n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -__DLL__ htri_t H5V_hyper_eq(int n, const hssize_t *offset1, +H5_DLL htri_t H5V_hyper_eq(int n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -__DLL__ herr_t H5V_hyper_fill(unsigned n, const hsize_t *_size, +H5_DLL herr_t H5V_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, const hssize_t *offset, void *_dst, unsigned fill_value); -__DLL__ herr_t H5V_hyper_copy(unsigned n, const hsize_t *size, +H5_DLL herr_t H5V_hyper_copy(unsigned n, const hsize_t *size, const hsize_t *dst_total_size, const hssize_t *dst_offset, void *_dst, const hsize_t *src_total_size, const hssize_t *src_offset, const void *_src); -__DLL__ herr_t H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, +H5_DLL herr_t H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hssize_t *stride, void *_dst, unsigned fill_value); -__DLL__ herr_t H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *_size, +H5_DLL herr_t H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *_size, const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride, const void *_src); -__DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, int dst_n, +H5_DLL herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, int dst_n, const hsize_t *dst_size, const hssize_t *dst_stride, void *_dst, int src_n, const hsize_t *src_size, const hssize_t *src_stride, const void *_src); -__DLL__ herr_t H5V_stride_optimize1(unsigned *np, hsize_t *elmt_size, +H5_DLL herr_t H5V_stride_optimize1(unsigned *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1); -__DLL__ herr_t H5V_stride_optimize2(unsigned *np, hsize_t *elmt_size, +H5_DLL herr_t H5V_stride_optimize2(unsigned *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1, hssize_t *stride2); -__DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size, +H5_DLL herr_t H5V_array_fill(void *_dst, const void *src, size_t size, size_t count); -__DLL__ hsize_t H5V_array_offset(unsigned n, const hsize_t *total_size, +H5_DLL hsize_t H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset); diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index f1e46e2..0a20b13 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -31,16 +31,16 @@ typedef struct H5Z_class_t { struct H5O_pline_t; /*forward decl*/ -__DLL__ herr_t H5Z_register(H5Z_filter_t id, const char *comment, +H5_DLL herr_t H5Z_register(H5Z_filter_t id, const char *comment, H5Z_func_t filter); -__DLL__ herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, +H5_DLL herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts, const unsigned int cd_values[]); -__DLL__ herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, +H5_DLL herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, unsigned flags, unsigned *filter_mask/*in,out*/, size_t *nbytes/*in,out*/, size_t *buf_size/*in,out*/, void **buf/*in,out*/); -__DLL__ H5Z_class_t *H5Z_find(H5Z_filter_t id); +H5_DLL H5Z_class_t *H5Z_find(H5Z_filter_t id); #endif diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index f88d1f5..466fbb6 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -52,7 +52,7 @@ typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, extern "C" { #endif -__DLL__ herr_t H5Zregister(H5Z_filter_t id, const char *comment, +H5_DLL herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t filter); size_t H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index 1c72c2e..0c553b3 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -10,29 +10,29 @@ #if defined(_HDF5DLL_) #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ -#define __DLL__ __declspec(dllexport) -#define __DLLVAR__ __declspec(dllexport) +#define H5_DLL __declspec(dllexport) +#define H5_DLLVAR __declspec(dllexport) #elif defined(_HDF5USEDLL_) -#define __DLL__ __declspec(dllimport) -#define __DLLVAR__ __declspec(dllimport) +#define H5_DLL __declspec(dllimport) +#define H5_DLLVAR __declspec(dllimport) #else -#define __DLL__ -#define __DLLVAR__ extern +#define H5_DLL +#define H5_DLLVAR extern #endif /* _HDF5DLL_ */ // Added to export or to import C++ APIs - BMR (02-15-2002) #if defined(HDF5_CPPDLL_EXPORTS) // this name is generated at creation -#define __DLLCPP__ __declspec(dllexport) +#define H5_DLLCPP __declspec(dllexport) #elif defined(HDF5CPP_USEDLL) -#define __DLLCPP__ __declspec(dllimport) +#define H5_DLLCPP __declspec(dllimport) #else -#define __DLLCPP__ +#define H5_DLLCPP #endif /* HDF5_CPPDLL_EXPORTS */ #else /*WIN32*/ -#define __DLL__ -#define __DLLVAR__ extern -#define __DLLCPP__ +#define H5_DLL +#define H5_DLLVAR extern +#define H5_DLLCPP #endif #endif /* H5API_ADPT_H */ diff --git a/src/H5private.h b/src/H5private.h index 4f7e654..898a62e 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -469,11 +469,11 @@ typedef struct { double etime; /*elapsed wall-clock time */ } H5_timer_t; -__DLL__ void H5_timer_reset (H5_timer_t *timer); -__DLL__ void H5_timer_begin (H5_timer_t *timer); -__DLL__ void H5_timer_end (H5_timer_t *sum/*in,out*/, +H5_DLL void H5_timer_reset (H5_timer_t *timer); +H5_DLL void H5_timer_begin (H5_timer_t *timer); +H5_DLL void H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/); -__DLL__ void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); +H5_DLL void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); /* * Redefine all the POSIX functions. We should never see a POSIX @@ -552,7 +552,7 @@ __DLL__ void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); #define HDfopen(S,M) fopen(S,M) #define HDfork() fork() #define HDfpathconf(F,N) fpathconf(F,N) -__DLL__ int HDfprintf (FILE *stream, const char *fmt, ...); +H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...); #define HDfputc(C,F) fputc(C,F) #define HDfputs(S,F) fputs(S,F) #define HDfread(M,Z,N,F) fread(M,Z,N,F) @@ -730,7 +730,7 @@ typedef struct stat h5_stat_t; #define HDstrtod(S,R) strtod(S,R) #define HDstrtok(X,Y) strtok(X,Y) #define HDstrtol(S,R,N) strtol(S,R,N) -__DLL__ int64_t HDstrtoll (const char *s, const char **rest, int base); +H5_DLL int64_t HDstrtoll (const char *s, const char **rest, int base); #define HDstrtoul(S,R,N) strtoul(S,R,N) #define HDstrxfrm(X,Y,Z) strxfrm(X,Y,Z) #define HDsysconf(N) sysconf(N) @@ -799,10 +799,10 @@ extern char *strdup(const char *s); #ifndef H5_HAVE_SNPRINTF -__DLL__ int HDsnprintf(char *buf, size_t size, const char *fmt, ...); +H5_DLL int HDsnprintf(char *buf, size_t size, const char *fmt, ...); #endif #ifndef H5_HAVE_VSNPRINTF -__DLL__ int HDvsnprintf(char *buf, size_t size, const char *fmt, va_list ap); +H5_DLL int HDvsnprintf(char *buf, size_t size, const char *fmt, va_list ap); #endif /* @@ -913,7 +913,7 @@ extern H5_debug_t H5_debug_g; #define H5TRACE_RETURN(V) /*void*/ #endif -__DLL__ double H5_trace(double *calltime, const char *func, const char *type, ...); +H5_DLL double H5_trace(double *calltime, const char *func, const char *type, ...); /*------------------------------------------------------------------------- @@ -1172,22 +1172,22 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ #endif /* Private functions, not part of the publicly documented API */ -__DLL__ herr_t H5_init_library(void); -__DLL__ void H5_term_library(void); +H5_DLL herr_t H5_init_library(void); +H5_DLL void H5_term_library(void); /* Functions to terminate interfaces */ -__DLL__ int H5A_term_interface(void); -__DLL__ int H5AC_term_interface(void); -__DLL__ int H5D_term_interface(void); -__DLL__ int H5F_term_interface(void); -__DLL__ int H5G_term_interface(void); -__DLL__ int H5I_term_interface(void); -__DLL__ int H5P_term_interface(void); -__DLL__ int H5R_term_interface(void); -__DLL__ int H5S_term_interface(void); -__DLL__ int H5TN_term_interface(void); -__DLL__ int H5T_term_interface(void); -__DLL__ int H5Z_term_interface(void); +H5_DLL int H5A_term_interface(void); +H5_DLL int H5AC_term_interface(void); +H5_DLL int H5D_term_interface(void); +H5_DLL int H5F_term_interface(void); +H5_DLL int H5G_term_interface(void); +H5_DLL int H5I_term_interface(void); +H5_DLL int H5P_term_interface(void); +H5_DLL int H5R_term_interface(void); +H5_DLL int H5S_term_interface(void); +H5_DLL int H5TN_term_interface(void); +H5_DLL int H5T_term_interface(void); +H5_DLL int H5Z_term_interface(void); #endif diff --git a/src/H5public.h b/src/H5public.h index d17efa2..53e65ea 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -179,16 +179,16 @@ extern "C" { #endif /* Functions in H5.c */ -__DLL__ herr_t H5open(void); -__DLL__ herr_t H5close(void); -__DLL__ herr_t H5dont_atexit(void); -__DLL__ herr_t H5garbage_collect(void); -__DLL__ herr_t H5set_free_list_limits (int reg_global_lim, int reg_list_lim, +H5_DLL herr_t H5open(void); +H5_DLL herr_t H5close(void); +H5_DLL herr_t H5dont_atexit(void); +H5_DLL herr_t H5garbage_collect(void); +H5_DLL herr_t H5set_free_list_limits (int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim, int blk_global_lim, int blk_list_lim); -__DLL__ herr_t H5get_libversion(unsigned *majnum, unsigned *minnum, +H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum); -__DLL__ herr_t H5check_version(unsigned majnum, unsigned minnum, +H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum, unsigned relnum); #ifdef __cplusplus -- cgit v0.12