Skip to content

Commit 92e6167

Browse files
committed
Merge branch 'PHP-8.3'
2 parents 578fe74 + c2615c4 commit 92e6167

File tree

2 files changed

+58
-5
lines changed

2 files changed

+58
-5
lines changed

cmake/ext/posix/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ target_sources(
4343

4444
target_compile_definitions(php_posix PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
4545

46+
check_symbol_exists(ctermid "stdio.h" HAVE_CTERMID)
4647
cmake_push_check_state(RESET)
4748
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
4849
check_symbol_exists(eaccess "unistd.h" HAVE_EACCESS)
4950
cmake_pop_check_state()
50-
51-
check_symbol_exists(ctermid "stdio.h" HAVE_CTERMID)
5251
check_symbol_exists(getgrgid_r "grp.h" HAVE_GETGRGID_R)
5352
check_symbol_exists(getgroups "unistd.h" HAVE_GETGROUPS)
5453
check_symbol_exists(getpgid "unistd.h" HAVE_GETPGID)

cmake/main/config.w32.cmake.h.in

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,9 @@
559559
/* Define to 1 if Capstone is available. */
560560
#cmakedefine HAVE_CAPSTONE 1
561561

562+
/* Define to 1 if you have the 'ctermid' function. */
563+
#cmakedefine HAVE_CTERMID 1
564+
562565
/* Define to 1 if the PHP extension 'ctype' is available. */
563566
#cmakedefine HAVE_CTYPE 1
564567

@@ -571,9 +574,6 @@
571574
/* Define to 1 if the PHP extension 'dba' is available. */
572575
#cmakedefine HAVE_DBA 1
573576

574-
/* Define to 1 if you have the <timelib_config.h> header file. */
575-
#cmakedefine HAVE_TIMELIB_CONFIG_H 1
576-
577577
/* Define to 1 if you have the 'dcngettext' function. */
578578
#cmakedefine HAVE_DCNGETTEXT 1
579579

@@ -586,6 +586,9 @@
586586
/* Define to 1 if you have the 'elf_aux_info' function. */
587587
#cmakedefine HAVE_ELF_AUX_INFO 1
588588

589+
/* Define to 1 if you have the 'eaccess' function. */
590+
#cmakedefine HAVE_EACCESS 1
591+
589592
/* Define to 1 if the PHP extension 'enchant' is available. */
590593
#cmakedefine HAVE_ENCHANT 1
591594

@@ -637,6 +640,9 @@
637640
/* Define to 1 if flush should be called explicitly after a buffered io. */
638641
#cmakedefine HAVE_FLUSHIO 1
639642

643+
/* Define to 1 if you have the 'fpathconf' function. */
644+
#cmakedefine HAVE_FPATHCONF 1
645+
640646
/* Define to 1 if the PHP extension 'ftp' is available. */
641647
#cmakedefine HAVE_FTP 1
642648

@@ -689,9 +695,27 @@
689695
/* Define to 1 if iconv implementation is glibc. */
690696
#cmakedefine HAVE_GLIBC_ICONV 1
691697

698+
/* Define to 1 if you have the 'getgrgid_r' function. */
699+
#cmakedefine HAVE_GETGRGID_R 1
700+
701+
/* Define to 1 if you have the 'getgroups' function. */
702+
#cmakedefine HAVE_GETGROUPS 1
703+
704+
/* Define to 1 if you have the 'getpgid' function. */
705+
#cmakedefine HAVE_GETPGID 1
706+
707+
/* Define to 1 if you have the 'getrlimit' function. */
708+
#cmakedefine HAVE_GETRLIMIT 1
709+
710+
/* Define to 1 if you have the 'getsid' function. */
711+
#cmakedefine HAVE_GETSID 1
712+
692713
/* Define to 1 if iconv implementation is IBM. */
693714
#cmakedefine HAVE_IBM_ICONV 1
694715

716+
/* Define to 1 if you have the 'initgroups' function. */
717+
#cmakedefine HAVE_INITGROUPS 1
718+
695719
/* Define to 1 if you have the libavif library. */
696720
#cmakedefine HAVE_LIBAVIF 1
697721

@@ -716,9 +740,18 @@
716740
/* Define to 1 if you have the libwebp library. */
717741
#cmakedefine HAVE_LIBWEBP 1
718742

743+
/* Define to 1 if you have the 'mkfifo' function. */
744+
#cmakedefine HAVE_MKFIFO 1
745+
746+
/* Define to 1 if you have the 'mknod' function. */
747+
#cmakedefine HAVE_MKNOD 1
748+
719749
/* Define to 1 if you have the 'ngettext' function. */
720750
#cmakedefine HAVE_NGETTEXT 1
721751

752+
/* Define to 1 if you have the 'pathconf' function. */
753+
#cmakedefine HAVE_PATHCONF 1
754+
722755
/* Define to 1 if the PHP extension 'pgsql' is available. */
723756
#cmakedefine HAVE_PGSQL 1
724757

@@ -731,6 +764,9 @@
731764
/* Define to 1 if the PHP extension 'pdo_pgsql' is available. */
732765
#cmakedefine HAVE_PDO_PGSQL 1
733766

767+
/* Define to 1 if the PHP extension 'posix' is available. */
768+
#cmakedefine HAVE_POSIX 1
769+
734770
/* Define to 1 if edit/readline library has the 'rl_callback_read_char'
735771
function. */
736772
#cmakedefine HAVE_RL_CALLBACK_READ_CHAR 1
@@ -799,9 +835,24 @@
799835
/* Define to 1 if mbstring has multibyte regex support enabled. */
800836
#cmakedefine HAVE_MBREGEX 1
801837

838+
/* Define to 1 if you have the 'setegid' function. */
839+
#cmakedefine HAVE_SETEGID 1
840+
841+
/* Define to 1 if you have the 'seteuid' function. */
842+
#cmakedefine HAVE_SETEUID 1
843+
844+
/* Define to 1 if you have the 'setrlimit' function. */
845+
#cmakedefine HAVE_SETRLIMIT 1
846+
847+
/* Define to 1 if you have the 'setsid' function. */
848+
#cmakedefine HAVE_SETSID 1
849+
802850
/* Define to 1 if the odbc extension uses the Solid DB. */
803851
#cmakedefine HAVE_SOLID 1
804852

853+
/* Define to 1 if 'domainname' is a member of 'struct utsname'. */
854+
#cmakedefine HAVE_STRUCT_UTSNAME_DOMAINNAME 1
855+
805856
/* Define to 1 if oniguruma has an invalid entry for KOI8 encoding. */
806857
#cmakedefine PHP_ONIG_BAD_KOI8_ENTRY 1
807858

@@ -975,6 +1026,9 @@
9751026
/* Define to 1 if the system has the type 'union semun'. */
9761027
#cmakedefine HAVE_UNION_SEMUN 1
9771028

1029+
/* Define to 1 if you have the <timelib_config.h> header file. */
1030+
#cmakedefine HAVE_TIMELIB_CONFIG_H 1
1031+
9781032
/* Define to 1 if SQLite library was compiled with the
9791033
SQLITE_OMIT_LOAD_EXTENSION and does not have the extension support with the
9801034
'sqlite3_load_extension' function. For usage in the sqlite3 PHP extension.

0 commit comments

Comments
 (0)