Skip to content

Commit 331ad0b

Browse files
committed
Merge branch 'PHP-8.4'
Sync with upstream: PHP_CHECK_SIZEOF([ssize_t]) check is removed.
2 parents 26184c0 + 8f376ef commit 331ad0b

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

cmake/cmake/ConfigureChecks.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,6 @@ if(SIZEOF_SIZE_T STREQUAL "")
191191
set(SIZEOF_SIZE_T_CODE "#define SIZEOF_SIZE_T 0")
192192
endif()
193193

194-
check_type_size("ssize_t" SIZEOF_SSIZE_T)
195-
if(SIZEOF_SSIZE_T STREQUAL "")
196-
set(SIZEOF_SSIZE_T_CODE "#define SIZEOF_SSIZE_T 0")
197-
endif()
198-
199194
check_type_size("uid_t" SIZEOF_UID_T)
200195
if(NOT HAVE_SIZEOF_UID_T)
201196
set(

cmake/main/cmake/php_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,6 @@
632632
/* The size of 'size_t', as computed by sizeof. */
633633
@SIZEOF_SIZE_T_CODE@
634634

635-
/* The size of 'ssize_t', as computed by sizeof. */
636-
@SIZEOF_SSIZE_T_CODE@
637-
638635
@PHP_SYSTEM_EXTENSIONS_CODE@
639636

640637
/* Define if processor uses big-endian word. */

docs/evolution.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,13 @@ PHP coding standards now use the C11 standard.
959959
`--with-libdir` configure options (e.g.,
960960
`--libdir=/usr/lib64 --with-libdir=lib64` will set `libdir` to
961961
`/usr/lib64/php`).
962+
* Autoconf macro `PHP_AP_EXTRACT_VERSION` has been removed.
963+
* Autoconf macro `PHP_BUILD_THREAD_SAFE` has been removed (set `enable_zts`
964+
variable manually).
965+
* Autoconf macro `PHP_CHECK_SIZEOF` is obsolete (use `AC_CHECK_SIZEOF`).
966+
* Autoconf macro `PHP_DEF_HAVE` has been removed (use `AC_DEFINE`).
967+
* Autoconf macro `PHP_OUTPUT` has been removed (use `AC_CONFIG_FILES`).
968+
* Autoconf macro `PHP_TEST_BUILD` has been removed (use `AC_*` macros).
962969
963970
##### Changes to main/php_config.h
964971
@@ -967,6 +974,8 @@ PHP coding standards now use the C11 standard.
967974
instead of the `build-defs.h` header.
968975
* The `HAVE_INTMAX_T` preprocessor macro has been removed.
969976
* The `HAVE_PTRDIFF_T` preprocessor macro has been removed.
977+
* The `HAVE_SSIZE_T` preprocessor macro has been removed.
978+
* The `SIZEOF_SSIZE_T` preprocessor macro has been removed.
970979
971980
#### Windows
972981

0 commit comments

Comments
 (0)