summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1999-07-06 16:59:40 (GMT)
committerPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>1999-07-06 16:59:40 (GMT)
commit2dba34824fd86001e2e0d0f32141e606a3d11293 (patch)
tree2dac5cbc158e07ce13ed2135aa3ed695a3d0546f
parentd70b72d630cba4d78cca0f134e6aa26318efff27 (diff)
downloadhdf5-2dba34824fd86001e2e0d0f32141e606a3d11293.zip
hdf5-2dba34824fd86001e2e0d0f32141e606a3d11293.tar.gz
hdf5-2dba34824fd86001e2e0d0f32141e606a3d11293.tar.bz2
[svn-r1426]
had to conditional compile some code out for the debug version of this file on windows. the microsoft c run time lib calls special versions of free and malloc in the debug mode. this code causes problems for the library(crashes) so i am taking the statements out in this version(win32 and debug) until i can figure out a way around the problem
-rw-r--r--src/H5O.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/H5O.c b/src/H5O.c
index f70803a..3001634 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -641,9 +641,15 @@ H5O_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5O_t *oh)
if (destroy) {
/* destroy chunks */
+ /*the conditional below is because of the microsoft c run time library
+ it calls its own version of malloc and free and does checks on the mem.
+ causes problems with this code so i am taking it out for the win32 debug
+ version until i can figure out a way around it*/
+#if !defined(WIN32) && !defined(_DEBUG)
for (i = 0; i < oh->nchunks; i++) {
oh->chunk[i].image = H5MM_xfree(oh->chunk[i].image);
}
+#endif
oh->chunk = H5MM_xfree(oh->chunk);
/* destroy messages */