summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2013-01-09 19:23:18 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2013-01-09 19:23:18 (GMT)
commitcde5029461edd921e8f84dabed9eb8f01a704dba (patch)
tree75898a2d809e5b4aca07f6688382ecf1e3c1009f /hl
parentcf823b47edf7e28d13a10802a797c6aa6bdf9f47 (diff)
downloadhdf5-cde5029461edd921e8f84dabed9eb8f01a704dba.zip
hdf5-cde5029461edd921e8f84dabed9eb8f01a704dba.tar.gz
hdf5-cde5029461edd921e8f84dabed9eb8f01a704dba.tar.bz2
[svn-r23146] The test on Windows shows it doesn't have zlib.h. I added a macro condition to verify it before include it.
Tested on koala.
Diffstat (limited to 'hl')
-rw-r--r--hl/test/test_dset_opt.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index 0a0674b..79f7eda 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -18,9 +18,15 @@
#include "h5hltest.h"
#include "H5srcdir.h"
#include "H5DOpublic.h"
-#include <zlib.h>
#include <math.h>
+#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
+# define H5_ZLIB_HEADER "zlib.h"
+#endif
+#if defined(H5_ZLIB_HEADER)
+# include H5_ZLIB_HEADER /* "zlib.h" */
+#endif
+
#define FILE_NAME "test_dectris.h5"
#define DATASETNAME1 "direct_write"