summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-06-26 17:44:39 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-06-26 17:44:39 (GMT)
commit4a9a1c90f3d1a398e7525034b1311696affb9d6d (patch)
tree783ae3d89177e95cb24eebda405267b891361e58 /src
parent21134e48e135c03ecad8dc35ea5dd803e0e9690b (diff)
downloadhdf5-4a9a1c90f3d1a398e7525034b1311696affb9d6d.zip
hdf5-4a9a1c90f3d1a398e7525034b1311696affb9d6d.tar.gz
hdf5-4a9a1c90f3d1a398e7525034b1311696affb9d6d.tar.bz2
[svn-r13917] Description:
Code & warning cleanups Tested on: Mac OS X/32 10.4.10 (amazon) Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2)
Diffstat (limited to 'src')
-rw-r--r--src/H5MMpublic.h7
-rw-r--r--src/H5Tpkg.h1
-rw-r--r--src/H5Tprivate.h1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h
index ee730ec..bfcb807 100644
--- a/src/H5MMpublic.h
+++ b/src/H5MMpublic.h
@@ -33,8 +33,8 @@
#include "H5public.h"
/* These typedefs are currently used for VL datatype allocation/freeing */
-typedef void *(* H5MM_allocate_t)(size_t size,void *info);
-typedef void (* H5MM_free_t)(void *mem, void *free_info);
+typedef void *(*H5MM_allocate_t)(size_t size, void *alloc_info);
+typedef void (*H5MM_free_t)(void *mem, void *free_info);
#ifdef __cplusplus
extern "C" {
@@ -43,4 +43,5 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-#endif
+#endif /* _H5MMpublic_H */
+
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index fd3bc39..6b68bf1 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -1340,7 +1340,6 @@ H5_DLL size_t H5T_get_member_offset(const H5T_t *dt, unsigned membno);
H5_DLL size_t H5T_get_member_size(const H5T_t *dt, unsigned membno);
H5_DLL htri_t H5T_is_packed(const H5T_t *dt);
H5_DLL H5T_subset_t H5T_conv_struct_subset(const H5T_cdata_t *cdata);
-H5_DLL H5T_subset_t H5T_path_compound_subset(const H5T_path_t *p);
#endif /* _H5Tpkg_H */
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 0ac6047..608284e 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -102,6 +102,7 @@ H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst,
const char *name, H5T_conv_t func, hid_t dxpl_id, hbool_t is_api);
H5_DLL hbool_t H5T_path_noop(const H5T_path_t *p);
H5_DLL H5T_bkg_t H5T_path_bkg(const H5T_path_t *p);
+H5_DLL H5T_subset_t H5T_path_compound_subset(const H5T_path_t *p);
H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id,
size_t nelmts, size_t buf_stride, size_t bkg_stride,
void *buf, void *bkg, hid_t dset_xfer_plist);