Sync CS

Author: petk

cmake/Zend/CMakeLists.txt

@@ -396,19 +396,19 @@ install(
 check_include_files(cpuid.h HAVE_CPUID_H)
 check_include_files(libproc.h HAVE_LIBPROC_H)
 
-check_symbol_exists(getpid "unistd.h" HAVE_GETPID)
+check_symbol_exists(getpid unistd.h HAVE_GETPID)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(gettid "unistd.h" HAVE_GETTID)
+  check_symbol_exists(gettid unistd.h HAVE_GETTID)
 cmake_pop_check_state()
 
-check_symbol_exists(kill "signal.h" HAVE_KILL)
-check_symbol_exists(mempcpy "string.h" HAVE_MEMPCPY)
+check_symbol_exists(kill signal.h HAVE_KILL)
+check_symbol_exists(mempcpy string.h HAVE_MEMPCPY)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(mremap "sys/mman.h" HAVE_MREMAP)
+  check_symbol_exists(mremap sys/mman.h HAVE_MREMAP)
 cmake_pop_check_state()
 
 # BSD-based systems have pthread_attr_get_np in pthread_np.h.
@@ -430,28 +430,28 @@ endblock()
 
 check_symbol_exists(
   pthread_attr_getstack
-  "pthread.h"
+  pthread.h
   HAVE_PTHREAD_ATTR_GETSTACK
 )
 
 check_symbol_exists(
   pthread_get_stackaddr_np
-  "pthread.h"
+  pthread.h
   HAVE_PTHREAD_GET_STACKADDR_NP
 )
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(pthread_getattr_np "pthread.h" HAVE_PTHREAD_GETATTR_NP)
+  check_symbol_exists(pthread_getattr_np pthread.h HAVE_PTHREAD_GETATTR_NP)
 cmake_pop_check_state()
 
-check_symbol_exists(pthread_stackseg_np "pthread.h" HAVE_PTHREAD_STACKSEG_NP)
+check_symbol_exists(pthread_stackseg_np pthread.h HAVE_PTHREAD_STACKSEG_NP)
 
 # 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
 # used instead.
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  check_symbol_exists(sigsetjmp "setjmp.h" _HAVE_SIGSETJMP)
+  check_symbol_exists(sigsetjmp setjmp.h _HAVE_SIGSETJMP)
   if(NOT _HAVE_SIGSETJMP)
     message(
       FATAL_ERROR
@@ -526,7 +526,7 @@ include(cmake/CheckStrerrorR.cmake)
 ################################################################################
 
 message(CHECK_START "Checking whether to enable Zend signal handling")
-check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
+check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
 if(HAVE_SIGACTION AND ZEND_SIGNALS)
   message(CHECK_PASS "yes")
 

cmake/cmake/ConfigureChecks.cmake

@@ -254,9 +254,9 @@ include(PHP/CheckAVX512)
 # Check functions.
 ################################################################################
 
-check_symbol_exists(alphasort "dirent.h" HAVE_ALPHASORT)
-check_symbol_exists(explicit_memset "string.h" HAVE_EXPLICIT_MEMSET)
-check_symbol_exists(fdatasync "unistd.h" HAVE_FDATASYNC)
+check_symbol_exists(alphasort dirent.h HAVE_ALPHASORT)
+check_symbol_exists(explicit_memset string.h HAVE_EXPLICIT_MEMSET)
+check_symbol_exists(fdatasync unistd.h HAVE_FDATASYNC)
 # The fdatasync declaration on macOS is missing in headers, yet is in C library.
 if(NOT HAVE_FDATASYNC)
   unset(HAVE_FDATASYNC CACHE)
@@ -275,9 +275,9 @@ block()
   check_symbol_exists(flock "${headers}" HAVE_FLOCK)
 endblock()
 
-check_symbol_exists(ftok "sys/ipc.h" HAVE_FTOK)
-check_symbol_exists(funopen "stdio.h" HAVE_FUNOPEN)
-check_symbol_exists(getcwd "unistd.h" HAVE_GETCWD)
+check_symbol_exists(ftok sys/ipc.h HAVE_FTOK)
+check_symbol_exists(funopen stdio.h HAVE_FUNOPEN)
+check_symbol_exists(getcwd unistd.h HAVE_GETCWD)
 
 block()
   set(headers stdlib.h)
@@ -295,39 +295,39 @@ 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)
-check_symbol_exists(getgrnam_r "grp.h" HAVE_GETGRNAM_R)
-check_symbol_exists(getpwuid_r "pwd.h" HAVE_GETPWUID_R)
-check_symbol_exists(getwd "unistd.h" HAVE_GETWD)
-check_symbol_exists(glob "glob.h" HAVE_GLOB)
-check_symbol_exists(lchown "unistd.h" HAVE_LCHOWN)
-check_symbol_exists(memcntl "sys/mman.h" HAVE_MEMCNTL)
+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)
+check_symbol_exists(getgrnam_r grp.h HAVE_GETGRNAM_R)
+check_symbol_exists(getpwuid_r pwd.h HAVE_GETPWUID_R)
+check_symbol_exists(getwd unistd.h HAVE_GETWD)
+check_symbol_exists(glob glob.h HAVE_GLOB)
+check_symbol_exists(lchown unistd.h HAVE_LCHOWN)
+check_symbol_exists(memcntl sys/mman.h HAVE_MEMCNTL)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(memfd_create "sys/mman.h" HAVE_MEMFD_CREATE)
+  check_symbol_exists(memfd_create sys/mman.h HAVE_MEMFD_CREATE)
 cmake_pop_check_state()
 
-check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
-check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
-check_symbol_exists(nice "unistd.h" HAVE_NICE)
-check_symbol_exists(nl_langinfo "langinfo.h" HAVE_NL_LANGINFO)
-check_symbol_exists(prctl "sys/prctl.h" HAVE_PRCTL)
-check_symbol_exists(procctl "sys/procctl.h" HAVE_PROCCTL)
-check_symbol_exists(poll "poll.h" HAVE_POLL)
+check_symbol_exists(mkstemp stdlib.h HAVE_MKSTEMP)
+check_symbol_exists(mmap sys/mman.h HAVE_MMAP)
+check_symbol_exists(nice unistd.h HAVE_NICE)
+check_symbol_exists(nl_langinfo langinfo.h HAVE_NL_LANGINFO)
+check_symbol_exists(prctl sys/prctl.h HAVE_PRCTL)
+check_symbol_exists(procctl sys/procctl.h HAVE_PROCCTL)
+check_symbol_exists(poll poll.h HAVE_POLL)
 check_symbol_exists(
   pthread_jit_write_protect_np
-  "pthread.h"
+  pthread.h
   HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
 )
-check_symbol_exists(putenv "stdlib.h" HAVE_PUTENV)
-check_symbol_exists(scandir "dirent.h" HAVE_SCANDIR)
-check_symbol_exists(setitimer "sys/time.h" HAVE_SETITIMER)
-check_symbol_exists(setenv "stdlib.h" HAVE_SETENV)
-check_symbol_exists(sigprocmask "signal.h" HAVE_SIGPROCMASK)
+check_symbol_exists(putenv stdlib.h HAVE_PUTENV)
+check_symbol_exists(scandir dirent.h HAVE_SCANDIR)
+check_symbol_exists(setitimer sys/time.h HAVE_SETITIMER)
+check_symbol_exists(setenv stdlib.h HAVE_SETENV)
+check_symbol_exists(sigprocmask signal.h HAVE_SIGPROCMASK)
 
 # Check for statfs().
 block()
@@ -345,39 +345,39 @@ block()
   check_symbol_exists(statfs "${headers}" HAVE_STATFS)
 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)
-check_symbol_exists(usleep "unistd.h" HAVE_USLEEP)
-check_symbol_exists(utime "utime.h" HAVE_UTIME)
+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)
+check_symbol_exists(usleep unistd.h HAVE_USLEEP)
+check_symbol_exists(utime utime.h HAVE_UTIME)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(vasprintf "stdio.h" HAVE_VASPRINTF)
+  check_symbol_exists(vasprintf stdio.h HAVE_VASPRINTF)
 cmake_pop_check_state()
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(asprintf "stdio.h" HAVE_ASPRINTF)
+  check_symbol_exists(asprintf stdio.h HAVE_ASPRINTF)
 cmake_pop_check_state()
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(memmem "string.h" HAVE_MEMMEM)
+  check_symbol_exists(memmem string.h HAVE_MEMMEM)
 cmake_pop_check_state()
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(memrchr "string.h" HAVE_MEMRCHR)
+  check_symbol_exists(memrchr string.h HAVE_MEMRCHR)
 cmake_pop_check_state()
 
-check_symbol_exists(strlcat "string.h" HAVE_STRLCAT)
-check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
-check_symbol_exists(explicit_bzero "string.h" HAVE_EXPLICIT_BZERO)
+check_symbol_exists(strlcat string.h HAVE_STRLCAT)
+check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
+check_symbol_exists(explicit_bzero string.h HAVE_EXPLICIT_BZERO)
 
 # Check reentrant functions.
 include(PHP/CheckReentrantFunctions)
@@ -444,12 +444,12 @@ include(PHP/CheckFlushIo)
 
 if(HAVE_ALLOCA_H)
   # Most *.nix systems.
-  check_symbol_exists(alloca "alloca.h" HAVE_ALLOCA)
+  check_symbol_exists(alloca alloca.h HAVE_ALLOCA)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  check_symbol_exists(alloca "malloc.h" HAVE_ALLOCA)
+  check_symbol_exists(alloca malloc.h HAVE_ALLOCA)
 else()
   # BSD-based systems.
-  check_symbol_exists(alloca "stdlib.h" HAVE_ALLOCA)
+  check_symbol_exists(alloca stdlib.h HAVE_ALLOCA)
 endif()
 
 message(CHECK_START "Checking whether the compiler supports __alignof__")

cmake/ext/fileinfo/CMakeLists.txt

@@ -92,15 +92,15 @@ include(PHP/CheckSysMacros)
 # The strcasestr is missing on Windows and Solaris <= 10 (Solaris 11 has it).
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(strcasestr "string.h" HAVE_STRCASESTR)
+  check_symbol_exists(strcasestr string.h HAVE_STRCASESTR)
 cmake_pop_check_state()
 if(NOT HAVE_STRCASESTR)
   message(STATUS "Using libmagic strcasestr implementation")
   target_sources(php_ext_fileinfo PRIVATE libmagic/strcasestr.c)
 endif()
 
-check_symbol_exists(strndup "string.h" HAVE_STRNDUP)
-check_symbol_exists(utimes "sys/time.h" HAVE_UTIMES)
+check_symbol_exists(strndup string.h HAVE_STRNDUP)
+check_symbol_exists(utimes sys/time.h HAVE_UTIMES)
 
 php_check_function_attribute(visibility HAVE_FUNC_ATTRIBUTE_VISIBILITY)
 

cmake/ext/opcache/CMakeLists.txt

@@ -330,7 +330,7 @@ add_feature_info(
 check_symbol_exists(mprotect sys/mman.h HAVE_MPROTECT)
 
 # For FreeBSD.
-check_symbol_exists(shm_create_largepage "sys/mman.h" HAVE_SHM_CREATE_LARGEPAGE)
+check_symbol_exists(shm_create_largepage sys/mman.h HAVE_SHM_CREATE_LARGEPAGE)
 
 # Check for shared memory support.
 include(cmake/CheckSHM.cmake)

cmake/ext/openssl/CMakeLists.txt

@@ -208,7 +208,7 @@ if(TARGET OpenSSL::SSL)
       set(CMAKE_REQUIRED_LIBRARIES OpenSSL::SSL)
       check_symbol_exists(
         OSSL_set_max_threads
-        "openssl/thread.h"
+        openssl/thread.h
         HAVE_OPENSSL_ARGON2
       )
     cmake_pop_check_state()

cmake/ext/pcntl/CMakeLists.txt

@@ -87,9 +87,9 @@ target_compile_definitions(php_ext_pcntl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE
 
 # Check for required functions.
 block()
-  check_symbol_exists(fork "unistd.h" HAVE_FORK)
-  check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
-  check_symbol_exists(waitpid "sys/wait.h" HAVE_WAITPID)
+  check_symbol_exists(fork unistd.h HAVE_FORK)
+  check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
+  check_symbol_exists(waitpid sys/wait.h HAVE_WAITPID)
 
   foreach(function fork sigaction waitpid)
     string(TOUPPER ${function} const)
@@ -102,36 +102,36 @@ block()
   endforeach()
 endblock()
 
-check_symbol_exists(forkx "sys/fork.h" HAVE_FORKX)
-check_symbol_exists(getcpuid "sys/processor.h" HAVE_GETCPUID)
-check_symbol_exists(getpriority "sys/resource.h" HAVE_GETPRIORITY)
-check_symbol_exists(pset_bind "sys/pset.h" HAVE_PSET_BIND)
+check_symbol_exists(forkx sys/fork.h HAVE_FORKX)
+check_symbol_exists(getcpuid sys/processor.h HAVE_GETCPUID)
+check_symbol_exists(getpriority sys/resource.h HAVE_GETPRIORITY)
+check_symbol_exists(pset_bind sys/pset.h HAVE_PSET_BIND)
 check_symbol_exists(
   pthread_set_qos_class_self_np
-  "pthread/qos.h"
+  pthread/qos.h
   HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
 )
-check_symbol_exists(rfork "unistd.h" HAVE_RFORK)
+check_symbol_exists(rfork unistd.h HAVE_RFORK)
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
+  check_symbol_exists(sched_setaffinity sched.h HAVE_SCHED_SETAFFINITY)
 cmake_pop_check_state()
-check_symbol_exists(setpriority "sys/resource.h" HAVE_SETPRIORITY)
-check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)
-check_symbol_exists(sigwaitinfo "signal.h" HAVE_SIGWAITINFO)
-check_symbol_exists(SYS_pidfd_open "sys/syscall.h" HAVE_PIDFD_OPEN)
+check_symbol_exists(setpriority sys/resource.h HAVE_SETPRIORITY)
+check_symbol_exists(sigtimedwait signal.h HAVE_SIGTIMEDWAIT)
+check_symbol_exists(sigwaitinfo signal.h HAVE_SIGWAITINFO)
+check_symbol_exists(SYS_pidfd_open sys/syscall.h HAVE_PIDFD_OPEN)
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(unshare "sched.h" HAVE_UNSHARE)
+  check_symbol_exists(unshare sched.h HAVE_UNSHARE)
 cmake_pop_check_state()
-check_symbol_exists(wait3 "sys/wait.h" HAVE_WAIT3)
-check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
-check_symbol_exists(waitid "sys/wait.h" HAVE_WAITID)
-check_symbol_exists(WCONTINUED "sys/wait.h" HAVE_DECL_WCONTINUED)
-check_symbol_exists(WEXITED "sys/wait.h" HAVE_DECL_WEXITED)
-check_symbol_exists(WIFCONTINUED "sys/wait.h" HAVE_WIFCONTINUED)
-check_symbol_exists(WNOWAIT "sys/wait.h" HAVE_DECL_WNOWAIT)
-check_symbol_exists(WSTOPPED "sys/wait.h" HAVE_DECL_WSTOPPED)
+check_symbol_exists(wait3 sys/wait.h HAVE_WAIT3)
+check_symbol_exists(wait4 sys/wait.h HAVE_WAIT4)
+check_symbol_exists(waitid sys/wait.h HAVE_WAITID)
+check_symbol_exists(WCONTINUED sys/wait.h HAVE_DECL_WCONTINUED)
+check_symbol_exists(WEXITED sys/wait.h HAVE_DECL_WEXITED)
+check_symbol_exists(WIFCONTINUED sys/wait.h HAVE_WIFCONTINUED)
+check_symbol_exists(WNOWAIT sys/wait.h HAVE_DECL_WNOWAIT)
+check_symbol_exists(WSTOPPED sys/wait.h HAVE_DECL_WSTOPPED)
 
 cmake_push_check_state(RESET)
   # Some of these enum values require _GNU_SOURCE.

cmake/ext/pdo_pgsql/CMakeLists.txt

@@ -87,7 +87,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     set(CMAKE_REQUIRED_LIBRARIES PostgreSQL::PostgreSQL)
 
     # PostgreSQL library minimum version sanity check.
-    check_symbol_exists(PQencryptPasswordConn "libpq-fe.h" _PHP_LIBPQ_CHECK)
+    check_symbol_exists(PQencryptPasswordConn libpq-fe.h _PHP_LIBPQ_CHECK)
     if(NOT _PHP_LIBPQ_CHECK)
       message(
         FATAL_ERROR
@@ -100,7 +100,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
-        "libpq-fe.h"
+        libpq-fe.h
         HAVE_PG_RESULT_MEMORY_SIZE
       )
     endif()
@@ -110,12 +110,12 @@ if(TARGET PostgreSQL::PostgreSQL)
       # Indicates the presence of PQclosePrepared, PQclosePortal, etc.
       check_symbol_exists(
         LIBPQ_HAS_CLOSE_PREPARED
-        "libpq-fe.h"
+        libpq-fe.h
         _PHP_HAVE_LIBPQ_HAS_CLOSE_PREPARED
       )
       check_symbol_exists(
         PQclosePrepared
-        "libpq-fe.h"
+        libpq-fe.h
         _PHP_HAVE_PQCLOSEPREPARED
       )
       if(_PHP_HAVE_LIBPQ_HAS_CLOSE_PREPARED AND _PHP_HAVE_PQCLOSEPREPARED)