Sync with upstream, enhance RE2C finder, fix HAVE_FLUSHIO on Windows

Author: petk

cmake/cmake/modules/FindRE2C.cmake

@@ -99,27 +99,37 @@ if(RE2C_EXECUTABLE)
   execute_process(
     COMMAND ${RE2C_EXECUTABLE} --vernum
     OUTPUT_VARIABLE RE2C_VERSION_NUM
+    ERROR_VARIABLE _re2c_version_error
+    RESULT_VARIABLE _re2c_version_result
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
-  math(
-    EXPR RE2C_VERSION_MAJOR
-    "${RE2C_VERSION_NUM} / 10000"
-  )
-
-  math(
-    EXPR RE2C_VERSION_MINOR
-    "(${RE2C_VERSION_NUM} - ${RE2C_VERSION_MAJOR} * 10000) / 100"
-  )
-
-  math(
-    EXPR RE2C_VERSION_PATCH
-    "${RE2C_VERSION_NUM} - ${RE2C_VERSION_MAJOR} * 10000 - ${RE2C_VERSION_MINOR} * 100"
-  )
-
-  set(RE2C_VERSION "${RE2C_VERSION_MAJOR}.${RE2C_VERSION_MINOR}.${RE2C_VERSION_PATCH}")
-
-  find_package_check_version("${RE2C_VERSION}" _re2c_version_valid)
+  if(NOT ${_re2c_version_result} EQUAL 0)
+    message(
+      SEND_ERROR
+      "Command \"${RE2C_EXECUTABLE} --vernum\" failed with output:\n"
+      "${_re2c_version_error}"
+    )
+  elseif(RE2C_VERSION_NUM)
+    math(
+      EXPR RE2C_VERSION_MAJOR
+      "${RE2C_VERSION_NUM} / 10000"
+    )
+
+    math(
+      EXPR RE2C_VERSION_MINOR
+      "(${RE2C_VERSION_NUM} - ${RE2C_VERSION_MAJOR} * 10000) / 100"
+    )
+
+    math(
+      EXPR RE2C_VERSION_PATCH
+      "${RE2C_VERSION_NUM} - ${RE2C_VERSION_MAJOR} * 10000 - ${RE2C_VERSION_MINOR} * 100"
+    )
+
+    set(RE2C_VERSION "${RE2C_VERSION_MAJOR}.${RE2C_VERSION_MINOR}.${RE2C_VERSION_PATCH}")
+
+    find_package_check_version("${RE2C_VERSION}" _re2c_version_valid)
+  endif()
 endif()
 
 if(RE2C_ENABLE_DOWNLOAD AND (NOT RE2C_EXECUTABLE OR NOT _re2c_version_valid))

cmake/cmake/modules/PHP/CheckFlushIo.cmake

@@ -17,6 +17,12 @@ message(CHECK_START
   "Checking whether flush should be called explicitly after a buffered io"
 )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  message(CHECK_FAIL "no")
+  set(HAVE_FLUSHIO FALSE CACHE INTERNAL "")
+  return()
+endif()
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 

cmake/main/config.w32.cmake.h.in

@@ -4,7 +4,7 @@
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
 #define _WIN32_WINNT 0x0602
-#define NTDDI_VERSION 0x06010000
+#define NTDDI_VERSION 0x06020000
 
 /* Define to 1 if the PHP extension 'bcmath' is built as a dynamic module. */
 #cmakedefine COMPILE_DL_BCMATH 1
@@ -628,6 +628,9 @@
 /* Define to 1 if libffi supports the 'FFI_VECTORCALL' calling convention. */
 #cmakedefine HAVE_FFI_VECTORCALL_PARTIAL 1
 
+/* Define to 1 if flush should be called explicitly after a buffered io. */
+#cmakedefine HAVE_FLUSHIO 1
+
 /* Define to 1 if the PHP extension 'ftp' is available. */
 #cmakedefine HAVE_FTP 1