Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -133,31 +133,6 @@ cmake_pop_check_state()
 # Check types.
 ################################################################################
 
-check_type_size("int" SIZEOF_INT)
-if(NOT SIZEOF_INT)
-  message(FATAL_ERROR "Cannot determine size of int.")
-endif()
-
-check_type_size("long" SIZEOF_LONG)
-if(NOT SIZEOF_LONG)
-  message(FATAL_ERROR "Cannot determine size of long.")
-endif()
-
-check_type_size("long long" SIZEOF_LONG_LONG)
-if(NOT SIZEOF_LONG_LONG)
-  message(FATAL_ERROR "Cannot determine size of long long.")
-endif()
-
-check_type_size("size_t" SIZEOF_SIZE_T)
-if(NOT HAVE_SIZEOF_SIZE_T)
-  message(FATAL_ERROR "Cannot determine size of size_t.")
-endif()
-
-check_type_size("off_t" SIZEOF_OFF_T)
-if(NOT SIZEOF_OFF_T)
-  message(FATAL_ERROR "Cannot determine size of off_t.")
-endif()
-
 check_type_size("gid_t" SIZEOF_GID_T)
 if(NOT HAVE_SIZEOF_GID_T)
   set(
@@ -166,31 +141,46 @@ if(NOT HAVE_SIZEOF_GID_T)
   )
 endif()
 
-check_type_size("uid_t" SIZEOF_UID_T)
-if(NOT HAVE_SIZEOF_UID_T)
-  set(
-    uid_t int
-    CACHE INTERNAL "Define as 'int' if <sys/types.h> doesn't define."
-  )
-endif()
+check_type_size("int" SIZEOF_INT)
 
 check_type_size("intmax_t" SIZEOF_INTMAX_T)
 if(NOT SIZEOF_INTMAX_T)
   set(SIZEOF_INTMAX_T 0 CACHE INTERNAL "Size of intmax_t")
   message(WARNING "Couldn't determine size of intmax_t, setting to 0.")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  # PHP on Windows sets the SIZEOF_INTMAX_T to 0 to skip certain checks,
+  # otherwise intmax_t and its size is available.
+  set(SIZEOF_INTMAX_T 0 CACHE INTERNAL "Size of intmax_t")
 endif()
 
-check_type_size("ssize_t" SIZEOF_SSIZE_T)
-if(NOT SIZEOF_SSIZE_T)
-  set(SIZEOF_SSIZE_T 8 CACHE INTERNAL "Size of ssize_t")
-  message(WARNING "Couldn't determine size of ssize_t, setting to 8.")
-endif()
+check_type_size("long" SIZEOF_LONG)
+check_type_size("long long" SIZEOF_LONG_LONG)
+check_type_size("off_t" SIZEOF_OFF_T)
 
 check_type_size("ptrdiff_t" SIZEOF_PTRDIFF_T)
 set(HAVE_PTRDIFF_T 1 CACHE INTERNAL "Whether ptrdiff_t is available")
 if(NOT SIZEOF_PTRDIFF_T)
-  set(SIZEOF_PTRDIFF_T 8 CACHE INTERNAL "Size of ptrdiff_t")
-  message(WARNING "Couldn't determine size of ptrdiff_t, setting to 8.")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(SIZEOF_PTRDIFF_T 4 CACHE INTERNAL "Size of ptrdiff_t")
+  else
+    set(SIZEOF_PTRDIFF_T 8 CACHE INTERNAL "Size of ptrdiff_t")
+  endif()
+
+  message(
+    WARNING
+    "Couldn't determine the ptrdiff_t size, setting it to ${SIZEOF_PTRDIFF_T}."
+  )
+endif()
+
+check_type_size("size_t" SIZEOF_SIZE_T)
+check_type_size("ssize_t" SIZEOF_SSIZE_T)
+
+check_type_size("uid_t" SIZEOF_UID_T)
+if(NOT HAVE_SIZEOF_UID_T)
+  set(
+    uid_t int
+    CACHE INTERNAL "Define as 'int' if <sys/types.h> doesn't define."
+  )
 endif()
 
 # Check for socklen_t type.

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

@@ -17,6 +17,14 @@
 # define _USE_32BIT_TIME_T 1
 #endif
 
+/* On Windows the ssize_t is not available, but there is SSIZE_T defined in
+   <BaseTsd.h>. */
+#define ssize_t SSIZE_T
+
+#define STDIN_FILENO 0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
 /* The cdb handler header file. */
 #cmakedefine CDB_INCLUDE_FILE "@CDB_INCLUDE_FILE@"
 
@@ -1920,32 +1928,36 @@
 /* The QDBM handler header file. */
 #cmakedefine QDBM_INCLUDE_FILE "@QDBM_INCLUDE_FILE@"
 
-/* int and long are still 32bit in 64bit compiles */
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-/* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */
-#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
-#define SIZEOF_INTMAX_T 0
-#define ssize_t SSIZE_T
-#ifdef _WIN64
-# define SIZEOF_SIZE_T 8
-# define SIZEOF_PTRDIFF_T 8
-#else
-# define SIZEOF_SIZE_T 4
-# define SIZEOF_PTRDIFF_T 4
-#endif
-#define SIZEOF_OFF_T 4
+/* The size of 'int', as computed by sizeof. */
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+
+/* The size of 'intmax_t', as computed by sizeof. */
+#cmakedefine SIZEOF_INTMAX_T @SIZEOF_INTMAX_T@
+
+/* The size of 'long', as computed by sizeof. */
+#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+
+/* The size of 'long long', as computed by sizeof. */
+#cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
+
+/* The size of 'off_t', as computed by sizeof. */
+#cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
+
+/* The size of 'ptrdiff_t', as computed by sizeof. */
+#cmakedefine SIZEOF_PTRDIFF_T @SIZEOF_PTRDIFF_T@
+
+/* The size of 'size_t', as computed by sizeof. */
+#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
+
+/* The size of 'ssize_t', as computed by sizeof. */
+#cmakedefine SIZEOF_SSIZE_T @SIZEOF_SSIZE_T@
 
 /* Define to 1 if SQLite library was compiled with the
    SQLITE_OMIT_LOAD_EXTENSION and does not have the extension support with the
    'sqlite3_load_extension' function. For usage in the sqlite3 PHP extension.
    See https://www.sqlite.org/compile.html. */
 #cmakedefine SQLITE_OMIT_LOAD_EXTENSION 1
 
-#define STDIN_FILENO 0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-
 /* Define to 1 to be able to use the wchar defs in the obsolete <sqlunix.h>
    header file on some FreeBSD systems. */
 #cmakedefine SS_FBX 1