Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/checks/CheckWrite.cmake

@@ -1,19 +1,17 @@
 #[=============================================================================[
 Check whether write(2) can successfully write to stdout.
-
 On Windows, _write() (and its deprecated alias write()) can also write to stdout
-but this PHP code uses this for POSIX targets only.
+but PHP code uses this for POSIX targets only.
 
 Result/cache variables:
 
-* PHP_WRITE_STDOUT - Whether 'write()' can write to stdout.
+* PHP_WRITE_STDOUT
 #]=============================================================================]
 
 include(CheckIncludeFiles)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
-# On Windows below check succeeds, however PHP implementation has it disabled.
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_WRITE_STDOUT FALSE)
   return()
@@ -49,12 +47,17 @@ cmake_push_check_state(RESET)
     # include <unistd.h>
     #endif
 
+    #ifdef _WIN32
+    # include <io.h>
+    # undef write
+    # define write _write
+    #endif
+
     #define TEXT "This is the test message -- "
 
     int main(void)
     {
       int n;
-
       n = write(1, TEXT, sizeof(TEXT)-1);
       return (!(n == sizeof(TEXT)-1));
     }

cmake/cmake/platforms/Windows.cmake

@@ -86,7 +86,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_IF_NAMETOINDEX FALSE)
   set(HAVE_IFADDRS_H FALSE)
   set(HAVE_IMMINTRIN_H TRUE)
-  set(HAVE_IO_H TRUE)
   set(HAVE_ISSETUGID FALSE)
   set(HAVE_KILL FALSE)
   set(HAVE_LANGINFO_H FALSE)

cmake/ext/date/cmake/config.h.in

@@ -1,5 +1,2 @@
-/* Define to 1 if you have the <io.h> header file. */
-#cmakedefine HAVE_IO_H 1
-
 /* Define to 1 if you have the <timelib_config.h> header file. */
 #cmakedefine HAVE_TIMELIB_CONFIG_H 1

cmake/ext/date/lib/CMakeLists.txt

@@ -36,7 +36,6 @@ project(
 )
 
 include(CheckCompilerFlag)
-include(CheckIncludeFiles)
 
 if(NOT TIMELIB_TARGET)
   set(TIMELIB_TARGET timelib)
@@ -92,7 +91,9 @@ if(_timelib_HAVE_FWRAPV)
   )
 endif()
 
-check_include_files(io.h HAVE_IO_H)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_IO_H TRUE)
+endif()
 
 cmake_path(
   RELATIVE_PATH