summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/h5dumptst.c3
-rw-r--r--tools/h5dumputil.c4
-rw-r--r--tools/h5repart.c8
-rw-r--r--tools/h5toh4.c3
-rw-r--r--tools/h5toh4.h2
5 files changed, 16 insertions, 4 deletions
diff --git a/tools/h5dumptst.c b/tools/h5dumptst.c
index b5ed4db..73c5795 100644
--- a/tools/h5dumptst.c
+++ b/tools/h5dumptst.c
@@ -1160,7 +1160,8 @@ size_t mdims[2];
static void test_str2(void) {
hid_t fid, group, attr, dataset, space, space2, mem_space, hyper_space;
hid_t fxdlenstr, fxdlenstr2, memtype;
-hsize_t dims[1], size[1], start[1], stride[1], count[1], block[1];
+hsize_t dims[1], size[1], stride[1], count[1], block[1];
+hssize_t start[1];
int i;
diff --git a/tools/h5dumputil.c b/tools/h5dumputil.c
index 1393db0..a88f4b2 100644
--- a/tools/h5dumputil.c
+++ b/tools/h5dumputil.c
@@ -25,8 +25,12 @@
#define H5DUMP_BUFSIZE (1024)
#endif
+#ifndef MIN
#define MIN(X,Y) ((X)<(Y)?(X):(Y))
+#endif
+#ifndef NELMTS
#define NELMTS(X) (sizeof(X)/sizeof(*X))
+#endif
#define ALIGN(A,Z) ((((A)+(Z)-1)/(Z))*(Z))
diff --git a/tools/h5repart.c b/tools/h5repart.c
index 0a89143..077ca73 100644
--- a/tools/h5repart.c
+++ b/tools/h5repart.c
@@ -32,13 +32,21 @@
# include <sys/stat.h>
#endif
+#ifndef FALSE
#define FALSE 0
+#endif
+#ifndef TRUE
#define TRUE 1
+#endif
#define NAMELEN 4096
#define GB *1024*1024*1024
+#ifndef MIN
#define MIN(X,Y) ((X)<(Y)?(X):(Y))
+#endif
+#ifndef MIN3
#define MIN3(X,Y,Z) MIN(MIN(X,Y),Z)
+#endif
/*-------------------------------------------------------------------------
diff --git a/tools/h5toh4.c b/tools/h5toh4.c
index ab7616e..2fc78ab 100644
--- a/tools/h5toh4.c
+++ b/tools/h5toh4.c
@@ -11,11 +11,10 @@
*****************************************************************************/
-#include <stdio.h>
+#include "h5toh4.h"
#include <errno.h>
#include <string.h>
#include <fcntl.h>
-#include <h5toh4.h>
extern int PrintOptions_h5toh4(void);
extern char *BuildFilename(char *h5_filename, char *h4_extension);
diff --git a/tools/h5toh4.h b/tools/h5toh4.h
index 4436288..edc4b52 100644
--- a/tools/h5toh4.h
+++ b/tools/h5toh4.h
@@ -1,8 +1,8 @@
#ifndef _H5TOH4_H
#define _H5TOH4_H
-#include <hdf5.h>
#include <mfhdf.h>
+#include <hdf5.h>
/*
* Copyright © 1998 NCSA