summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1999-04-29 17:41:42 (GMT)
committerPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1999-04-29 17:41:42 (GMT)
commit2443c16bf0e93465b0bbebde5920b199fca5630c (patch)
tree8bfd5bb8d316ff63f9c2ae3663c05e169b92e828
parent127b3b1b634000c75ec91d1ef7a86282f9d62412 (diff)
downloadhdf5-2443c16bf0e93465b0bbebde5920b199fca5630c.zip
hdf5-2443c16bf0e93465b0bbebde5920b199fca5630c.tar.gz
hdf5-2443c16bf0e93465b0bbebde5920b199fca5630c.tar.bz2
[svn-r1236] i had to change some of the h5mm_xfree calls to just hdfree for the dll version
it was causing some crashes otherwise
-rw-r--r--test/hyperslab.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 9a59363..85d4f3f 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -564,8 +564,13 @@ test_copy(int mode,
}
}
puts(" PASSED");
- H5MM_xfree(src);
- H5MM_xfree(dst);
+#ifdef WIN32 && _HDF5USEDLL_
+ HDfree(src);
+ HDfree(dst);
+#else
+ H5MM_xfree(src);
+ H5MM_xfree(dst);
+#endif
return SUCCEED;
error:
@@ -613,7 +618,7 @@ test_multifill(size_t nx)
fflush(stdout);
/* Initialize the source and destination */
-#ifndef WIN32
+#ifndef WIN32 && _HDF5USEDLL_
src = H5MM_malloc(nx * sizeof(*src));
dst = H5MM_malloc(nx * sizeof(*dst));
#else
@@ -686,7 +691,7 @@ test_multifill(size_t nx)
}
puts(" PASSED");
-#ifndef WIN32
+#ifndef WIN32 && _HDF5USEDLL_
H5MM_xfree(src);
H5MM_xfree(dst);
#else
@@ -775,8 +780,13 @@ test_endian(size_t nx)
}
puts(" PASSED");
+#ifdef WIN32 && _HDF5USEDLL_
+ HDfree(src);
+ HDfree(dst);
+#else
H5MM_xfree(src);
H5MM_xfree(dst);
+#endif
return SUCCEED;
error:
@@ -877,8 +887,13 @@ test_transpose(size_t nx, size_t ny)
}
puts(" PASSED");
+#ifndef WIN32 && _HDF5USEDLL_
H5MM_xfree(src);
H5MM_xfree(dst);
+#else
+ HDfree(src);
+ HDfree(dst);
+#endif
return SUCCEED;
error: