Merge changes from develop

Comments and whitespace
Skip file-locking and cache changes

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)

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;