Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -170,12 +170,13 @@ if(SIZEOF_INT STREQUAL "")
   set(SIZEOF_INT_CODE "#define SIZEOF_INT 0")
 endif()
 
-# TODO: PHP on Windows sets the SIZEOF_INTMAX_T to 0 to skip certain checks,
-# otherwise the intmax_t type and its size are available. Windows-related C code
-# should probably be rechecked and fixed at some point.
-check_type_size("intmax_t" SIZEOF_INTMAX_T)
-if(SIZEOF_INTMAX_T STREQUAL "" OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
+# The intmax_t is always available by C99 standard and its size varies between
+# 32-bit and 64-bit target platforms. PHP on Windows sets SIZEOF_INTMAX_T to 0,
+# otherwise the type and its size are available on Windows.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(SIZEOF_INTMAX_T_CODE "#define SIZEOF_INTMAX_T 0")
+else()
+  check_type_size("intmax_t" SIZEOF_INTMAX_T)
 endif()
 
 check_type_size("long" SIZEOF_LONG)
@@ -193,26 +194,6 @@ if(SIZEOF_OFF_T STREQUAL "")
   set(SIZEOF_OFF_T_CODE "#define SIZEOF_OFF_T 0")
 endif()
 
-# TODO: The ptrdiff_t is always available by C89 standard and its size varies
-# between 32-bit and 64-bit target platforms. Checking whether the ptrdiff_t
-# exists is redundant and is left here as PHP still checks it conditionally in
-# the intl extension.
-check_type_size("ptrdiff_t" SIZEOF_PTRDIFF_T)
-if(SIZEOF_PTRDIFF_T STREQUAL "")
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    set(SIZEOF_PTRDIFF_T 4)
-  else()
-    set(SIZEOF_PTRDIFF_T 8)
-  endif()
-  set(SIZEOF_PTRDIFF_T_CODE "#define SIZEOF_PTRDIFF_T ${SIZEOF_PTRDIFF_T}")
-
-  message(
-    WARNING
-    "Couldn't determine the ptrdiff_t size, setting it to ${SIZEOF_PTRDIFF_T}."
-  )
-endif()
-set(HAVE_PTRDIFF_T TRUE)
-
 check_type_size("size_t" SIZEOF_SIZE_T)
 if(SIZEOF_SIZE_T STREQUAL "")
   set(SIZEOF_SIZE_T_CODE "#define SIZEOF_SIZE_T 0")

cmake/main/cmake/php_config.h.in

@@ -294,9 +294,6 @@
 /* Define to 1 if you have the 'pthread_jit_write_protect_np' function. */
 #cmakedefine HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1
 
-/* Define to 1 if the system has the type 'ptrdiff_t'. */
-#cmakedefine HAVE_PTRDIFF_T 1
-
 /* Define to 1 if you have the <pty.h> header file. */
 #cmakedefine HAVE_PTY_H 1
 
@@ -629,9 +626,6 @@
 /* The size of 'off_t', as computed by sizeof. */
 @SIZEOF_OFF_T_CODE@
 
-/* The size of 'ptrdiff_t', as computed by sizeof. */
-@SIZEOF_PTRDIFF_T_CODE@
-
 /* The size of 'size_t', as computed by sizeof. */
 @SIZEOF_SIZE_T_CODE@
 

docs/evolution.md

@@ -944,6 +944,7 @@ PHP coding standards now use the C11 standard.
 * Bundled file library in ext/fileinfo upgraded to 5.46.
 * Bundled pcre2lib in ext/pcre upgraded from 10.44 to 10.45.
 * Added new extensions lexbor and uri as always enabled.
+* The `SIZEOF_PTRDIFF_T` preprocessor macro has been removed.
 
 #### Autotools
 
@@ -957,9 +958,13 @@ PHP coding standards now use the C11 standard.
   `--with-libdir` configure options (e.g.,
   `--libdir=/usr/lib64 --with-libdir=lib64` will set `libdir` to
   `/usr/lib64/php`).
-* `PHP_ODBC_CFLAGS`, `PHP_ODBC_LFLAGS`, `PHP_ODBC_LIBS`, `PHP_ODBC_TYPE`
+
+##### Changes to main/php_config.h
+
+* The `PHP_ODBC_CFLAGS`, `PHP_ODBC_LFLAGS`, `PHP_ODBC_LIBS`, and `PHP_ODBC_TYPE`
   preprocessor macros defined by ext/odbc are now defined in `php_config.h`
   instead of the `build-defs.h` header.
+* The `HAVE_PTRDIFF_T` preprocessor macro has been removed.
 
 #### Windows
 
@@ -971,8 +976,6 @@ PHP coding standards now use the C11 standard.
   `duplicate_sources` parameter. If truthy, no rules to build the object files
   are generated. This allows to build additional variants of SAPIs (e.g., a DLL
   and EXE) without duplicate build rules.
-* `HAVE_GETLOGIN` preprocessor macro removed from configuration header
-  (`main/config.w32.h`).
 
 ##### Windows configure options
 
@@ -982,4 +985,9 @@ PHP coding standards now use the C11 standard.
 * The `--with-uncritical-warn-choke` configuration option for Clang builds has
   been removed in favor of adding warning-suppressing flags via `CFLAGS`.
 
+##### Changes to main/config.w32.h
+
+* The `HAVE_GETLOGIN` preprocessor macro has been removed from configuration
+  header (`main/config.w32.h`).
+
 </details>