Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -284,7 +284,6 @@ block()
   check_symbol_exists(getloadavg "${headers}" HAVE_GETLOADAVG)
 endblock()
 
-check_symbol_exists(getlogin unistd.h HAVE_GETLOGIN)
 check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE)
 check_symbol_exists(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
 check_symbol_exists(getpwnam_r pwd.h HAVE_GETPWNAM_R)

cmake/cmake/platforms/Windows.cmake

@@ -77,7 +77,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_GCC_GLOBAL_REGS FALSE)
   set(HAVE_GETGRNAM_R FALSE)
   set(HAVE_GETLOADAVG FALSE)
-  set(HAVE_GETLOGIN FALSE)
   set(HAVE_GETPWNAM_R FALSE)
   set(HAVE_GETPWUID_R FALSE)
   set(HAVE_GETRANDOM FALSE)

cmake/ext/posix/CMakeLists.txt

@@ -83,6 +83,7 @@ cmake_push_check_state(RESET)
 cmake_pop_check_state()
 check_symbol_exists(getgrgid_r grp.h HAVE_GETGRGID_R)
 check_symbol_exists(getgroups unistd.h HAVE_GETGROUPS)
+check_symbol_exists(getlogin unistd.h HAVE_GETLOGIN)
 check_symbol_exists(getpgid unistd.h HAVE_GETPGID)
 check_symbol_exists(getrlimit sys/resource.h HAVE_GETRLIMIT)
 check_symbol_exists(getsid unistd.h HAVE_GETSID)

cmake/ext/posix/cmake/config.h.in

@@ -13,6 +13,9 @@
 /* Define to 1 if you have the 'getgroups' function. */
 #cmakedefine HAVE_GETGROUPS 1
 
+/* Define to 1 if you have the 'getlogin' function. */
+#cmakedefine HAVE_GETLOGIN 1
+
 /* Define to 1 if you have the 'getpgid' function. */
 #cmakedefine HAVE_GETPGID 1
 

cmake/main/cmake/php_config.h.in

@@ -175,9 +175,6 @@
 /* Define to 1 if you have the 'getloadavg' function. */
 #cmakedefine HAVE_GETLOADAVG 1
 
-/* Define to 1 if you have the 'getlogin' function. */
-#cmakedefine HAVE_GETLOGIN 1
-
 /* Define to 1 if you have the 'getprotobyname' function. */
 #cmakedefine HAVE_GETPROTOBYNAME 1