diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-15 14:06:53 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-15 14:06:53 (GMT) |
| commit | 8d80bf4a93a2de494e710eb9719483178ad215e8 (patch) | |
| tree | 733fc801d4b04608cd57bc5003a52513c193dc4d /perform/mpi-perf.c | |
| parent | 03a4dd9fc38eba695cb9c169d6879280fc665f3f (diff) | |
| download | hdf5-8d80bf4a93a2de494e710eb9719483178ad215e8.zip hdf5-8d80bf4a93a2de494e710eb9719483178ad215e8.tar.gz hdf5-8d80bf4a93a2de494e710eb9719483178ad215e8.tar.bz2 | |
[svn-r21228] Added #ifdefs around #include unistd.h and created windows getlogin() function for building HDF5 parallel on windows.
Reviewed and tested locally and tested by user.
Diffstat (limited to 'perform/mpi-perf.c')
| -rw-r--r-- | perform/mpi-perf.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/perform/mpi-perf.c b/perform/mpi-perf.c index c0fe794..a09d672 100644 --- a/perform/mpi-perf.c +++ b/perform/mpi-perf.c @@ -55,10 +55,19 @@ #include <stdio.h> #include <stdlib.h> #include <fcntl.h> +#ifdef H5_HAVE_UNISTD_H #include <unistd.h> +#endif #include <errno.h> #include <string.h> -#include <sys/time.h> +#if defined(H5_TIME_WITH_SYS_TIME) +# include <sys/time.h> +# include <time.h> +#elif defined(H5_HAVE_SYS_TIME_H) +# include <sys/time.h> +#else +# include <time.h> +#endif #include <mpi.h> #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ # include <mpio.h> @@ -299,7 +308,7 @@ die_jar_jar_die: #if H5_HAVE_SETENV /* no setenv or unsetenv */ /* clear the environment variable if it was set earlier */ - if (opt_pvfstab_set){ + if (opt_pvfstab_set){ unsetenv("PVFSTAB_FILE"); } #endif |