diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | Makefile.dist | 8 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | config/conclude.in | 2 | ||||
| -rw-r--r-- | src/H5Psimp.c | 2 | ||||
| -rw-r--r-- | src/H5T.c | 11 |
6 files changed, 17 insertions, 16 deletions
@@ -91,8 +91,8 @@ Step 4. Run confidence tests. The command will fail if any test fails. Note: some versions of make will report that `test is up to - date'. If this happens then run `make test' from within the test - directory. + date'. If this happens then run `make _test' instead or run + `make test' from within the test directory. Step 5. Install public files. diff --git a/Makefile.dist b/Makefile.dist index e2145ee..c1c2186 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -11,14 +11,14 @@ SHELL=/bin/sh -all lib progs test install uninstall dep depend clean mostlyclean: config +all lib progs test _test install uninstall dep depend: _config $(MAKE) $@ -distclean maintainer-clean TAGS: config +clean mostlyclean distclean maintainer-clean TAGS: _config $(MAKE) $@ -config: +_config: sh configure .PHONY: all lib progs test install uninstall dep depend clean mostlyclean \ - distclean maintainer-clean config + distclean maintainer-clean _config diff --git a/Makefile.in b/Makefile.in index 953e6aa..de6c009 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,13 +57,13 @@ SUBDIRS=src test # make used in combination with gcc will maintain dependency # information automatically. # -all lib progs test install uninstall TAGS dep depend: +all lib progs test _test install uninstall TAGS dep depend: @@SETX@; for d in $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done -.PHONY: all lib progs test install uninstall dep depend clean mostlyclean \ - distclean maintainer-clean +.PHONY: all lib progs test _test install uninstall dep depend clean \ + mostlyclean distclean maintainer-clean clean mostlyclean: @@SETX@; for d in $(SUBDIRS); do \ diff --git a/config/conclude.in b/config/conclude.in index 01002e4..8aebc6c 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -20,7 +20,7 @@ TAGS: $(LIB_SRC) -etags $(LIB_SRC) # Runs each test in order, passing $(TEST_FLAGS) to the program. -test: $(PROGS) +test _test: $(PROGS) @for test in $(TESTS) dummy; do \ if test $$test != dummy; then \ echo "Testing $$test $(TEST_FLAGS)"; \ diff --git a/src/H5Psimp.c b/src/H5Psimp.c index c0e0c36..a6ecaf2 100644 --- a/src/H5Psimp.c +++ b/src/H5Psimp.c @@ -89,7 +89,7 @@ H5P_simp_fgath (H5F_t *f, const struct H5O_layout_t *layout, const H5P_number_t *numbering, intn start, intn nelmts, void *buf/*out*/) { - int file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/ + size_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/ size_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */ size_t zero[H5O_LAYOUT_NDIMS]; /*zero */ size_t sample[H5O_LAYOUT_NDIMS]; /*hyperslab sampling */ @@ -1,4 +1,5 @@ -/**************************************************************************** +/* + * * NCSA HDF * * Software Development Group * * National Center for Supercomputing Applications * @@ -3238,8 +3239,8 @@ H5T_debug(H5T_t *dt, FILE * stream) break; } - fprintf(stream, "%s%s {nbytes=%d", - s, dt->locked ? "[!]" : "", dt->size); + fprintf(stream, "%s%s {nbytes=%ul", + s, dt->locked ? "[!]" : "", (unsigned long)(dt->size)); if (H5T_is_atomic(dt)) { switch (dt->u.atomic.order) { @@ -3332,8 +3333,8 @@ H5T_debug(H5T_t *dt, FILE * stream) if (dt->u.compnd.memb[i].ndims) { fprintf(stream, "["); for (j = 0; j < dt->u.compnd.memb[i].ndims; j++) { - fprintf(stream, "%s%d", j ? ", " : "", - dt->u.compnd.memb[i].dim[j]); + fprintf(stream, "%s%lu", j ? ", " : "", + (unsigned long)(dt->u.compnd.memb[i].dim[j])); } fprintf(stream, "]"); } |