summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/big.c12
-rw-r--r--test/chunk.c3
-rw-r--r--test/cmpd_dset.c4
-rw-r--r--test/dsets.c4
-rw-r--r--test/dtypes.c4
-rw-r--r--test/extend.c4
-rw-r--r--test/external.c4
-rw-r--r--test/fillval.c4
-rw-r--r--test/flush1.c9
-rw-r--r--test/flush2.c4
-rw-r--r--test/iopipe.c4
-rw-r--r--test/links.c4
-rw-r--r--test/mount.c4
-rw-r--r--test/mtime.c26
-rw-r--r--test/overhead.c9
-rw-r--r--test/ragged.c11
-rw-r--r--test/shtype.c4
-rw-r--r--test/unlink.c4
-rw-r--r--tools/h5import.c3
-rw-r--r--tools/h5ls.c11
-rw-r--r--tools/h5repart.c3
21 files changed, 28 insertions, 107 deletions
diff --git a/test/big.c b/test/big.c
index 7b2b68c..0c49f09 100644
--- a/test/big.c
+++ b/test/big.c
@@ -8,18 +8,6 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
-
-#ifdef STDC_HEADERS
-# include <assert.h>
-# include <ctype.h>
-# include <fcntl.h>
-# include <math.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <sys/stat.h>
-#endif
-
#include <hdf5.h>
#include <H5private.h> /*needed for HDfprintf() and long_long*/
diff --git a/test/chunk.c b/test/chunk.c
index 8109c09..d847db3 100644
--- a/test/chunk.c
+++ b/test/chunk.c
@@ -12,7 +12,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -21,7 +21,6 @@
# include <string.h>
#endif
-#include <hdf5.h>
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 1c8a235..f50966a 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -8,7 +8,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -17,8 +17,6 @@
# include <string.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/dsets.c b/test/dsets.c
index 4640d03..d7e518b 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -10,7 +10,7 @@
/* See H5private.h for how to include files */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -25,8 +25,6 @@
# include <unistd.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/dtypes.c b/test/dtypes.c
index 5611c16..926ecfa 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -10,7 +10,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -29,8 +29,6 @@
# include <sys/wait.h>
#endif
-#include <hdf5.h>
-
#define H5T_PACKAGE
#include <H5Tpkg.h> /*to turn off hardware conversions*/
diff --git a/test/extend.c b/test/extend.c
index 86afe3f..a13d606 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -10,15 +10,13 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
# include <stdlib.h>
#endif
-#include <hdf5.h>
-
#define TEST_FILE_NAME "extend.h5"
#define NX 100 /* USE AN EVEN NUMBER!*/
#define NY 100 /* USE AN EVEN NUMBER!*/
diff --git a/test/external.c b/test/external.c
index 363a9f2..0777a68 100644
--- a/test/external.c
+++ b/test/external.c
@@ -10,7 +10,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -25,8 +25,6 @@
# include <unistd.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/fillval.c b/test/fillval.c
index feb704f..93643eb 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -10,7 +10,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <fcntl.h>
@@ -22,8 +22,6 @@
# include <unistd.h>
#endif
-#include <hdf5.h>
-
/*
* Define NO_FILLING if you want to compare how this test works when there is
* no fill value (that is, when the fill value is zero).
diff --git a/test/flush1.c b/test/flush1.c
index 4596f86..40db166 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -14,14 +14,17 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <stdio.h>
-# include <unistd.h>
+# include <stdlib.h>
#endif
-#include <hdf5.h>
+#ifdef HAVE_UNISTD_H
+# include <sys/types.h>
+# include <unistd.h>
+#endif
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
diff --git a/test/flush2.c b/test/flush2.c
index 4bc1362..95818b8 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -13,7 +13,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -22,8 +22,6 @@
# include <stdlib.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/iopipe.c b/test/iopipe.c
index 8ede803..ca1b375 100644
--- a/test/iopipe.c
+++ b/test/iopipe.c
@@ -8,7 +8,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
@@ -40,8 +40,6 @@
#include <Winsock.h>
#endif
-#include <hdf5.h>
-
#define RAW_FILE_NAME "iopipe.raw"
#define HDF5_FILE_NAME "iopipe.h5"
#define HEADING "%-16s"
diff --git a/test/links.c b/test/links.c
index f824a7b..648f357 100644
--- a/test/links.c
+++ b/test/links.c
@@ -10,15 +10,13 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <string.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/mount.c b/test/mount.c
index 5eb0d49..1acd1e7 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -10,14 +10,12 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <stdlib.h>
#endif
-#include <hdf5.h>
-
#define FALSE 0
#define TRUE 1
diff --git a/test/mtime.c b/test/mtime.c
index 0c019a6..6fadbfd 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -13,35 +13,11 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
-
-#ifdef STDC_HEADERS
-# include <assert.h>
-# include <math.h>
-#endif
-
-#if defined(TIME_WITH_SYS_TIME)
-# include <sys/time.h>
-# include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-# include <sys/time.h>
-#else
-# include <time.h>
-#endif
-
#include <hdf5.h>
-#include <H5private.h> /*for HDdifftime()*/
+#include <H5private.h> /*for HDdifftime() and __unused__ */
#define FILE_NAME_1 "mtime.h5"
-#ifndef HAVE_ATTRIBUTE
-# undef __attribute__
-# define __attribute__(X) /*void*/
-# define __unused__ /*void*/
-#else
-# define __unused__ __attribute__((unused))
-#endif
-
/*-------------------------------------------------------------------------
* Function: display_error_cb
diff --git a/test/overhead.c b/test/overhead.c
index 6aab340..69ec1b2 100644
--- a/test/overhead.c
+++ b/test/overhead.c
@@ -10,7 +10,7 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <ctype.h>
@@ -24,8 +24,6 @@
# include <unistd.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
@@ -239,7 +237,7 @@ test(fill_t fill_style, const double splits[],
if (verbose) {
if (H5Fflush(file, H5F_SCOPE_LOCAL)<0) goto error;
if (fstat(fd, &sb)<0) goto error;
- /*
+ /*
* The extra cast in the following statement is a bug workaround
* for the Win32 version 5.0 compiler.
* 1998-11-06 ptl
@@ -283,7 +281,8 @@ test(fill_t fill_style, const double splits[],
* 1998-11-06 ptl
*/
printf("%-7s %8.3f\n", sname,
- (double)((hssize_t)((sb.st_size-cur_size[0]*sizeof(int))/cur_size[0])));
+ (double)((hssize_t)((sb.st_size-cur_size[0]*sizeof(int))/
+ cur_size[0])));
}
close(fd);
diff --git a/test/ragged.c b/test/ragged.c
index 17dfe30..f9f1f99 100644
--- a/test/ragged.c
+++ b/test/ragged.c
@@ -8,19 +8,8 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
-
-#ifdef STDC_HEADERS
-# include <assert.h>
-# include <signal.h>
-# include <stdlib.h>
-#endif
-
-#include <hdf5.h>
-
#include <H5private.h> /*for performance monitoring*/
-
#define NOTIFY_INTERVAL 2 /*seconds*/
#define TIME_LIMIT 60 /*seconds*/
#define CH_SIZE 8192*8 /*approx chunk size in bytes*/
diff --git a/test/shtype.c b/test/shtype.c
index 7b05ed2..98fcd7e 100644
--- a/test/shtype.c
+++ b/test/shtype.c
@@ -10,15 +10,13 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <assert.h>
# include <stdlib.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/test/unlink.c b/test/unlink.c
index 0f63274..fcc9b2f 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -10,14 +10,12 @@
/* See H5private.h for how to include headers */
#undef NDEBUG
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <stdlib.h>
#endif
-#include <hdf5.h>
-
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
diff --git a/tools/h5import.c b/tools/h5import.c
index 5d36e78..90efec7 100644
--- a/tools/h5import.c
+++ b/tools/h5import.c
@@ -9,7 +9,7 @@
*/
/* See H5private.h for how to include system headers */
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <fcntl.h>
# include <string.h>
@@ -26,7 +26,6 @@
# include <sys/stat.h>
#endif
-#include <hdf5.h>
/*-------------------------------------------------------------------------
diff --git a/tools/h5ls.c b/tools/h5ls.c
index 4e21cca..fa0c00b 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -9,19 +9,12 @@
/*
* We include the private header file so we can get to the uniform
- * programming environment it declares.
+ * programming environment it declares. Other than that, h5ls only calls
+ * HDF5 API functions.
*/
#include <H5private.h>
#include <h5tools.h>
-#ifndef HAVE_ATTRIBUTE
-# undef __attribute__
-# define __attribute__(X) /*void*/
-# define __unused__ /*void*/
-#else
-# define __unused__ __attribute__((unused))
-#endif
-
/* Command-line switches */
static int verbose_g = 0; /*lots of extra output */
static int width_g = 80; /*output width in characters */
diff --git a/tools/h5repart.c b/tools/h5repart.c
index b1a878e..6f6f2df 100644
--- a/tools/h5repart.c
+++ b/tools/h5repart.c
@@ -13,7 +13,7 @@
*/
/* See H5private.h for how to include system headers */
-#include <H5config.h>
+#include <hdf5.h>
#ifdef STDC_HEADERS
# include <ctype.h>
# include <errno.h>
@@ -32,7 +32,6 @@
# include <sys/stat.h>
#endif
-#include <hdf5.h>
#define FALSE 0
#define TRUE 1
#define NAMELEN 4096
generated by cgit v0.12 at 2024-07-08 06:02:36 (GMT)