diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-05-25 20:01:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 20:01:17 (GMT) |
| commit | c924267d987d27dfa3b600fde8fb0a51188f85ed (patch) | |
| tree | 30e9745428b5c2ae6b09feea393daef97fe5b00c /src/H5win32defs.h | |
| parent | 916188ad69831550fefc8c978d1f5e3209762436 (diff) | |
| download | hdf5-c924267d987d27dfa3b600fde8fb0a51188f85ed.zip hdf5-c924267d987d27dfa3b600fde8fb0a51188f85ed.tar.gz hdf5-c924267d987d27dfa3b600fde8fb0a51188f85ed.tar.bz2 | |
Hdf5 1 8 doxygen merges (#683)
* Update supported platforms
* Merge PR#3 changes from develop
* # WARNING: head commit changed in the meantime
Merge gcc 10 diagnostics option from develop
Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop
* Format updates
* Fix missing semicolon and format fix
* Format update
* Correct actions, remove java option
* Update autotools build files
* Add testfiles
* Fix configure issue with make flags
* Init fapls to default
* Update generated files and fix h5repack id closure
* update format
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync
* format alignment
* initialize vars
* revert H5private change
* Merge #380 from develop
* Split format source and commit changes on repo push
* Change windows TS to use older VS.
* HDFFV-11229 merge dev changes for long double display in tools
* Committing clang-format changes
* Update unsupported types with precision
* Add "option" command for clang options
* CMake merges from develop h5cc scripts
* Updates from develop and printf formatters
* Committing clang-format changes
* Issue #669 remove version from pkgcfg filename
* remove version from h5cc script
* doxygen changes merged from develop
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5win32defs.h')
| -rw-r--r-- | src/H5win32defs.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 2fc1d80..10a5e83 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -11,10 +11,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* Programmer: Scott Wegner - * June 3, 2008 - * - * Purpose: This file is used to map HDF macros to Windows functions. This +/* Purpose: This file is used to map HDF macros to Windows functions. This * should get included H5private mappings, so as to override them. * Any macro not mapped here, however, will receive a similar mapping * inside H5private.h @@ -60,10 +57,11 @@ #define PRIxMAX "llx" #endif -/* - * _MSC_VER = 1900 VS2015 - * _MSC_VER = 1800 VS2013 - * _MSC_VER = 1700 VS2012 +/* _MSC_VER = 192x VS2019 + * _MSC_VER = 191x VS2017 + * _MSC_VER = 1900 VS2015 + * _MSC_VER = 1800 VS2013 + * _MSC_VER = 1700 VS2012 */ #ifdef H5_HAVE_WIN32_API @@ -127,7 +125,7 @@ typedef __int64 h5_stat_size_t; #endif /* MSC_VER < 1800 */ /* - * The (void*) cast just avoids a compiler warning in H5_HAVE_VISUAL_STUDIO + * The (void*) cast just avoids a compiler warning in MSVC */ #define HDmemset(X, C, Z) memset((void *)(X), C, Z) |