Skip to content

Commit

Permalink
Merge pull request #1916 from jedwards4b/remove_MPI_Offset_redef
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b authored Mar 11, 2022
2 parents 0dbdf3b + f6faded commit a959076
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/clib/pio_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
#include <mpe.h>
#endif /* USE_MPE */

#ifndef MPI_OFFSET
//#ifndef MPI_OFFSET
/** MPI_OFFSET is an integer type of size sufficient to represent the
* size (in bytes) of the largest file supported by MPI. In some MPI
* implementations MPI_OFFSET is not properly defined. */
#define MPI_OFFSET MPI_LONG_LONG
#endif
//#define MPI_OFFSET MPI_LONG_LONG
//#endif

/* These are the sizes of types in netCDF files. Do not replace these
* constants with sizeof() calls for C types. They are not the
Expand All @@ -57,10 +57,10 @@
#define MPI_OFFSET OMPI_OFFSET_DATATYPE
#endif
#endif
#ifndef MPI_Offset
//#ifndef MPI_Offset
/** This is the type used for PIO_Offset. */
#define MPI_Offset long long
#endif
//#define MPI_Offset long long
//#endif

/** Some MPI implementations do not allow passing MPI_DATATYPE_NULL to
* comm functions even though the send or recv length is 0, in these
Expand Down

0 comments on commit a959076

Please sign in to comment.