From bb776bacbf1dd3e80c7ade0f8afc91c2544977b5 Mon Sep 17 00:00:00 2001 From: Patrick Lu Date: Thu, 21 Jan 1999 11:49:37 -0500 Subject: [svn-r1031] added necessary info to export info to the dll --- src/H5Gpublic.h | 22 +++--- src/H5MMprivate.h | 2 +- src/H5Oprivate.h | 18 ++--- src/H5Ppublic.h | 110 +++++++++++++-------------- src/H5RApublic.h | 10 +-- src/H5Rpublic.h | 6 +- src/H5Spublic.h | 40 +++++----- src/H5Tpkg.h | 36 ++++----- src/H5Tpublic.h | 222 +++++++++++++++++++++++++++--------------------------- src/H5Vprivate.h | 8 +- src/H5Zpublic.h | 2 +- src/H5private.h | 16 ++-- src/H5public.h | 12 +-- 13 files changed, 252 insertions(+), 252 deletions(-) diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 32fc1d4..ce73c3b 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -70,21 +70,21 @@ typedef struct H5G_stat_t { typedef herr_t (*H5G_iterate_t)(hid_t group, const char *group_name, void *op_data); -hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint); -hid_t H5Gopen (hid_t loc_id, const char *name); -herr_t H5Gclose (hid_t group_id); -herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, +HDF5API hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint); +HDF5API hid_t H5Gopen (hid_t loc_id, const char *name); +HDF5API herr_t H5Gclose (hid_t group_id); +HDF5API herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, void *op_data); -herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst); -herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name, +HDF5API herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst); +HDF5API herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name, const char *new_name); -herr_t H5Gunlink (hid_t loc_id, const char *name); -herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link, +HDF5API herr_t H5Gunlink (hid_t loc_id, const char *name); +HDF5API herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *statbuf/*out*/); -herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size, +HDF5API herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size, char *buf/*out*/); -herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment); -int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf); +HDF5API herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment); +HDF5API int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf); #ifdef __cplusplus } diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h index dc7b48a..68c93f7 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -31,6 +31,6 @@ void *H5MM_realloc (void *mem, size_t size); char *H5MM_xstrdup (const char *s); char *H5MM_strdup (const char *s); -void *H5MM_xfree (void *mem); +HDF5API void *H5MM_xfree (void *mem); #endif diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 3bccafc..76a7fdb 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -18,7 +18,7 @@ #define _H5Oprivate_H #include - +#include /* Private headers needed by this file */ #include #include @@ -172,7 +172,7 @@ typedef struct H5O_efl_t { */ #define H5O_LAYOUT_ID 0x0008 #define H5O_LAYOUT_NDIMS (H5S_MAX_RANK+1) -extern const H5O_class_t H5O_LAYOUT[1]; +HDF5GLOBAL const H5O_class_t H5O_LAYOUT[1]; typedef struct H5O_layout_t { int type; /*type of layout, H5D_layout_t */ @@ -257,7 +257,7 @@ typedef struct H5O_cont_t { * Symbol table message. */ #define H5O_STAB_ID 0x0011 -extern const H5O_class_t H5O_STAB[1]; +HDF5GLOBAL const H5O_class_t H5O_STAB[1]; void *H5O_stab_fast (const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg); @@ -268,24 +268,24 @@ typedef struct H5O_stab_t { } H5O_stab_t; /* General message operators */ -herr_t H5O_create (H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); +HDF5API herr_t H5O_create (H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); herr_t H5O_open (H5G_entry_t *ent); -herr_t H5O_close (H5G_entry_t *ent); +HDF5API herr_t H5O_close (H5G_entry_t *ent); intn H5O_link (H5G_entry_t *ent, intn adjust); intn H5O_count (H5G_entry_t *ent, const H5O_class_t *type); htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence); -void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type, intn sequence, +HDF5API void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type, intn sequence, void *mesg); -intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type, intn overwrite, +HDF5API intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type, intn overwrite, uintn flags, const void *mesg); herr_t H5O_touch(H5G_entry_t *ent, hbool_t force); -herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type, intn sequence); +HDF5API herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type, intn sequence); herr_t H5O_reset (const H5O_class_t *type, void *native); void *H5O_free (const H5O_class_t *type, void *mesg); void *H5O_copy (const H5O_class_t *type, const void *mesg, void *dst); herr_t H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg, H5HG_t *hobj/*out*/); -herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, +HDF5API herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, intn fwidth); /* EFL operators */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index c2da3dd..bbbd9ab 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -44,88 +44,88 @@ extern "C" { #endif /* Public functions */ -hid_t H5Pcreate (H5P_class_t type); -herr_t H5Pclose (hid_t plist_id); -hid_t H5Pcopy (hid_t plist_id); -H5P_class_t H5Pget_class (hid_t plist_id); -herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, +HDF5API hid_t H5Pcreate (H5P_class_t type); +HDF5API herr_t H5Pclose (hid_t plist_id); +HDF5API hid_t H5Pcopy (hid_t plist_id); +HDF5API H5P_class_t H5Pget_class (hid_t plist_id); +HDF5API herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, int *stab/*out*/, int *shhdr/*out*/); -herr_t H5Pset_userblock (hid_t plist_id, hsize_t size); -herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size); -herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold, hsize_t alignment); -herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/, +HDF5API herr_t H5Pset_userblock (hid_t plist_id, hsize_t size); +HDF5API herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size); +HDF5API herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold, hsize_t alignment); +HDF5API herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/, hsize_t *alignment/*out*/); -herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr, size_t sizeof_size); -herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/, +HDF5API herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr, size_t sizeof_size); +HDF5API herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/, size_t *sizeof_size/*out*/); -herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk); -herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/); -herr_t H5Pset_istore_k (hid_t plist_id, int ik); -herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/); -herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout); -H5D_layout_t H5Pget_layout (hid_t plist_id); -herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]); -int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/); -herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset, +HDF5API herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk); +HDF5API herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/); +HDF5API herr_t H5Pset_istore_k (hid_t plist_id, int ik); +HDF5API herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/); +HDF5API herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout); +HDF5API H5D_layout_t H5Pget_layout (hid_t plist_id); +HDF5API herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]); +HDF5API int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/); +HDF5API herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset, hsize_t size); -int H5Pget_external_count (hid_t plist_id); -herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size, +HDF5API int H5Pget_external_count (hid_t plist_id); +HDF5API herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size, char *name/*out*/, off_t *offset/*out*/, hsize_t *size/*out*/); -H5F_driver_t H5Pget_driver (hid_t plist_id); -herr_t H5Pset_stdio (hid_t plist_id); -herr_t H5Pget_stdio (hid_t plist_id); -herr_t H5Pset_sec2 (hid_t plist_id); -herr_t H5Pget_sec2 (hid_t plist_id); -herr_t H5Pset_core (hid_t plist_id, size_t increment); -herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/); -herr_t H5Pset_split (hid_t plist_id, const char *meta_ext, hid_t meta_plist_id, +HDF5API H5F_driver_t H5Pget_driver (hid_t plist_id); +HDF5API herr_t H5Pset_stdio (hid_t plist_id); +HDF5API herr_t H5Pget_stdio (hid_t plist_id); +HDF5API herr_t H5Pset_sec2 (hid_t plist_id); +HDF5API herr_t H5Pget_sec2 (hid_t plist_id); +HDF5API herr_t H5Pset_core (hid_t plist_id, size_t increment); +HDF5API herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/); +HDF5API herr_t H5Pset_split (hid_t plist_id, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext, hid_t raw_plist_id); -herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size, +HDF5API herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size, char *meta_ext/*out*/, hid_t *meta_properties/*out*/, size_t raw_ext_size, char *raw_ext/*out*/, hid_t *raw_properties/*out*/); -herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size, hid_t memb_plist_id); -herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/, +HDF5API herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size, hid_t memb_plist_id); +HDF5API herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/, hid_t *memb_plist_id/*out*/); -herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv, void *bkg); -size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); -herr_t H5Pset_preserve (hid_t plist_id, hbool_t status); -int H5Pget_preserve (hid_t plist_id); -herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter, unsigned int flags, +HDF5API herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv, void *bkg); +HDF5API size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); +HDF5API herr_t H5Pset_preserve (hid_t plist_id, hbool_t status); +HDF5API int H5Pget_preserve (hid_t plist_id); +HDF5API herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts, const unsigned int c_values[]); -int H5Pget_nfilters(hid_t plist_id); -H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter, +HDF5API int H5Pget_nfilters(hid_t plist_id); +HDF5API 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[]); -herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression); -herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, +HDF5API herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression); +HDF5API herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0); -herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/, +HDF5API herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/, int *rdcc_nelmts/*out*/, size_t *rdcc_nbytes/*out*/, double *rdcc_w0); -herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit); -herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, unsigned *limit); -herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, +HDF5API herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit); +HDF5API herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, unsigned *limit); +HDF5API herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right); -herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, +HDF5API herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/, double *right/*out*/); -herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value); -herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/); +HDF5API herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value); +HDF5API herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/); #ifdef HAVE_PARALLEL -herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info); -herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/, +HDF5API herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info); +HDF5API herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/); -herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode); -herr_t H5Pget_xfer (hid_t plist_id, H5D_transfer_t *data_xfer_mode/*out*/); +HDF5API herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode); +HDF5API herr_t H5Pget_xfer (hid_t plist_id, H5D_transfer_t *data_xfer_mode/*out*/); #endif -herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); -herr_t H5Pget_gc_reference(hid_t fapl_id, unsigned *gc_ref/*out*/); +HDF5API herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); +HDF5API herr_t H5Pget_gc_reference(hid_t fapl_id, unsigned *gc_ref/*out*/); #ifdef __cplusplus } diff --git a/src/H5RApublic.h b/src/H5RApublic.h index e2daaa4..c246743 100644 --- a/src/H5RApublic.h +++ b/src/H5RApublic.h @@ -14,12 +14,12 @@ extern "C" { #endif -hid_t H5RAcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t plist_id); -hid_t H5RAopen(hid_t loc_id, const char *name); -herr_t H5RAclose(hid_t array_id); -herr_t H5RAwrite(hid_t array_id, hssize_t start_row, hsize_t nrows, +HDF5API 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, hid_t type_id, hsize_t size[], void *buf[]); -herr_t H5RAread(hid_t array_id, hssize_t start_row, hsize_t nrows, +HDF5API 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 6926d86..8a78e85 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -66,10 +66,10 @@ extern "C" { #endif /* Functions in H5R.c */ -herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, +HDF5API herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id); -hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); -hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); +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); #ifdef __cplusplus } diff --git a/src/H5Spublic.h b/src/H5Spublic.h index fee1d00..ed25015 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -52,32 +52,32 @@ extern "C" { #endif /* Functions in H5S.c */ -hid_t H5Screate(H5S_class_t type); -hid_t H5Screate_simple (int rank, const hsize_t dims[], +HDF5API hid_t H5Screate(H5S_class_t type); +HDF5API hid_t H5Screate_simple (int rank, const hsize_t dims[], const hsize_t maxdims[]); -herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[], +HDF5API herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]); -hid_t H5Scopy (hid_t space_id); -herr_t H5Sclose (hid_t space_id); -hsize_t H5Sget_simple_extent_npoints (hid_t space_id); -int H5Sget_simple_extent_ndims (hid_t space_id); -int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], +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[], hsize_t maxdims[]); -htri_t H5Sis_simple (hid_t space_id); -herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims); -hssize_t H5Sget_select_npoints (hid_t spaceid); -herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op, +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, const hssize_t start[], const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]); -herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn, +HDF5API herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn, const hssize_t **coord); -H5S_class_t H5Sget_simple_extent_type (hid_t space_id); -herr_t H5Sset_extent_none (hid_t space_id); -herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id); -herr_t H5Sselect_all (hid_t spaceid); -herr_t H5Sselect_none (hid_t spaceid); -herr_t H5Soffset_simple (hid_t space_id, const hssize_t *offset); -htri_t H5Sselect_valid (hid_t spaceid); +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); #ifdef __cplusplus } diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 2e8bf1f..071a9e4 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -133,7 +133,7 @@ typedef enum H5T_sdir_t { } H5T_sdir_t; /* The overflow handler */ -extern H5T_overflow_t H5T_overflow_g; +HDF5GLOBAL H5T_overflow_t H5T_overflow_g; /* * Alignment information for native types. A value of N indicates that the @@ -141,19 +141,19 @@ extern H5T_overflow_t H5T_overflow_g; * N=1 no alignment is required; N=0 implies that alignment constraints were * not calculated. */ -extern size_t H5T_NATIVE_SCHAR_ALIGN_g; -extern size_t H5T_NATIVE_UCHAR_ALIGN_g; -extern size_t H5T_NATIVE_SHORT_ALIGN_g; -extern size_t H5T_NATIVE_USHORT_ALIGN_g; -extern size_t H5T_NATIVE_INT_ALIGN_g; -extern size_t H5T_NATIVE_UINT_ALIGN_g; -extern size_t H5T_NATIVE_LONG_ALIGN_g; -extern size_t H5T_NATIVE_ULONG_ALIGN_g; -extern size_t H5T_NATIVE_LLONG_ALIGN_g; -extern size_t H5T_NATIVE_ULLONG_ALIGN_g; -extern size_t H5T_NATIVE_FLOAT_ALIGN_g; -extern size_t H5T_NATIVE_DOUBLE_ALIGN_g; -extern size_t H5T_NATIVE_LDOUBLE_ALIGN_g; +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; /* Conversion functions */ herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, @@ -365,12 +365,12 @@ 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 */ -void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, +HDF5API void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset, size_t size); -void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, hbool_t value); -hsize_t H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size); +HDF5API 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); -ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size, +HDF5API 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); diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index cab2531..c6ebf1e 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) -extern hid_t H5T_IEEE_F32BE_g; -extern hid_t H5T_IEEE_F32LE_g; -extern hid_t H5T_IEEE_F64BE_g; -extern hid_t 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; /* * These are "standard" types. For instance, signed (2's complement) and @@ -218,32 +218,32 @@ extern 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) -extern hid_t H5T_STD_I8BE_g; -extern hid_t H5T_STD_I8LE_g; -extern hid_t H5T_STD_I16BE_g; -extern hid_t H5T_STD_I16LE_g; -extern hid_t H5T_STD_I32BE_g; -extern hid_t H5T_STD_I32LE_g; -extern hid_t H5T_STD_I64BE_g; -extern hid_t H5T_STD_I64LE_g; -extern hid_t H5T_STD_U8BE_g; -extern hid_t H5T_STD_U8LE_g; -extern hid_t H5T_STD_U16BE_g; -extern hid_t H5T_STD_U16LE_g; -extern hid_t H5T_STD_U32BE_g; -extern hid_t H5T_STD_U32LE_g; -extern hid_t H5T_STD_U64BE_g; -extern hid_t H5T_STD_U64LE_g; -extern hid_t H5T_STD_B8BE_g; -extern hid_t H5T_STD_B8LE_g; -extern hid_t H5T_STD_B16BE_g; -extern hid_t H5T_STD_B16LE_g; -extern hid_t H5T_STD_B32BE_g; -extern hid_t H5T_STD_B32LE_g; -extern hid_t H5T_STD_B64BE_g; -extern hid_t H5T_STD_B64LE_g; -extern hid_t H5T_STD_REF_OBJ_g; -extern hid_t 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; /* * Types which are particular to Unix. @@ -252,23 +252,23 @@ extern 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) -extern hid_t H5T_UNIX_D32BE_g; -extern hid_t H5T_UNIX_D32LE_g; -extern hid_t H5T_UNIX_D64BE_g; -extern hid_t 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; /* * 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) -extern hid_t H5T_C_S1_g; +HDF5GLOBAL hid_t H5T_C_S1_g; /* * Types particular to Fortran. */ #define H5T_FORTRAN_S1 (H5open(), H5T_FORTRAN_S1_g) -extern hid_t H5T_FORTRAN_S1_g; +HDF5GLOBAL hid_t H5T_FORTRAN_S1_g; /* * These types are for Intel CPU's. They are little endian with IEEE @@ -359,104 +359,104 @@ extern 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) -extern hid_t H5T_NATIVE_SCHAR_g; -extern hid_t H5T_NATIVE_UCHAR_g; -extern hid_t H5T_NATIVE_SHORT_g; -extern hid_t H5T_NATIVE_USHORT_g; -extern hid_t H5T_NATIVE_INT_g; -extern hid_t H5T_NATIVE_UINT_g; -extern hid_t H5T_NATIVE_LONG_g; -extern hid_t H5T_NATIVE_ULONG_g; -extern hid_t H5T_NATIVE_LLONG_g; -extern hid_t H5T_NATIVE_ULLONG_g; -extern hid_t H5T_NATIVE_FLOAT_g; -extern hid_t H5T_NATIVE_DOUBLE_g; -extern hid_t H5T_NATIVE_LDOUBLE_g; -extern hid_t H5T_NATIVE_B8_g; -extern hid_t H5T_NATIVE_B16_g; -extern hid_t H5T_NATIVE_B32_g; -extern hid_t H5T_NATIVE_B64_g; -extern hid_t H5T_NATIVE_OPAQUE_g; -extern hid_t H5T_NATIVE_HSIZE_g; -extern hid_t H5T_NATIVE_HSSIZE_g; -extern hid_t H5T_NATIVE_HERR_g; -extern hid_t 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; /* Operations defined on all data types */ -hid_t H5Topen (hid_t loc_id, const char *name); -hid_t H5Tcreate (H5T_class_t type, size_t size); -hid_t H5Tcopy (hid_t type_id); -herr_t H5Tclose (hid_t type_id); -htri_t H5Tequal (hid_t type1_id, hid_t type2_id); -herr_t H5Tlock (hid_t type_id); -herr_t H5Tcommit (hid_t loc_id, const char *name, hid_t type_id); -htri_t H5Tcommitted (hid_t type_id); +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); /* Operations defined on compound data types */ -herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset, +HDF5API herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset, hid_t member_id); -herr_t H5Tinsert_array (hid_t parent_id, const char *name, size_t offset, +HDF5API 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); -herr_t H5Tpack (hid_t type_id); +HDF5API herr_t H5Tpack (hid_t type_id); /* Operations defined on enumeration data types */ -hid_t H5Tenum_create(hid_t base_id); -herr_t H5Tenum_insert(hid_t type, const char *name, void *value); -hid_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size); -hid_t H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/); +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*/, size_t size); +HDF5API hid_t H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/); /* Querying property values */ -hid_t H5Tget_super(hid_t type); -H5T_class_t H5Tget_class(hid_t type_id); -size_t H5Tget_size(hid_t type_id); -H5T_order_t H5Tget_order(hid_t type_id); -size_t H5Tget_precision(hid_t type_id); -size_t H5Tget_offset(hid_t type_id); -herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, +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*/, H5T_pad_t *msb/*out*/); -H5T_sign_t H5Tget_sign(hid_t type_id); -herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/, +HDF5API H5T_sign_t H5Tget_sign(hid_t type_id); +HDF5API 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*/); -size_t H5Tget_ebias(hid_t type_id); -H5T_norm_t H5Tget_norm(hid_t type_id); -H5T_pad_t H5Tget_inpad(hid_t type_id); -H5T_str_t H5Tget_strpad(hid_t type_id); -int H5Tget_nmembers(hid_t type_id); -char *H5Tget_member_name(hid_t type_id, int membno); -size_t H5Tget_member_offset(hid_t type_id, int membno); -int H5Tget_member_dims(hid_t type_id, int membno, size_t dims[]/*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*/, int perm[]/*out*/); -hid_t H5Tget_member_type(hid_t type_id, int membno); -herr_t H5Tget_member_value(hid_t type_id, int membno, void *value/*out*/); -H5T_cset_t H5Tget_cset(hid_t type_id); +HDF5API hid_t H5Tget_member_type(hid_t type_id, int membno); +HDF5API herr_t H5Tget_member_value(hid_t type_id, int membno, void *value/*out*/); +HDF5API H5T_cset_t H5Tget_cset(hid_t type_id); /* Setting property values */ -herr_t H5Tset_size (hid_t type_id, size_t size); -herr_t H5Tset_order (hid_t type_id, H5T_order_t order); -herr_t H5Tset_precision (hid_t type_id, size_t prec); -herr_t H5Tset_offset (hid_t type_id, size_t offset); -herr_t H5Tset_pad (hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb); -herr_t H5Tset_sign (hid_t type_id, H5T_sign_t sign); -herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos, size_t esize, +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, size_t esize, size_t mpos, size_t msize); -herr_t H5Tset_ebias (hid_t type_id, size_t ebias); -herr_t H5Tset_norm (hid_t type_id, H5T_norm_t norm); -herr_t H5Tset_inpad (hid_t type_id, H5T_pad_t pad); -herr_t H5Tset_cset (hid_t type_id, H5T_cset_t cset); -herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad); +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); /* Type conversion database */ -herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, +HDF5API herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id, +HDF5API herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func); -H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata); -herr_t H5Tconvert (hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, +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, void *buf, void *background); -H5T_overflow_t H5Tget_overflow(void); -herr_t H5Tset_overflow(H5T_overflow_t func); +HDF5API H5T_overflow_t H5Tget_overflow(void); +HDF5API herr_t H5Tset_overflow(H5T_overflow_t func); #ifdef __cplusplus } diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index b3d55e9..4e0ae3d 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -9,7 +9,7 @@ #define H5Vprivate_H #include - +#include /* Vector comparison functions like Fortran66 comparison operators */ #define H5V_vector_eq_s(N,V1,V2) (H5V_vector_cmp_s (N, V1, V2)==0) #define H5V_vector_lt_s(N,V1,V2) (H5V_vector_cmp_s (N, V1, V2)<0) @@ -42,16 +42,16 @@ htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1, const hsize_t *size2); htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -herr_t H5V_hyper_fill(intn n, const hsize_t *_size, const hsize_t *total_size, +HDF5API 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); -herr_t H5V_hyper_copy(intn n, const hsize_t *size, +HDF5API 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, const hssize_t *stride, void *_dst, uintn fill_value); -herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size, +HDF5API 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, diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 04b5f3a..deba4dc 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 -herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t filter); +HDF5API herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t filter); #ifdef __cplusplus } diff --git a/src/H5private.h b/src/H5private.h index a0b6329..e44d6f8 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -13,7 +13,7 @@ #ifndef _H5private_H #define _H5private_H #include /* Include Public Definitions */ - +#include /* * Include ANSI-C header files. */ @@ -402,10 +402,10 @@ typedef struct { double etime; /*elapsed wall-clock time */ } H5_timer_t; -void H5_timer_reset (H5_timer_t *timer); -void H5_timer_begin (H5_timer_t *timer); -void H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/); -void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); +HDF5API void H5_timer_reset (H5_timer_t *timer); +HDF5API void H5_timer_begin (H5_timer_t *timer); +HDF5API void H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/); +HDF5API void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); /* * Redefine all the POSIX functions. We should never see a POSIX @@ -478,7 +478,7 @@ 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) -int HDfprintf (FILE *stream, const char *fmt, ...); +HDF5API 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) @@ -623,7 +623,7 @@ int HDfprintf (FILE *stream, const char *fmt, ...); #define HDstrtod(S,R) strtod(S,R) #define HDstrtok(X,Y) strtok(X,Y) #define HDstrtol(S,R,N) strtol(S,R,N) -int64_t HDstrtoll (const char *s, const char **rest, int base); +HDF5API 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) @@ -670,7 +670,7 @@ char *strdup(const char *s); #define HDstrdup(S) strdup(S) #ifndef HAVE_SNPRINTF -int HDsnprintf(char *buf, size_t size, const char *fmt, ...); +HDF5API int HDsnprintf(char *buf, size_t size, const char *fmt, ...); #endif /* diff --git a/src/H5public.h b/src/H5public.h index a6e27d8..71d8651 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -34,7 +34,7 @@ static char RcsId[] = "@(#)$Revision$"; # include # include #endif - +#include /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 1 /* For minor interface/format changes */ @@ -98,11 +98,11 @@ extern "C" { #endif /* Functions in H5.c */ -herr_t H5open (void); -herr_t H5close (void); -herr_t H5dont_atexit (void); -herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, unsigned *relnum); -herr_t H5check_version (unsigned majnum, unsigned minnum, unsigned relnum); +HDF5API herr_t H5open (void); +HDF5API herr_t H5close (void); +HDF5API herr_t H5dont_atexit (void); +HDF5API herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, unsigned *relnum); +HDF5API herr_t H5check_version (unsigned majnum, unsigned minnum, unsigned relnum); #ifdef __cplusplus } -- cgit v0.12