summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-12-05 20:26:39 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-12-05 20:26:39 (GMT)
commit6ecbcc1717aa79dbaa00926b7a5f095a921f8991 (patch)
tree6a5a949e3ef0419d9eb9ad05c90f083a8f49d066 /tools
parent253123994aaecc1f1fc917383b663104d6630d0f (diff)
downloadhdf5-6ecbcc1717aa79dbaa00926b7a5f095a921f8991.zip
hdf5-6ecbcc1717aa79dbaa00926b7a5f095a921f8991.tar.gz
hdf5-6ecbcc1717aa79dbaa00926b7a5f095a921f8991.tar.bz2
[svn-r4676] Purpose:
Backward Compatibility Fix Description: One of H5P[gs]et_buffer's parameters changed between v1.4 and the development branch. Solution: Added v1.4 compat stuff around H5P[gs]et_buffer implementation and testing to allow v1.4.x users to continue to use their source code without modification. These changes are for everything except the FORTRAN wrappers - I spoke with Elena and she will make the FORTRAN wrapper changes. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'tools')
-rw-r--r--tools/h4toh5/h4toh5image.c4
-rw-r--r--tools/h4toh5/h4toh5sds.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/h4toh5/h4toh5image.c b/tools/h4toh5/h4toh5image.c
index c4c945f..7523974 100644
--- a/tools/h4toh5/h4toh5image.c
+++ b/tools/h4toh5/h4toh5image.c
@@ -95,7 +95,11 @@ int Image_h4_to_h5(int32 file_id,int32 ri_id,hid_t h5_group,hid_t h5_palgroup,in
hsize_t fielddim[1];
hsize_t h5dims[2];
hsize_t h5dims24[3];
+#ifdef H5_WANT_H5_V1_4_COMPAT
hsize_t bufsize;
+#else /* H5_WANT_H5_V1_4_COMPAT */
+ size_t bufsize;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
herr_t ret;
hid_t create_plist;
hid_t write_plist;
diff --git a/tools/h4toh5/h4toh5sds.c b/tools/h4toh5/h4toh5sds.c
index d464fdf..6945bdb 100644
--- a/tools/h4toh5/h4toh5sds.c
+++ b/tools/h4toh5/h4toh5sds.c
@@ -95,7 +95,11 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int
hid_t write_plist;
hsize_t h5dims[MAX_VAR_DIMS];
hsize_t max_h5dims[MAX_VAR_DIMS];
+#ifdef H5_WANT_H5_V1_4_COMPAT
hsize_t bufsize;
+#else /* H5_WANT_H5_V1_4_COMPAT */
+ size_t bufsize;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
char* h5csds_name;
herr_t ret;
@@ -1480,7 +1484,11 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
hid_t write_plist;
hsize_t h5dims[MAX_VAR_DIMS];
hsize_t max_h5dims[MAX_VAR_DIMS];
+#ifdef H5_WANT_H5_V1_4_COMPAT
hsize_t bufsize;
+#else /* H5_WANT_H5_V1_4_COMPAT */
+ size_t bufsize;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
char* h5csds_name;
if (SDgetinfo(sds_id,sdsname,&sds_rank,sds_dimsizes,&sds_dtype,