From 3d6d039b864ef9f2fcf3298bb6195541b4b226f8 Mon Sep 17 00:00:00 2001 From: Patrick Lu Date: Tue, 2 Feb 1999 10:52:59 -0500 Subject: [PATCH] [svn-r1051] changed the HDF5DLL and HDF5GLOBAL to __DLL__ and __DLLVAR__ also exported all globals and non static functions to the dll --- src/H5Bprivate.h | 12 +-- src/H5Dprivate.h | 28 +++--- src/H5Dpublic.h | 18 ++-- src/H5Eprivate.h | 12 +-- src/H5Epublic.h | 16 ++-- src/H5Fprivate.h | 116 +++++++++++----------- src/H5Fpublic.h | 20 ++-- src/H5Gpkg.h | 16 ++-- src/H5Gprivate.h | 58 +++++------ src/H5RApublic.h | 10 +- src/H5Rpublic.h | 6 +- src/H5Sprivate.h | 140 +++++++++++++-------------- src/H5Spublic.h | 40 ++++---- src/H5TBprivate.h | 10 +- src/H5Tpkg.h | 240 +++++++++++++++++++++++----------------------- src/H5Tprivate.h | 54 +++++------ src/H5Tpublic.h | 222 +++++++++++++++++++++--------------------- src/H5Vprivate.h | 22 ++--- src/H5Zprivate.h | 8 +- src/H5Zpublic.h | 2 +- 20 files changed, 525 insertions(+), 525 deletions(-) diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index 3fd21b6a48..91eb2019a2 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -121,15 +121,15 @@ typedef struct H5B_t { /* * Library prototypes. */ -herr_t H5B_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, +__DLL__ herr_t H5B_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, intn fwidth, const H5B_class_t *type, void *udata); -herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *); -herr_t H5B_find (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, +__DLL__ herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *); +__DLL__ herr_t H5B_find (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, void *udata); -herr_t H5B_insert (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, +__DLL__ herr_t H5B_insert (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, const double split_ratios[], void *udata); -herr_t H5B_remove(H5F_t *f, const H5B_class_t *type, const haddr_t *addr, +__DLL__ herr_t H5B_remove(H5F_t *f, const H5B_class_t *type, const haddr_t *addr, void *udata); -herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, +__DLL__ herr_t H5B_iterate (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, void *udata); #endif diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 470368a274..1cd443200e 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -63,26 +63,26 @@ typedef struct H5D_xfer_t { } H5D_xfer_t; typedef struct H5D_t H5D_t; -extern const H5D_create_t H5D_create_dflt; -HDF5GLOBAL const H5D_xfer_t H5D_xfer_dflt; +__DLLVAR__ const H5D_create_t H5D_create_dflt; +__DLLVAR__ const H5D_xfer_t H5D_xfer_dflt; /* Functions defined in H5D.c */ -H5D_t *H5D_create (H5G_entry_t *loc, const char *name, const H5T_t *type, +__DLL__ H5D_t *H5D_create (H5G_entry_t *loc, const char *name, const H5T_t *type, const H5S_t *space, const H5D_create_t *create_parms); -H5D_t *H5D_open (H5G_entry_t *loc, const char *name); -herr_t H5D_close (H5D_t *dataset); -htri_t H5D_isa(H5G_entry_t *ent); -herr_t H5D_read (H5D_t *dataset, const H5T_t *mem_type, +__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, const H5S_t *mem_space, const H5S_t *file_space, const H5D_xfer_t *xfer_parms, void *buf/*out*/); -herr_t H5D_write (H5D_t *dataset, const H5T_t *mem_type, +__DLL__ herr_t H5D_write (H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, const H5S_t *file_space, const H5D_xfer_t *xfer_parms, const void *buf); -herr_t H5D_extend (H5D_t *dataset, const hsize_t *size); -H5G_entry_t *H5D_entof (H5D_t *dataset); -H5T_t *H5D_typeof (H5D_t *dset); -H5S_t *H5D_get_space(H5D_t *dset); -H5D_t * H5D_open_oid(H5G_entry_t *ent); -H5F_t * H5D_get_file(const H5D_t *dset); +__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); #endif diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index e355de5961..9e6cba3908 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -43,18 +43,18 @@ typedef enum H5D_transfer_t { extern "C" { #endif -HDF5API hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id, +__DLL__ hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id, hid_t space_id, hid_t plist_id); -HDF5API hid_t H5Dopen (hid_t file_id, const char *name); -HDF5API herr_t H5Dclose (hid_t dset_id); -HDF5API hid_t H5Dget_space (hid_t dset_id); -HDF5API hid_t H5Dget_type (hid_t dset_id); -HDF5API hid_t H5Dget_create_plist (hid_t dset_id); -HDF5API herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_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__ hid_t H5Dget_type (hid_t dset_id); +__DLL__ hid_t H5Dget_create_plist (hid_t dset_id); +__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*/); -HDF5API herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, +__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); -HDF5API herr_t H5Dextend (hid_t dset_id, const hsize_t *size); +__DLL__ herr_t H5Dextend (hid_t dset_id, const hsize_t *size); #ifdef __cplusplus } diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 830b426cbf..fcce5202d2 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -103,15 +103,15 @@ typedef struct H5E_t { H5E_error_t slot[H5E_NSLOTS]; /*array of error records */ } H5E_t; -extern const hbool_t H5E_clearable_g; /*safe to call H5E_clear() on enter? */ -extern herr_t (*H5E_auto_g)(void *client_data); -extern void *H5E_auto_data_g; +__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; -herr_t H5E_push (H5E_major_t maj_num, H5E_minor_t min_num, +__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); -herr_t H5E_clear (void); -herr_t H5E_walk (H5E_direction_t dir, H5E_walk_t func, void *client_data); +__DLL__ herr_t H5E_clear (void); +__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 abaf7d7e12..607fd958ac 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -175,15 +175,15 @@ typedef herr_t (*H5E_auto_t)(void *client_data); extern "C" { #endif -HDF5API herr_t H5Eset_auto (H5E_auto_t func, void *client_data); -HDF5API herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); -HDF5API herr_t H5Eclear (void); -HDF5API herr_t H5Eprint (FILE *stream); -HDF5API herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, +__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, void *client_data); -HDF5API herr_t H5Ewalk_cb (int n, H5E_error_t *err_desc, void *client_data); -HDF5API const char *H5Eget_major (H5E_major_t major_number); -HDF5API const char *H5Eget_minor (H5E_minor_t minor_number); +__DLL__ herr_t H5Ewalk_cb (int n, H5E_error_t *err_desc, void *client_data); +__DLL__ const char *H5Eget_major (H5E_major_t major_number); +__DLL__ const char *H5Eget_minor (H5E_minor_t minor_number); #ifdef __cplusplus } diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 740670c6a8..994f515523 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -404,13 +404,13 @@ typedef struct H5F_low_t { #ifndef H5F_LOW_DFLT # define H5F_LOW_DFLT H5F_LOW_SEC2 /* The default type */ #endif -extern const H5F_low_class_t H5F_LOW_SEC2_g[]; /* Posix section 2 */ -extern const H5F_low_class_t H5F_LOW_STDIO_g[]; /* Posix stdio */ -extern const H5F_low_class_t H5F_LOW_CORE_g[]; /* In-core temp file */ -extern const H5F_low_class_t H5F_LOW_FAMILY_g[];/* File family */ -extern const H5F_low_class_t H5F_LOW_SPLIT_g[]; /* Split meta/raw data */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_SEC2_g[]; /* Posix section 2 */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_STDIO_g[]; /* Posix stdio */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_CORE_g[]; /* In-core temp file */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_FAMILY_g[];/* File family */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_SPLIT_g[]; /* Split meta/raw data */ #ifdef HAVE_PARALLEL -extern const H5F_low_class_t H5F_LOW_MPIO_g[]; /* MPI-IO */ +__DLLVAR__ const H5F_low_class_t H5F_LOW_MPIO_g[]; /* MPI-IO */ #endif /* The raw data chunk cache */ @@ -535,31 +535,31 @@ struct H5O_fill_t; struct H5G_entry_t; /* library variables */ -extern const H5F_create_t H5F_create_dflt; -extern H5F_access_t H5F_access_dflt; -extern const H5F_mprop_t H5F_mount_dflt; +__DLLVAR__ const H5F_create_t H5F_create_dflt; +__DLLVAR__ H5F_access_t H5F_access_dflt; +__DLLVAR__ const H5F_mprop_t H5F_mount_dflt; #ifdef HAVE_PARALLEL -extern hbool_t H5_mpi_1_metawrite_g; +__DLLVAR__ hbool_t H5_mpi_1_metawrite_g; #endif /* HAVE_PARALLEL */ /* Private functions, not part of the publicly documented API */ -herr_t H5F_init(void); -void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l); -H5F_t *H5F_open(const char *name, uintn flags, +__DLL__ herr_t H5F_init(void); +__DLL__ void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l); +__DLL__ H5F_t *H5F_open(const char *name, uintn flags, const H5F_create_t *create_parms, const H5F_access_t *access_parms); -herr_t H5F_close(H5F_t *f); -HDF5API herr_t H5F_debug(H5F_t *f, const haddr_t *addr, FILE * stream, +__DLL__ herr_t H5F_close(H5F_t *f); +__DLL__ herr_t H5F_debug(H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, intn fwidth); -HDF5API herr_t H5F_istore_debug(H5F_t *f, const haddr_t *addr, FILE * stream, +__DLL__ herr_t H5F_istore_debug(H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, intn fwidth, int ndims); -herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); +__DLL__ herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); /* Functions that operate on array storage */ -HDF5API herr_t H5F_arr_create(H5F_t *f, +__DLL__ herr_t H5F_arr_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/); -HDF5API herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, @@ -568,7 +568,7 @@ HDF5API herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, const hsize_t mem_size[], const hssize_t mem_offset[], const hssize_t file_offset[], void *_buf/*out*/); -HDF5API herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, @@ -579,24 +579,24 @@ HDF5API herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, const hssize_t file_offset[], const void *_buf); /* Functions that operate on indexed storage */ -herr_t H5F_istore_init (H5F_t *f); -herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt); -herr_t H5F_istore_dest (H5F_t *f); -herr_t H5F_istore_stats (H5F_t *f, hbool_t headers); -herr_t H5F_istore_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/); -herr_t H5F_istore_read(H5F_t *f, const struct H5D_xfer_t *xfer, +__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_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/); +__DLL__ herr_t H5F_istore_read(H5F_t *f, const struct H5D_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, const hssize_t offset[], const hsize_t size[], void *buf /*out */ ); -herr_t H5F_istore_write(H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_istore_write(H5F_t *f, const struct H5D_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, const hssize_t offset[], const hsize_t size[], const void *buf); -herr_t H5F_istore_allocate (H5F_t *f, +__DLL__ herr_t H5F_istore_allocate (H5F_t *f, const struct H5O_layout_t *layout, const hsize_t *space_dim, const double split_ratios[], @@ -604,34 +604,34 @@ herr_t H5F_istore_allocate (H5F_t *f, const struct H5O_fill_t *fill); /* Functions that operate on contiguous storage wrt boot block */ -HDF5API herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size, +__DLL__ herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size, const H5D_transfer_t xfer_mode, void *buf); -herr_t H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size, +__DLL__ herr_t H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size, const H5D_transfer_t xfer_mode, const void *buf); /* Functions that operate directly on low-level files */ -const H5F_low_class_t *H5F_low_class (H5F_driver_t driver); -herr_t H5F_low_extend(H5F_low_t *lf, const H5F_access_t *access_parms, +__DLL__ const H5F_low_class_t *H5F_low_class (H5F_driver_t driver); +__DLL__ herr_t H5F_low_extend(H5F_low_t *lf, const H5F_access_t *access_parms, intn op, hsize_t size, haddr_t *addr/*out*/); -HDF5API herr_t H5F_low_seteof(H5F_low_t *lf, const haddr_t *addr); -intn H5F_low_alloc (H5F_low_t *lf, intn op, hsize_t alignment, +__DLL__ herr_t H5F_low_seteof(H5F_low_t *lf, const haddr_t *addr); +__DLL__ intn H5F_low_alloc (H5F_low_t *lf, intn op, hsize_t alignment, hsize_t threshold, hsize_t size, H5MF_free_t *blk, haddr_t *addr/*out*/); -htri_t H5F_low_access(const H5F_low_class_t *type, const char *name, +__DLL__ htri_t H5F_low_access(const H5F_low_class_t *type, const char *name, const H5F_access_t *access_parms, int mode, H5F_search_t *key); -H5F_low_t *H5F_low_open(const H5F_low_class_t *type, const char *name, +__DLL__ H5F_low_t *H5F_low_open(const H5F_low_class_t *type, const char *name, const H5F_access_t *access_parms, uintn flags, H5F_search_t *key); -H5F_low_t *H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms); -hsize_t H5F_low_size(H5F_low_t *lf, haddr_t *addr); -herr_t H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms, +__DLL__ H5F_low_t *H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms); +__DLL__ hsize_t H5F_low_size(H5F_low_t *lf, haddr_t *addr); +__DLL__ herr_t H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms, const H5D_transfer_t xfer_mode, const haddr_t *addr, size_t size, uint8_t *buf); -herr_t H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms, +__DLL__ herr_t H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms, const H5D_transfer_t xfer_mode, const haddr_t *addr, size_t size, const uint8_t *buf); -herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms); +__DLL__ herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms); /* Functions that operate on addresses */ #define H5F_addr_eq(A1,A2) (H5F_addr_cmp(A1,A2)==0) @@ -641,26 +641,26 @@ herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms); #define H5F_addr_gt(A1,A2) (H5F_addr_cmp(A1,A2)>0) #define H5F_addr_ge(A1,A2) (H5F_addr_cmp(A1,A2)>=0) -HDF5API intn H5F_addr_cmp(const haddr_t *, const haddr_t *); -htri_t H5F_addr_defined(const haddr_t *); -void H5F_addr_undef(haddr_t *); -HDF5API void H5F_addr_reset(haddr_t *); -htri_t H5F_addr_zerop(const haddr_t *); -void H5F_addr_encode(H5F_t *, uint8_t **, const haddr_t *); -void H5F_addr_decode(H5F_t *, const uint8_t **, haddr_t *); -HDF5API void H5F_addr_print(FILE *, const haddr_t *); -void H5F_addr_pow2(uintn, haddr_t *); -void H5F_addr_inc(haddr_t *addr/*in,out*/, hsize_t inc); -void H5F_addr_adj(haddr_t *addr/*in,out*/, hssize_t adj); -void H5F_addr_add(haddr_t *, const haddr_t *); -uintn H5F_addr_hash(const haddr_t *, uintn mod); -herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr, const long objno[2]); +__DLL__ intn H5F_addr_cmp(const haddr_t *, const haddr_t *); +__DLL__ htri_t H5F_addr_defined(const haddr_t *); +__DLL__ void H5F_addr_undef(haddr_t *); +__DLL__ void H5F_addr_reset(haddr_t *); +__DLL__ htri_t H5F_addr_zerop(const haddr_t *); +__DLL__ void H5F_addr_encode(H5F_t *, uint8_t **, const haddr_t *); +__DLL__ void H5F_addr_decode(H5F_t *, const uint8_t **, haddr_t *); +__DLL__ void H5F_addr_print(FILE *, const haddr_t *); +__DLL__ void H5F_addr_pow2(uintn, haddr_t *); +__DLL__ void H5F_addr_inc(haddr_t *addr/*in,out*/, hsize_t inc); +__DLL__ void H5F_addr_adj(haddr_t *addr/*in,out*/, hssize_t adj); +__DLL__ void H5F_addr_add(haddr_t *, const haddr_t *); +__DLL__ uintn H5F_addr_hash(const haddr_t *, uintn mod); +__DLL__ herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr, const long objno[2]); /* Functions for MPI-IO */ #ifdef HAVE_PARALLEL -htri_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval ); -herr_t H5PC_Wait_for_left_neighbor( MPI_Comm comm ); -herr_t H5PC_Signal_right_neighbor( MPI_Comm comm ); +__DLL__ htri_t H5F_mpio_tas_allsame(H5F_low_t *lf, hbool_t newval ); +__DLL__ herr_t H5PC_Wait_for_left_neighbor( MPI_Comm comm ); +__DLL__ herr_t H5PC_Signal_right_neighbor( MPI_Comm comm ); #endif /* HAVE_PARALLEL */ #endif diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index f9e797b3a2..8646f02f3f 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -83,18 +83,18 @@ extern "C" { #endif /* Functions in H5F.c */ -HDF5API htri_t H5Fis_hdf5 (const char *filename); -HDF5API hid_t H5Fcreate (const char *filename, unsigned flags, +__DLL__ htri_t H5Fis_hdf5 (const char *filename); +__DLL__ hid_t H5Fcreate (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist); -HDF5API hid_t H5Fopen (const char *filename, unsigned flags, +__DLL__ hid_t H5Fopen (const char *filename, unsigned flags, hid_t access_plist); -HDF5API hid_t H5Freopen(hid_t file_id); -HDF5API herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); -HDF5API herr_t H5Fclose (hid_t file_id); -HDF5API hid_t H5Fget_create_plist (hid_t file_id); -HDF5API hid_t H5Fget_access_plist (hid_t file_id); -HDF5API herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); -HDF5API herr_t H5Funmount(hid_t loc, const char *name); +__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 H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist); +__DLL__ herr_t H5Funmount(hid_t loc, const char *name); #ifdef __cplusplus } diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 2584eb0f79..dadf8c4184 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -110,28 +110,28 @@ typedef struct H5G_bt_ud2_t { /* * This is the class identifier to give to the B-tree functions. */ -extern H5B_class_t H5B_SNODE[1]; +__DLLVAR__ H5B_class_t H5B_SNODE[1]; /* The cache subclass */ -extern const H5AC_class_t H5AC_SNODE[1]; +__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. */ -herr_t H5G_stab_create (H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); -herr_t H5G_stab_find (H5G_entry_t *grp_ent, const char *name, +__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, H5G_entry_t *obj_ent/*out*/); -herr_t H5G_stab_insert (H5G_entry_t *grp_ent, const char *name, +__DLL__ herr_t H5G_stab_insert (H5G_entry_t *grp_ent, const char *name, H5G_entry_t *obj_ent); -herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name); +__DLL__ herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name); /* * Functions that understand symbol table entries. */ -herr_t H5G_ent_decode_vec (H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, +__DLL__ herr_t H5G_ent_decode_vec (H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, intn n); -herr_t H5G_ent_encode_vec (H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, +__DLL__ herr_t H5G_ent_encode_vec (H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, intn n); #endif diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index 7783b8eaa7..82d4124d50 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -110,44 +110,44 @@ typedef struct H5G_typeinfo_t { * Library prototypes... These are the ones that other packages routinely * call. */ -herr_t H5G_register_type(intn type, htri_t(*isa)(H5G_entry_t*), +__DLL__ herr_t H5G_register_type(intn type, htri_t(*isa)(H5G_entry_t*), const char *desc); -H5G_entry_t *H5G_loc (hid_t loc_id); -herr_t H5G_mkroot (H5F_t *f, H5G_entry_t *root_entry); -HDF5API H5G_entry_t *H5G_entof (H5G_t *grp); -H5F_t *H5G_fileof (H5G_t *grp); -H5G_t *H5G_create (H5G_entry_t *loc, const char *name, size_t size_hint); -H5G_t *H5G_open (H5G_entry_t *loc, const char *name); -H5G_t *H5G_reopen (H5G_t *grp); -herr_t H5G_close (H5G_t *grp); -HDF5API H5G_t *H5G_rootof(H5F_t *f); -htri_t H5G_isa(H5G_entry_t *ent); -herr_t H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name, +__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, size_t size_hint); +__DLL__ H5G_t *H5G_open (H5G_entry_t *loc, const char *name); +__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 *loc, H5G_link_t type, const char *cur_name, const char *new_name, uintn namei_flags); -intn H5G_get_type(H5G_entry_t *ent); -herr_t H5G_get_objinfo (H5G_entry_t *loc, const char *name, +__DLL__ intn H5G_get_type(H5G_entry_t *ent); +__DLL__ herr_t H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link, H5G_stat_t *statbuf/*out*/); -herr_t H5G_linkval (H5G_entry_t *loc, const char *name, size_t size, +__DLL__ herr_t H5G_linkval (H5G_entry_t *loc, const char *name, size_t size, char *buf/*out*/); -herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf); -intn H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, +__DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf); +__DLL__ intn H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf); -HDF5API herr_t H5G_insert (H5G_entry_t *loc, const char *name, H5G_entry_t *ent); -herr_t H5G_move(H5G_entry_t *loc, const char *src_name, const char *dst_name); -herr_t H5G_unlink(H5G_entry_t *loc, const char *name); -herr_t H5G_find (H5G_entry_t *loc, const char *name, +__DLL__ herr_t H5G_insert (H5G_entry_t *loc, const char *name, H5G_entry_t *ent); +__DLL__ herr_t H5G_move(H5G_entry_t *loc, const char *src_name, 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, H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/); -H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name); -herr_t H5G_traverse_slink (H5G_entry_t *grp_ent/*in,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*/, H5G_entry_t *obj_ent/*in,out*/, intn *nlinks/*in,out*/); -herr_t H5G_ent_encode (H5F_t *f, uint8_t **pp, const H5G_entry_t *ent); -herr_t H5G_ent_decode (H5F_t *f, const uint8_t **pp, H5G_entry_t *ent/*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, H5G_entry_t *ent/*out*/); /* * These functions operate on symbol table nodes. */ -HDF5API herr_t H5G_node_debug (H5F_t *f, const haddr_t *addr, FILE * stream, +__DLL__ herr_t H5G_node_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, intn fwidth, const haddr_t *heap); /* @@ -155,8 +155,8 @@ HDF5API herr_t H5G_node_debug (H5F_t *f, const 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. */ -H5G_cache_t *H5G_ent_cache (H5G_entry_t *ent, H5G_type_t *cache_type); -herr_t H5G_ent_modified (H5G_entry_t *ent, H5G_type_t cache_type); -herr_t H5G_ent_debug (H5F_t *f, const H5G_entry_t *ent, FILE * stream, +__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, intn indent, intn fwidth, const haddr_t *heap); #endif diff --git a/src/H5RApublic.h b/src/H5RApublic.h index 67ee7104cb..8478f90794 100644 --- a/src/H5RApublic.h +++ b/src/H5RApublic.h @@ -14,13 +14,13 @@ extern "C" { #endif -HDF5API hid_t H5RAcreate(hid_t loc_id, const char *name, hid_t type_id, +__DLL__ hid_t H5RAcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t plist_id); -HDF5API hid_t H5RAopen(hid_t loc_id, const char *name); -HDF5API herr_t H5RAclose(hid_t array_id); -HDF5API herr_t H5RAwrite(hid_t array_id, hssize_t start_row, hsize_t nrows, +__DLL__ hid_t H5RAopen(hid_t loc_id, const char *name); +__DLL__ herr_t H5RAclose(hid_t array_id); +__DLL__ herr_t H5RAwrite(hid_t array_id, hssize_t start_row, hsize_t nrows, hid_t type_id, hsize_t size[], void *buf[]); -HDF5API herr_t H5RAread(hid_t array_id, hssize_t start_row, hsize_t nrows, +__DLL__ herr_t H5RAread(hid_t array_id, hssize_t start_row, hsize_t nrows, hid_t type_id, hsize_t size[], void *buf[]); #ifdef __cplusplus diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 5e349a8391..37b9c77e17 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -66,10 +66,10 @@ extern "C" { #endif /* Functions in H5R.c */ -HDF5API herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, +__DLL__ herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id); -HDF5API hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); -HDF5API hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); +__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); #ifdef __cplusplus } diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 3c91a0851b..9032b7cb88 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -281,95 +281,95 @@ typedef struct H5S_conv_t { } H5S_conv_t; /* Conversion information for the various data space selection types */ -extern const H5S_fconv_t H5S_POINT_FCONV[]; -extern const H5S_mconv_t H5S_POINT_MCONV[]; -extern const H5S_fconv_t H5S_ALL_FCONV[]; -extern const H5S_mconv_t H5S_ALL_MCONV[]; -extern const H5S_fconv_t H5S_HYPER_FCONV[]; -extern const H5S_mconv_t H5S_HYPER_MCONV[]; +__DLLVAR__ const H5S_fconv_t H5S_POINT_FCONV[]; +__DLLVAR__ const H5S_mconv_t H5S_POINT_MCONV[]; +__DLLVAR__ const H5S_fconv_t H5S_ALL_FCONV[]; +__DLLVAR__ const H5S_mconv_t H5S_ALL_MCONV[]; +__DLLVAR__ const H5S_fconv_t H5S_HYPER_FCONV[]; +__DLLVAR__ const H5S_mconv_t H5S_HYPER_MCONV[]; -H5S_t *H5S_create (H5S_class_t type); -H5S_t *H5S_copy (const H5S_t *src); -herr_t H5S_close_simple (H5S_simple_t *simple); -herr_t H5S_close (H5S_t *ds); -hsize_t H5S_get_simple_extent_npoints (const H5S_t *ds); -hsize_t H5S_get_npoints_max(const H5S_t *ds); -intn H5S_get_simple_extent_ndims (const H5S_t *ds); -intn H5S_get_simple_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/, +__DLL__ H5S_t *H5S_create (H5S_class_t type); +__DLL__ H5S_t *H5S_copy (const H5S_t *src); +__DLL__ herr_t H5S_close_simple (H5S_simple_t *simple); +__DLL__ herr_t H5S_close (H5S_t *ds); +__DLL__ hsize_t H5S_get_simple_extent_npoints (const H5S_t *ds); +__DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds); +__DLL__ intn H5S_get_simple_extent_ndims (const H5S_t *ds); +__DLL__ intn H5S_get_simple_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/, hsize_t max_dims[]/*out*/); -herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space); -H5S_t *H5S_read (H5G_entry_t *ent); -intn H5S_cmp (const H5S_t *ds1, const H5S_t *ds2); -htri_t H5S_is_simple (const H5S_t *sdim); -uintn H5S_nelem (const H5S_t *space); -H5S_conv_t *H5S_find (const H5S_t *mem_space, const H5S_t *file_space); -herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, +__DLL__ herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space); +__DLL__ H5S_t *H5S_read (H5G_entry_t *ent); +__DLL__ intn H5S_cmp (const H5S_t *ds1, const H5S_t *ds2); +__DLL__ htri_t H5S_is_simple (const H5S_t *sdim); +__DLL__ uintn H5S_nelem (const H5S_t *space); +__DLL__ H5S_conv_t *H5S_find (const H5S_t *mem_space, const H5S_t *file_space); +__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[]); -intn H5S_get_hyperslab (const H5S_t *ds, hssize_t offset[]/*out*/, +__DLL__ intn H5S_get_hyperslab (const H5S_t *ds, hssize_t offset[]/*out*/, hsize_t size[]/*out*/, hsize_t stride[]/*out*/); -herr_t H5S_release_simple(H5S_simple_t *simple); -herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src); -herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src); -herr_t H5S_extent_release (H5S_t *space); -herr_t H5S_select_release (H5S_t *space); -herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter); -herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t **coord); -herr_t H5S_select_all (H5S_t *space); -herr_t H5S_select_none (H5S_t *space); -hssize_t H5S_get_select_npoints (const H5S_t *space); -intn H5S_extend (H5S_t *space, const hsize_t *size); -herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims, +__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); +__DLL__ herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src); +__DLL__ herr_t H5S_extent_release (H5S_t *space); +__DLL__ herr_t H5S_select_release (H5S_t *space); +__DLL__ herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter); +__DLL__ herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t **coord); +__DLL__ herr_t H5S_select_all (H5S_t *space); +__DLL__ herr_t H5S_select_none (H5S_t *space); +__DLL__ hssize_t H5S_get_select_npoints (const H5S_t *space); +__DLL__ intn H5S_extend (H5S_t *space, const hsize_t *size); +__DLL__ herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims, const hsize_t *max); -htri_t H5S_select_valid (const H5S_t *space); -herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent, +__DLL__ htri_t H5S_select_valid (const H5S_t *space); +__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent, intn fwidth); -herr_t H5S_register(H5S_sel_type cls, const H5S_fconv_t *fconv, +__DLL__ herr_t H5S_register(H5S_sel_type cls, const H5S_fconv_t *fconv, const H5S_mconv_t *mconv); -hssize_t H5S_select_serial_size(const H5S_t *space); -herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf); -herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); +__DLL__ hssize_t H5S_select_serial_size(const H5S_t *space); +__DLL__ herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf); +__DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); /* Point select functions */ -herr_t H5S_point_add (H5S_t *space, size_t num_elemn, const hssize_t **coord); -herr_t H5S_point_release (H5S_t *space); -hsize_t H5S_point_npoints (const H5S_t *space); -herr_t H5S_point_copy (H5S_t *dst, const H5S_t *src); -htri_t H5S_point_select_valid (const H5S_t *space); -hssize_t H5S_point_select_serial_size(const H5S_t *space); -herr_t H5S_point_select_serialize(const H5S_t *space, uint8_t *buf); -herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf); +__DLL__ herr_t H5S_point_add (H5S_t *space, size_t num_elemn, const hssize_t **coord); +__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_select_valid (const H5S_t *space); +__DLL__ hssize_t H5S_point_select_serial_size(const H5S_t *space); +__DLL__ herr_t H5S_point_select_serialize(const H5S_t *space, uint8_t *buf); +__DLL__ herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf); /* "All" select functions */ -herr_t H5S_all_release (H5S_t *space); -hsize_t H5S_all_npoints (const H5S_t *space); -herr_t H5S_all_select_serialize(const H5S_t *space, uint8_t *buf); -herr_t H5S_all_select_deserialize(H5S_t *space, const uint8_t *buf); +__DLL__ herr_t H5S_all_release (H5S_t *space); +__DLL__ hsize_t H5S_all_npoints (const H5S_t *space); +__DLL__ herr_t H5S_all_select_serialize(const H5S_t *space, uint8_t *buf); +__DLL__ herr_t H5S_all_select_deserialize(H5S_t *space, const uint8_t *buf); /* Hyperslab selection functions */ -herr_t H5S_hyper_add (H5S_t *space, const hssize_t *start, const hsize_t *end); -herr_t H5S_hyper_release (H5S_t *space); -herr_t H5S_hyper_sel_iter_release (H5S_sel_iter_t *sel_iter); -hsize_t H5S_hyper_npoints (const H5S_t *space); -int H5S_hyper_compare_regions (const void *r1, const void *r2); -int H5S_hyper_compare_bounds (const void *r1, const void *r2); -herr_t H5S_hyper_copy (H5S_t *dst, const H5S_t *src); -htri_t H5S_hyper_select_valid (const H5S_t *space); -herr_t H5S_hyper_node_add (H5S_hyper_node_t **head, intn endflag, intn rank, const hssize_t *start, const hsize_t *size); -herr_t H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, H5S_hyper_node_t **overlap); -hssize_t H5S_hyper_select_serial_size(const H5S_t *space); -herr_t H5S_hyper_select_serialize(const H5S_t *space, uint8_t *buf); -herr_t H5S_hyper_select_deserialize(H5S_t *space, const uint8_t *buf); +__DLL__ herr_t H5S_hyper_add (H5S_t *space, const hssize_t *start, const hsize_t *end); +__DLL__ herr_t H5S_hyper_release (H5S_t *space); +__DLL__ herr_t H5S_hyper_sel_iter_release (H5S_sel_iter_t *sel_iter); +__DLL__ hsize_t H5S_hyper_npoints (const H5S_t *space); +__DLL__ int H5S_hyper_compare_regions (const void *r1, const void *r2); +__DLL__ int H5S_hyper_compare_bounds (const void *r1, const void *r2); +__DLL__ herr_t H5S_hyper_copy (H5S_t *dst, const H5S_t *src); +__DLL__ htri_t H5S_hyper_select_valid (const H5S_t *space); +__DLL__ herr_t H5S_hyper_node_add (H5S_hyper_node_t **head, intn endflag, intn rank, const hssize_t *start, const hsize_t *size); +__DLL__ herr_t H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, H5S_hyper_node_t **overlap); +__DLL__ hssize_t H5S_hyper_select_serial_size(const H5S_t *space); +__DLL__ herr_t H5S_hyper_select_serialize(const H5S_t *space, uint8_t *buf); +__DLL__ herr_t H5S_hyper_select_deserialize(H5S_t *space, const uint8_t *buf); /* "None" selection functions */ -herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf); -herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf); +__DLL__ herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf); +__DLL__ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf); #ifdef HAVE_PARALLEL /* MPI-IO function to read directly from app buffer to file rky980813 */ - herr_t H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout, + __DLL__ herr_t H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_efl_t *efl, size_t elmt_size, const H5S_t *file_space, const H5S_t *mem_space, @@ -377,7 +377,7 @@ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf); hbool_t *must_convert /*out*/ ); /* MPI-IO function to write directly from app buffer to file rky980813 */ - herr_t H5S_mpio_spaces_write(H5F_t *f, const struct H5O_layout_t *layout, + __DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_efl_t *efl, size_t elmt_size, const H5S_t *file_space, const H5S_t *mem_space, @@ -386,7 +386,7 @@ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf); #ifndef _H5S_IN_H5S_C /* Global var whose value comes from environment variable */ - extern hbool_t H5_mpi_opt_types_g; + __DLLVAR__ hbool_t H5_mpi_opt_types_g; #endif /* _H5S_IN_H5S_C */ #endif diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 8beef9b20a..6465476e80 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -52,36 +52,36 @@ extern "C" { #endif /* Functions in H5S.c */ -HDF5API hid_t H5Screate(H5S_class_t type); -HDF5API hid_t H5Screate_simple (int rank, const hsize_t dims[], +__DLL__ hid_t H5Screate(H5S_class_t type); +__DLL__ hid_t H5Screate_simple (int rank, const hsize_t dims[], const hsize_t maxdims[]); -HDF5API herr_t H5Sset_extent_simple (hid_t space_id, int rank, +__DLL__ herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]); -HDF5API hid_t H5Scopy (hid_t space_id); -HDF5API herr_t H5Sclose (hid_t space_id); -HDF5API hsize_t H5Sget_simple_extent_npoints (hid_t space_id); -HDF5API int H5Sget_simple_extent_ndims (hid_t space_id); -HDF5API int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], +__DLL__ hid_t H5Scopy (hid_t space_id); +__DLL__ herr_t H5Sclose (hid_t space_id); +__DLL__ hsize_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[], hsize_t maxdims[]); -HDF5API htri_t H5Sis_simple (hid_t space_id); -HDF5API herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims); -HDF5API hssize_t H5Sget_select_npoints (hid_t spaceid); -HDF5API herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op, +__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, const hssize_t start[], const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]); -HDF5API herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, +__DLL__ herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn, const hssize_t **coord); -HDF5API H5S_class_t H5Sget_simple_extent_type (hid_t space_id); -HDF5API herr_t H5Sset_extent_none (hid_t space_id); -HDF5API herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id); -HDF5API herr_t H5Sselect_all (hid_t spaceid); -HDF5API herr_t H5Sselect_none (hid_t spaceid); -HDF5API herr_t H5Soffset_simple (hid_t space_id, const hssize_t *offset); -HDF5API htri_t H5Sselect_valid (hid_t spaceid); +__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); #ifdef __cplusplus } diff --git a/src/H5TBprivate.h b/src/H5TBprivate.h index 2ed46d9192..fbdf9792d8 100644 --- a/src/H5TBprivate.h +++ b/src/H5TBprivate.h @@ -17,10 +17,10 @@ #define _H5TBprivate_H /* Functions defined in H5TB.c */ -hid_t H5TB_get_buf(hsize_t size, hbool_t resize, void **ptr); -void *H5TB_buf_ptr(hid_t tbid); -herr_t H5TB_resize_buf(hid_t tbid, hsize_t size); -herr_t H5TB_garbage_coll(void); -herr_t H5TB_release_buf(hid_t tbid); +__DLL__ hid_t H5TB_get_buf(hsize_t size, hbool_t resize, void **ptr); +__DLL__ void *H5TB_buf_ptr(hid_t tbid); +__DLL__ herr_t H5TB_resize_buf(hid_t tbid, hsize_t size); +__DLL__ herr_t H5TB_garbage_coll(void); +__DLL__ herr_t H5TB_release_buf(hid_t tbid); #endif diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 462da571fa..270c47a641 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -133,7 +133,7 @@ typedef enum H5T_sdir_t { } H5T_sdir_t; /* The overflow handler */ -HDF5GLOBAL H5T_overflow_t H5T_overflow_g; +__DLLVAR__ H5T_overflow_t H5T_overflow_g; /* * Alignment information for native types. A value of N indicates that the @@ -141,238 +141,238 @@ HDF5GLOBAL H5T_overflow_t H5T_overflow_g; * N=1 no alignment is required; N=0 implies that alignment constraints were * not calculated. */ -HDF5GLOBAL size_t H5T_NATIVE_SCHAR_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_UCHAR_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_SHORT_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_USHORT_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_INT_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_UINT_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_LONG_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_ULONG_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_LLONG_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_ULLONG_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_FLOAT_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_DOUBLE_ALIGN_g; -HDF5GLOBAL size_t H5T_NATIVE_LDOUBLE_ALIGN_g; +__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; /* Conversion functions */ -herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); -herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); -herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void __unused__ *bkg); -herr_t H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); -herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); -herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); -herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *buf, void *bkg); -herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +__DLL__ herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, void *_buf, void *bkg); /* Bit twiddling functions */ -HDF5API void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, +__DLL__ void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset, size_t size); -HDF5API void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, +__DLL__ void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, hbool_t value); -HDF5API hsize_t H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size); -void H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val); -HDF5API ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size, +__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, hsize_t val); +__DLL__ ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, hbool_t value); -htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size); +__DLL__ htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size); #endif diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 6056a43b4b..460f0dbb3e 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -61,36 +61,36 @@ typedef struct H5T_path_t { #define H5T_IS_NOOP(P) ((P)->is_hard && 0==H5T_cmp((P)->src, (P)->dst)) /* Private functions */ -herr_t H5T_native_open(void); -herr_t H5T_init(void); -htri_t H5T_isa(H5G_entry_t *ent); -H5T_t *H5T_open(H5G_entry_t *loc, const char *name); -H5T_t *H5T_create(H5T_class_t type, size_t size); -H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); -herr_t H5T_commit(H5G_entry_t *loc, const char *name, H5T_t *type); -herr_t H5T_lock(H5T_t *dt, hbool_t immutable); -herr_t H5T_close(H5T_t *dt); -size_t H5T_get_size(const H5T_t *dt); -intn H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); -htri_t H5T_is_atomic(const H5T_t *dt); -herr_t H5T_struct_insert(H5T_t *parent, const char *name, size_t offset, +__DLL__ herr_t H5T_native_open(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_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__ size_t H5T_get_size(const H5T_t *dt); +__DLL__ intn H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); +__DLL__ htri_t H5T_is_atomic(const H5T_t *dt); +__DLL__ herr_t H5T_struct_insert(H5T_t *parent, const char *name, size_t offset, intn ndims, const size_t *dim, const intn *perm, const H5T_t *member); -herr_t H5T_enum_insert(H5T_t *dt, const char *name, void *value); -herr_t H5T_sort_value(H5T_t *dt); -herr_t H5T_pack(H5T_t *dt); -herr_t H5T_debug(H5T_t *dt, FILE * stream); -H5G_entry_t *H5T_entof(H5T_t *dt); -H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, +__DLL__ herr_t H5T_enum_insert(H5T_t *dt, const char *name, void *value); +__DLL__ herr_t H5T_sort_value(H5T_t *dt); +__DLL__ herr_t H5T_pack(H5T_t *dt); +__DLL__ herr_t H5T_debug(H5T_t *dt, FILE * stream); +__DLL__ H5G_entry_t *H5T_entof(H5T_t *dt); +__DLL__ H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func); -herr_t H5T_sort_vaue(H5T_t *dt); -herr_t H5T_sort_name(H5T_t *dt); -herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, +__DLL__ herr_t H5T_sort_vaue(H5T_t *dt); +__DLL__ herr_t H5T_sort_name(H5T_t *dt); +__DLL__ herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *bkg); -herr_t H5T_set_size(H5T_t *dt, size_t size); -herr_t H5T_set_precision(H5T_t *dt, size_t prec); -herr_t H5T_set_offset(H5T_t *dt, size_t offset); -char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size); -herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/); +__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*/, size_t size); +__DLL__ herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/); #endif diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index e6a84c46e2..c918765400 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -183,10 +183,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) -HDF5GLOBAL hid_t H5T_IEEE_F32BE_g; -HDF5GLOBAL hid_t H5T_IEEE_F32LE_g; -HDF5GLOBAL hid_t H5T_IEEE_F64BE_g; -HDF5GLOBAL hid_t 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; /* * These are "standard" types. For instance, signed (2's complement) and @@ -218,32 +218,32 @@ HDF5GLOBAL 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) -HDF5GLOBAL hid_t H5T_STD_I8BE_g; -HDF5GLOBAL hid_t H5T_STD_I8LE_g; -HDF5GLOBAL hid_t H5T_STD_I16BE_g; -HDF5GLOBAL hid_t H5T_STD_I16LE_g; -HDF5GLOBAL hid_t H5T_STD_I32BE_g; -HDF5GLOBAL hid_t H5T_STD_I32LE_g; -HDF5GLOBAL hid_t H5T_STD_I64BE_g; -HDF5GLOBAL hid_t H5T_STD_I64LE_g; -HDF5GLOBAL hid_t H5T_STD_U8BE_g; -HDF5GLOBAL hid_t H5T_STD_U8LE_g; -HDF5GLOBAL hid_t H5T_STD_U16BE_g; -HDF5GLOBAL hid_t H5T_STD_U16LE_g; -HDF5GLOBAL hid_t H5T_STD_U32BE_g; -HDF5GLOBAL hid_t H5T_STD_U32LE_g; -HDF5GLOBAL hid_t H5T_STD_U64BE_g; -HDF5GLOBAL hid_t H5T_STD_U64LE_g; -HDF5GLOBAL hid_t H5T_STD_B8BE_g; -HDF5GLOBAL hid_t H5T_STD_B8LE_g; -HDF5GLOBAL hid_t H5T_STD_B16BE_g; -HDF5GLOBAL hid_t H5T_STD_B16LE_g; -HDF5GLOBAL hid_t H5T_STD_B32BE_g; -HDF5GLOBAL hid_t H5T_STD_B32LE_g; -HDF5GLOBAL hid_t H5T_STD_B64BE_g; -HDF5GLOBAL hid_t H5T_STD_B64LE_g; -HDF5GLOBAL hid_t H5T_STD_REF_OBJ_g; -HDF5GLOBAL hid_t 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; /* * Types which are particular to Unix. @@ -252,23 +252,23 @@ HDF5GLOBAL 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) -HDF5GLOBAL hid_t H5T_UNIX_D32BE_g; -HDF5GLOBAL hid_t H5T_UNIX_D32LE_g; -HDF5GLOBAL hid_t H5T_UNIX_D64BE_g; -HDF5GLOBAL hid_t 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; /* * 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) -HDF5GLOBAL hid_t H5T_C_S1_g; +__DLLVAR__ hid_t H5T_C_S1_g; /* * Types particular to Fortran. */ #define H5T_FORTRAN_S1 (H5open(), H5T_FORTRAN_S1_g) -HDF5GLOBAL hid_t H5T_FORTRAN_S1_g; +__DLLVAR__ hid_t H5T_FORTRAN_S1_g; /* * These types are for Intel CPU's. They are little endian with IEEE @@ -359,107 +359,107 @@ HDF5GLOBAL 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) -HDF5GLOBAL hid_t H5T_NATIVE_SCHAR_g; -HDF5GLOBAL hid_t H5T_NATIVE_UCHAR_g; -HDF5GLOBAL hid_t H5T_NATIVE_SHORT_g; -HDF5GLOBAL hid_t H5T_NATIVE_USHORT_g; -HDF5GLOBAL hid_t H5T_NATIVE_INT_g; -HDF5GLOBAL hid_t H5T_NATIVE_UINT_g; -HDF5GLOBAL hid_t H5T_NATIVE_LONG_g; -HDF5GLOBAL hid_t H5T_NATIVE_ULONG_g; -HDF5GLOBAL hid_t H5T_NATIVE_LLONG_g; -HDF5GLOBAL hid_t H5T_NATIVE_ULLONG_g; -HDF5GLOBAL hid_t H5T_NATIVE_FLOAT_g; -HDF5GLOBAL hid_t H5T_NATIVE_DOUBLE_g; -HDF5GLOBAL hid_t H5T_NATIVE_LDOUBLE_g; -HDF5GLOBAL hid_t H5T_NATIVE_B8_g; -HDF5GLOBAL hid_t H5T_NATIVE_B16_g; -HDF5GLOBAL hid_t H5T_NATIVE_B32_g; -HDF5GLOBAL hid_t H5T_NATIVE_B64_g; -HDF5GLOBAL hid_t H5T_NATIVE_OPAQUE_g; -HDF5GLOBAL hid_t H5T_NATIVE_HSIZE_g; -HDF5GLOBAL hid_t H5T_NATIVE_HSSIZE_g; -HDF5GLOBAL hid_t H5T_NATIVE_HERR_g; -HDF5GLOBAL hid_t 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_HSIZE_g; +__DLLVAR__ hid_t H5T_NATIVE_HSSIZE_g; +__DLLVAR__ hid_t H5T_NATIVE_HERR_g; +__DLLVAR__ hid_t H5T_NATIVE_HBOOL_g; /* Operations defined on all data types */ -HDF5API hid_t H5Topen (hid_t loc_id, const char *name); -HDF5API hid_t H5Tcreate (H5T_class_t type, size_t size); -HDF5API hid_t H5Tcopy (hid_t type_id); -HDF5API herr_t H5Tclose (hid_t type_id); -HDF5API htri_t H5Tequal (hid_t type1_id, hid_t type2_id); -HDF5API herr_t H5Tlock (hid_t type_id); -HDF5API herr_t H5Tcommit (hid_t loc_id, const char *name, hid_t type_id); -HDF5API htri_t H5Tcommitted (hid_t type_id); +__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); /* Operations defined on compound data types */ -HDF5API herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset, +__DLL__ herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset, hid_t member_id); -HDF5API herr_t H5Tinsert_array (hid_t parent_id, const char *name, +__DLL__ herr_t H5Tinsert_array (hid_t parent_id, const char *name, size_t offset, int ndims, const size_t dim[], const int *perm, hid_t member_id); -HDF5API herr_t H5Tpack (hid_t type_id); +__DLL__ herr_t H5Tpack (hid_t type_id); /* Operations defined on enumeration data types */ -HDF5API hid_t H5Tenum_create(hid_t base_id); -HDF5API herr_t H5Tenum_insert(hid_t type, const char *name, void *value); -HDF5API hid_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, +__DLL__ hid_t H5Tenum_create(hid_t base_id); +__DLL__ herr_t H5Tenum_insert(hid_t type, const char *name, void *value); +__DLL__ hid_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size); -HDF5API hid_t H5Tenum_valueof(hid_t type, const char *name, +__DLL__ hid_t H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/); /* Querying property values */ -HDF5API hid_t H5Tget_super(hid_t type); -HDF5API H5T_class_t H5Tget_class(hid_t type_id); -HDF5API size_t H5Tget_size(hid_t type_id); -HDF5API H5T_order_t H5Tget_order(hid_t type_id); -HDF5API size_t H5Tget_precision(hid_t type_id); -HDF5API size_t H5Tget_offset(hid_t type_id); -HDF5API herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, +__DLL__ hid_t H5Tget_super(hid_t type); +__DLL__ H5T_class_t H5Tget_class(hid_t type_id); +__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__ size_t H5Tget_offset(hid_t type_id); +__DLL__ herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/); -HDF5API H5T_sign_t H5Tget_sign(hid_t type_id); -HDF5API herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/, +__DLL__ H5T_sign_t H5Tget_sign(hid_t type_id); +__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*/); -HDF5API size_t H5Tget_ebias(hid_t type_id); -HDF5API H5T_norm_t H5Tget_norm(hid_t type_id); -HDF5API H5T_pad_t H5Tget_inpad(hid_t type_id); -HDF5API H5T_str_t H5Tget_strpad(hid_t type_id); -HDF5API int H5Tget_nmembers(hid_t type_id); -HDF5API char *H5Tget_member_name(hid_t type_id, int membno); -HDF5API size_t H5Tget_member_offset(hid_t type_id, int membno); -HDF5API int H5Tget_member_dims(hid_t type_id, int membno, size_t dims[]/*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__ size_t H5Tget_member_offset(hid_t type_id, int membno); +__DLL__ int H5Tget_member_dims(hid_t type_id, int membno, size_t dims[]/*out*/, int perm[]/*out*/); -HDF5API hid_t H5Tget_member_type(hid_t type_id, int membno); -HDF5API herr_t H5Tget_member_value(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, void *value/*out*/); -HDF5API H5T_cset_t H5Tget_cset(hid_t type_id); +__DLL__ H5T_cset_t H5Tget_cset(hid_t type_id); /* Setting property values */ -HDF5API herr_t H5Tset_size (hid_t type_id, size_t size); -HDF5API herr_t H5Tset_order (hid_t type_id, H5T_order_t order); -HDF5API herr_t H5Tset_precision (hid_t type_id, size_t prec); -HDF5API herr_t H5Tset_offset (hid_t type_id, size_t offset); -HDF5API herr_t H5Tset_pad (hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb); -HDF5API herr_t H5Tset_sign (hid_t type_id, H5T_sign_t sign); -HDF5API herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos, +__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, size_t esize, size_t mpos, size_t msize); -HDF5API herr_t H5Tset_ebias (hid_t type_id, size_t ebias); -HDF5API herr_t H5Tset_norm (hid_t type_id, H5T_norm_t norm); -HDF5API herr_t H5Tset_inpad (hid_t type_id, H5T_pad_t pad); -HDF5API herr_t H5Tset_cset (hid_t type_id, H5T_cset_t cset); -HDF5API herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad); +__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); /* Type conversion database */ -HDF5API herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, +__DLL__ herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -HDF5API herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id, +__DLL__ herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -HDF5API H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata); -HDF5API herr_t H5Tconvert (hid_t src_id, hid_t dst_id, size_t nelmts, +__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, size_t nelmts, void *buf, void *background); -HDF5API H5T_overflow_t H5Tget_overflow(void); -HDF5API herr_t H5Tset_overflow(H5T_overflow_t func); +__DLL__ H5T_overflow_t H5Tget_overflow(void); +__DLL__ herr_t H5Tset_overflow(H5T_overflow_t func); #ifdef __cplusplus } diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index 31178ddd59..1cd0d09735 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -34,37 +34,37 @@ /* A null pointer is equivalent to a zero vector */ #define H5V_ZERO NULL -hsize_t H5V_hyper_stride(intn n, const hsize_t *size, +__DLL__ hsize_t H5V_hyper_stride(intn n, const hsize_t *size, const hsize_t *total_size, const hssize_t *offset, hssize_t *stride); -htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1, +__DLL__ htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, const hsize_t *size1, +__DLL__ htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -HDF5API herr_t H5V_hyper_fill(intn n, const hsize_t *_size, +__DLL__ herr_t H5V_hyper_fill(intn n, const hsize_t *_size, const hsize_t *total_size, const hssize_t *offset, void *_dst, uintn fill_value); -HDF5API herr_t H5V_hyper_copy(intn n, const hsize_t *size, +__DLL__ herr_t H5V_hyper_copy(intn 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); -herr_t H5V_stride_fill(intn n, hsize_t elmt_size, const hsize_t *size, +__DLL__ herr_t H5V_stride_fill(intn n, hsize_t elmt_size, const hsize_t *size, const hssize_t *stride, void *_dst, uintn fill_value); -HDF5API herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size, +__DLL__ herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size, const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride, const void *_src); -herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n, +__DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n, const hsize_t *dst_size, const hssize_t *dst_stride, void *_dst, intn src_n, const hsize_t *src_size, const hssize_t *src_stride, const void *_src); -herr_t H5V_stride_optimize1(intn *np, hsize_t *elmt_size, hsize_t *size, +__DLL__ herr_t H5V_stride_optimize1(intn *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1); -herr_t H5V_stride_optimize2(intn *np, hsize_t *elmt_size, hsize_t *size, +__DLL__ herr_t H5V_stride_optimize2(intn *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1, hssize_t *stride2); -herr_t H5V_array_fill(void *_dst, const void *src, size_t size, size_t count); +__DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size, size_t count); /*------------------------------------------------------------------------- diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index 8cf88f6863..c5ff1d5834 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -30,13 +30,13 @@ typedef struct H5Z_class_t { struct H5O_pline_t; /*forward decl*/ -herr_t H5Z_register(H5Z_filter_t id, const char *comment, H5Z_func_t filter); -herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, uintn flags, +__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, uintn flags, size_t cd_nelmts, const unsigned int cd_values[]); -herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, uintn flags, +__DLL__ herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, uintn flags, uintn *filter_mask/*in,out*/, size_t *nbytes/*in,out*/, size_t *buf_size/*in,out*/, void **buf/*in,out*/); -H5Z_class_t *H5Z_find(H5Z_filter_t id); +__DLL__ H5Z_class_t *H5Z_find(H5Z_filter_t id); #endif diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 89536d4325..ea9e62f9d0 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 -HDF5API herr_t H5Zregister(H5Z_filter_t id, const char *comment, +__DLL__ herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t filter); #ifdef __cplusplus