Merge changes from develop

Comments and whitespace Skip file-locking and cache changes
2020-10-08 09:40:18 -05:00
parent 29874423bf
commit cdbe6b78f0
195 changed files with 12508 additions and 12599 deletions
--- 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)