Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -411,6 +411,7 @@ cmake_push_check_state(RESET)
 cmake_pop_check_state()
 
 check_symbol_exists(pthread_stackseg_np pthread.h HAVE_PTHREAD_STACKSEG_NP)
+check_symbol_exists(strnlen string.h HAVE_STRNLEN)
 
 # Check for sigsetjmp(). It can be a function or defined as a macro. Note, that
 # POSIX.1-2001-compliant systems should have it. On Windows the setjmp() is

cmake/Zend/cmake/zend_config.h.in

@@ -68,6 +68,9 @@
 /* Define if you have 'strerror_r'. */
 #cmakedefine HAVE_STRERROR_R 1
 
+/* Define to 1 if you have the 'strnlen' function. */
+#cmakedefine HAVE_STRNLEN 1
+
 /* Define to 1 if strerror_r returns char *. */
 #cmakedefine STRERROR_R_CHAR_P 1
 

cmake/cmake/ConfigureChecks.cmake

@@ -339,7 +339,6 @@ endblock()
 check_symbol_exists(statvfs sys/statvfs.h HAVE_STATVFS)
 check_symbol_exists(std_syslog sys/syslog.h HAVE_STD_SYSLOG)
 check_symbol_exists(strcasecmp strings.h HAVE_STRCASECMP)
-check_symbol_exists(strnlen string.h HAVE_STRNLEN)
 check_symbol_exists(symlink unistd.h HAVE_SYMLINK)
 check_symbol_exists(tzset time.h HAVE_TZSET)
 check_symbol_exists(unsetenv stdlib.h HAVE_UNSETENV)

cmake/main/cmake/php_config.h.in

@@ -364,9 +364,6 @@
 /* Define to 1 if you have the 'strndup' function. */
 #cmakedefine HAVE_STRNDUP 1
 
-/* Define to 1 if you have the 'strnlen' function. */
-#cmakedefine HAVE_STRNLEN 1
-
 /* Define to 1 if you have the 'strtok_r' function. */
 #cmakedefine HAVE_STRTOK_R 1