diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-03 20:15:55 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-03 20:15:55 (GMT) |
commit | e65814bf8eda709b27a60fe3e396a22e4bc34864 (patch) | |
tree | c9f9cc67a4dd93453cc4bf7054b5a8192e663337 /src/H5win32defs.h | |
parent | c14fa9cebf58213bc4e2c0ac87e520c473e14071 (diff) | |
download | hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.zip hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.gz hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.bz2 |
1 10 merges from develop (#419)
* HDFFV-10865 - merge from dev, HDFArray perf fix.
* Remove duplicate setting
* Whitespace changes after clang format
* Undo version 11 clang format changes
* Merge CMake changes from develop
* test testing script merge from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
* Merge small changes from develop
* Minor non-space formatting changes
* #386 copyright corrections for java folder
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Merge updates
#358 patches from vtk
#361 fix header guard spelling
* format fix
* Fix missing underscore and make H5public.h closer to dev
Diffstat (limited to 'src/H5win32defs.h')
-rw-r--r-- | src/H5win32defs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 7c088aa..b4b253f 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -31,33 +31,40 @@ #define PRIoPTR "llo" #define PRIuPTR "llu" #define PRIxPTR "llx" +#define PRIXPTR "llX" #else /* _WIN64 */ #define PRIdPTR "ld" #define PRIoPTR "lo" #define PRIuPTR "lu" #define PRIxPTR "lx" +#define PRIXPTR "lX" #endif /* _WIN64 */ #define PRId8 "d" #define PRIo8 "o" #define PRIu8 "u" #define PRIx8 "x" +#define PRIX8 "X" #define PRId16 "d" #define PRIo16 "o" #define PRIu16 "u" #define PRIx16 "x" +#define PRIX16 "X" #define PRId32 "d" #define PRIo32 "o" #define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" #define PRId64 "lld" #define PRIo64 "llo" #define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #define PRIdMAX "lld" #define PRIoMAX "llo" #define PRIuMAX "llu" #define PRIxMAX "llx" +#define PRIXMAX "llX" #endif /* |