mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-24 15:25:00 +08:00
[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.
This commit is contained in:
parent
b6265298d8
commit
b9bcf81f6b
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user