diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-08 14:23:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-08 14:23:47 (GMT) |
| commit | 0e830ba4360a154d4b72a65298aae0f4cf888504 (patch) | |
| tree | a914d23cea0a0e9bd81daf1b73b037441a5f08c3 /config | |
| parent | 75567cbe8f6ec97df3db5b73f0c94625f63a4d0b (diff) | |
| download | hdf5-0e830ba4360a154d4b72a65298aae0f4cf888504.zip hdf5-0e830ba4360a154d4b72a65298aae0f4cf888504.tar.gz hdf5-0e830ba4360a154d4b72a65298aae0f4cf888504.tar.bz2 | |
Merge from develop and 1.12
Comments and whitespace
No cache, select or file-locking changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFTests.c | 2 | ||||
| -rw-r--r-- | config/gnu-warnings/error-general | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 0ddb6d0..7988772 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -69,6 +69,7 @@ if (MINGW) set (WINDOWS 1) # MinGW tries to imitate Windows set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1") set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1) + set (__USE_MINGW_ANSI_STDIO 1) endif () if (WIN32 AND NOT MINGW) diff --git a/config/cmake_ext_mod/HDFTests.c b/config/cmake_ext_mod/HDFTests.c index 31a568a..bed9444 100644 --- a/config/cmake_ext_mod/HDFTests.c +++ b/config/cmake_ext_mod/HDFTests.c @@ -178,7 +178,7 @@ int DebugReport(int reportType, char* message, int* returnValue) int main(void) { - char *llwidthArgs[] = { "I64", "l64", "l", "L", "q", "ll", NULL }; + char *llwidthArgs[] = { "I64", "l64", "ll", "l", "L", "q", NULL }; char *s = malloc(128); char **currentArg = NULL; LL_TYPE x = (LL_TYPE)1048576 * (LL_TYPE)1048576; diff --git a/config/gnu-warnings/error-general b/config/gnu-warnings/error-general index f0e61f8..4358b20 100644 --- a/config/gnu-warnings/error-general +++ b/config/gnu-warnings/error-general @@ -59,7 +59,7 @@ # jni/h5util.c # -Werror=format(-overflow) # --Wformat +-Werror=format # # #Examples and tests do not use the same set of extensive warning flags as libraries |