Merge branch 'mingw-w64-compile' into release

Source/cmFileCommand.cxx

@@ -42,6 +42,10 @@
 #include "cmFileLockResult.h"
 #endif
 
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
 class cmSystemToolsFileTime;
 
 // Table of permissions flags.

bootstrap

@@ -1419,6 +1419,7 @@ fi
 cmake_c_flags_String="-DKWSYS_STRING_C"
 if ${cmake_system_mingw}; then
   cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP"
+  cmake_cxx_flags_EncodingCXX="${cmake_c_flags_EncodingC}"
   cmake_cxx_flags_cmProcessOutput="${cmake_c_flags_EncodingC}"
 fi
 cmake_cxx_flags_SystemTools="