diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2001-05-13 04:13:15 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2001-05-13 04:13:15 (GMT) |
| commit | b9bcf81f6b5cdc558b8b69826f7978ac8432e555 (patch) | |
| tree | 7218b0ffd5b16d679ab593ca912efa54b776a05f /testpar | |
| parent | b6265298d8929f828798f83ab8568ef30b2f9177 (diff) | |
| download | hdf5-b9bcf81f6b5cdc558b8b69826f7978ac8432e555.zip hdf5-b9bcf81f6b5cdc558b8b69826f7978ac8432e555.tar.gz hdf5-b9bcf81f6b5cdc558b8b69826f7978ac8432e555.tar.bz2 | |
[svn-r3927] Purpose:
Bug fix
Description:
Some mpi.h already includes MPI-IO definitions in it (e.g., SGI,
SP2). Made the #include of mpio.h be dependent on whether some
MPI-IO constant is already defined or not.
Platforms tested:
modi4 (IRIX64) and IBM SP2.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/perf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/testpar/perf.c b/testpar/perf.c index 36de25a..1b742a8 100644 --- a/testpar/perf.c +++ b/testpar/perf.c @@ -15,7 +15,10 @@ #include <string.h> #include <sys/time.h> #include <mpi.h> -#include "mpio.h" +#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ +# include <mpio.h> +#endif + #include "hdf5.h" /* Macro definitions */ @@ -364,7 +367,8 @@ int parse_args(int argc, char **argv) if (p=(char*)strchr(optarg, '/')) opt_threshold = atoi(p+1); } - printf("alignment/threshold=%ld/%ld\n", + HDfprintf(stdout, + "alignment/threshold=%Hu/%Hu\n", opt_alignment, opt_threshold); break; case 'c': /* correctness */ |