Skip to content

Commit 1c53425

Browse files
petkpetk
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 5793e45 + 9db82a5 commit 1c53425

File tree

2 files changed

+188
-6
lines changed

2 files changed

+188
-6
lines changed

‎cmake/cmake/ConfigureChecks.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,11 @@ php_search_libraries(
696696
socket # Solaris <= 11.3, illumos
697697
network # Haiku
698698
ws2_32 # Windows
699-
VARIABLE PHP_HAS_GETPROBYNUMBER
700-
LIBRARY_VARIABLE PHP_HAS_GETPROBYNUMBER_LIBRARY
699+
VARIABLE PHP_HAS_GETPROTOBYNUMBER
700+
LIBRARY_VARIABLE PHP_HAS_GETPROTOBYNUMBER_LIBRARY
701701
TARGET php_config INTERFACE
702702
)
703-
set(HAVE_GETPROTOBYNUMBER ${PHP_HAS_GETPROBYNUMBER})
703+
set(HAVE_GETPROTOBYNUMBER ${PHP_HAS_GETPROTOBYNUMBER})
704704

705705
# The getservbyname() is mostly in C library (Solaris 11.4...)
706706
php_search_libraries(

‎cmake/cmake/platforms/Windows.cmake‎

Lines changed: 185 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,173 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
5454
# known on Windows targets.
5555
##############################################################################
5656

57+
set(HAVE_ALIGNOF FALSE)
58+
set(HAVE_ALLOCA TRUE)
5759
set(HAVE_ALLOCA_H FALSE)
60+
set(HAVE_ALPHASORT FALSE)
61+
set(HAVE_ARC4RANDOM_BUF FALSE)
62+
set(HAVE_ARPA_INET_H FALSE)
63+
set(HAVE_ARPA_NAMESER_H FALSE)
64+
set(HAVE_ASPRINTF FALSE)
65+
set(HAVE_CHROOT FALSE)
66+
set(HAVE_CLOCK_GETTIME_NSEC_NP FALSE)
67+
set(HAVE_COMMONCRYPTO_COMMONRANDOM_H FALSE)
68+
set(HAVE_CPUID_H FALSE)
5869
set(HAVE_DIRENT_H FALSE)
70+
set(HAVE_DLFCN_H FALSE)
71+
set(HAVE_DNS_H FALSE)
72+
set(HAVE_ELF_AUX_INFO FALSE)
73+
set(HAVE_EXPLICIT_BZERO FALSE)
74+
set(HAVE_EXPLICIT_MEMSET FALSE)
75+
set(HAVE_FCNTL_H TRUE)
76+
set(HAVE_FDATASYNC FALSE)
5977
set(HAVE_FLOCK FALSE)
78+
set(HAVE_FORK FALSE)
79+
set(HAVE_FUNOPEN FALSE)
80+
set(HAVE_GCC_GLOBAL_REGS FALSE)
81+
set(HAVE_GETGRNAM_R FALSE)
82+
set(HAVE_GETLOADAVG FALSE)
83+
set(HAVE_GETLOGIN FALSE)
84+
set(HAVE_GETPWNAM_R FALSE)
85+
set(HAVE_GETPWUID_R FALSE)
86+
set(HAVE_GETRANDOM FALSE)
87+
set(HAVE_GETTID FALSE)
88+
set(HAVE_GETWD FALSE)
6089
set(HAVE_GRP_H FALSE)
90+
set(HAVE_HSTRERROR FALSE)
91+
set(HAVE_IEEEFP_H FALSE)
92+
set(HAVE_IF_INDEXTONAME FALSE)
93+
set(HAVE_IF_NAMETOINDEX FALSE)
94+
set(HAVE_IFADDRS_H FALSE)
95+
set(HAVE_IMMINTRIN_H TRUE)
96+
set(HAVE_IO_H TRUE)
97+
set(HAVE_ISSETUGID FALSE)
6198
set(HAVE_KILL FALSE)
99+
set(HAVE_LANGINFO_H FALSE)
100+
set(HAVE_LCHOWN FALSE)
101+
set(HAVE_LIBPROC_H FALSE)
102+
set(HAVE_LIBUTIL_H FALSE)
103+
set(HAVE_LINUX_FILTER_H FALSE)
104+
set(HAVE_LINUX_IF_ETHER_H FALSE)
105+
set(HAVE_LINUX_IF_PACKET_H FALSE)
106+
set(HAVE_LINUX_SOCK_DIAG_H FALSE)
107+
set(HAVE_LINUX_UDP_H FALSE)
108+
set(HAVE_MATH_H TRUE)
109+
set(HAVE_MEMCNTL FALSE)
110+
set(HAVE_MEMFD_CREATE FALSE)
111+
set(HAVE_MEMMEM FALSE)
112+
set(HAVE_MEMPCPY FALSE)
113+
set(HAVE_MEMRCHR FALSE)
114+
set(HAVE_MKSTEMP FALSE)
115+
set(HAVE_MMAP FALSE)
116+
set(HAVE_MPROTECT FALSE)
117+
set(HAVE_MREMAP FALSE)
118+
set(HAVE_MSCOREE_H TRUE)
119+
set(HAVE_NET_IF_H FALSE)
120+
set(HAVE_NETDB_H FALSE)
121+
set(HAVE_NETINET_IN_H FALSE)
122+
set(HAVE_NL_LANGINFO FALSE)
123+
set(HAVE_NMMINTRIN_H TRUE)
124+
set(HAVE_POLL FALSE)
125+
set(HAVE_POLL_H FALSE)
126+
set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP FALSE)
127+
set(HAVE_PRCTL FALSE)
128+
set(HAVE_PROCCTL FALSE)
129+
set(HAVE_PS_STRINGS FALSE)
130+
set(HAVE_PTHREAD_ATTR_GET_NP FALSE)
131+
set(HAVE_PTHREAD_ATTR_GETSTACK FALSE)
132+
set(HAVE_PTHREAD_GET_STACKADDR_NP FALSE)
133+
set(HAVE_PTHREAD_GETATTR_NP FALSE)
134+
set(HAVE_PTHREAD_JIT_WRITE_PROTECT_NP FALSE)
135+
set(HAVE_PTHREAD_STACKSEG_NP FALSE)
136+
set(HAVE_PTY_H FALSE)
137+
set(HAVE_PUTENV TRUE)
62138
set(HAVE_PWD_H FALSE)
139+
set(HAVE_REALLOCARRAY FALSE)
140+
set(HAVE_RESOLV_H FALSE)
141+
set(HAVE_SCANDIR FALSE)
142+
set(HAVE_SETENV FALSE)
63143
set(HAVE_SETITIMER FALSE)
144+
set(HAVE_SETPROCTITLE FALSE)
145+
set(HAVE_SHM_CREATE_LARGEPAGE FALSE)
146+
set(HAVE_SIGACTION FALSE)
147+
set(HAVE_SIGPROCMASK FALSE)
148+
set(HAVE_SIZEOF_GID_T FALSE)
149+
set(HAVE_SIZEOF_SSIZE_T FALSE)
150+
set(HAVE_SIZEOF_UID_T FALSE)
151+
set(HAVE_SOCKATMARK FALSE)
152+
set(HAVE_SOCKLEN_T TRUE)
153+
set(HAVE_STATFS FALSE)
154+
set(HAVE_STATVFS FALSE)
155+
set(HAVE_STD_SYSLOG FALSE)
156+
set(HAVE_STDDEF_H TRUE)
157+
set(HAVE_STDINT_H TRUE)
158+
set(HAVE_STRCASESTR FALSE)
159+
set(HAVE_STRINGS_H FALSE)
160+
set(HAVE_STRLCAT FALSE)
161+
set(HAVE_STRLCPY FALSE)
162+
set(HAVE_STRNDUP FALSE)
163+
set(HAVE_STRNLEN TRUE)
164+
set(HAVE_STRUCT_CMSGCRED FALSE)
165+
set(HAVE_STRUCT_FLOCK FALSE)
166+
set(HAVE_STRUCT_SOCKADDR_SA_LEN FALSE)
167+
set(HAVE_STRUCT_SOCKADDR_STORAGE FALSE)
168+
set(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY FALSE)
169+
set(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN FALSE)
64170
set(HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
65171
set(HAVE_STRUCT_STAT_ST_BLOCKS FALSE)
172+
set(HAVE_STRUCT_STAT_ST_RDEV TRUE)
173+
set(HAVE_STRUCT_TM_TM_GMTOFF FALSE)
174+
set(HAVE_STRUCT_TM_TM_ZONE FALSE)
175+
set(HAVE_STRUCT_UCRED FALSE)
66176
set(HAVE_SYMLINK FALSE)
67177
set(HAVE_SYS_FILE_H FALSE)
178+
set(HAVE_SYS_IOCTL_H FALSE)
179+
set(HAVE_SYS_IPC_H FALSE)
180+
set(HAVE_SYS_LOADAVG_H FALSE)
181+
set(HAVE_SYS_MMAN_H FALSE)
182+
set(HAVE_SYS_MOUNT_H FALSE)
183+
set(HAVE_SYS_PARAM_H FALSE)
184+
set(HAVE_SYS_POLL_H FALSE)
185+
set(HAVE_SYS_PSTAT_H FALSE)
186+
set(HAVE_SYS_RESOURCE_H FALSE)
187+
set(HAVE_SYS_SELECT_H FALSE)
68188
set(HAVE_SYS_SOCKET_H FALSE)
189+
set(HAVE_SYS_SOCKIO_H FALSE)
190+
set(HAVE_SYS_STAT_H TRUE)
191+
set(HAVE_SYS_STATFS_H FALSE)
192+
set(HAVE_SYS_STATVFS_H FALSE)
193+
set(HAVE_SYS_SYSEXITS_H FALSE)
69194
set(HAVE_SYS_TIME_H FALSE)
195+
set(HAVE_SYS_TYPES_H TRUE)
196+
set(HAVE_SYS_UIO_H FALSE)
197+
set(HAVE_SYS_UTSNAME_H FALSE)
198+
set(HAVE_SYS_VFS_H FALSE)
70199
set(HAVE_SYS_WAIT_H FALSE)
200+
set(HAVE_SYSEXITS_H FALSE)
201+
set(HAVE_TMMINTRIN_H TRUE)
202+
set(HAVE_TZSET TRUE)
71203
set(HAVE_UNISTD_H FALSE)
72-
204+
set(HAVE_UNIX_H FALSE)
205+
set(HAVE_UNSETENV FALSE)
206+
set(HAVE_UTIL_H FALSE)
207+
set(HAVE_UTIME TRUE)
208+
set(HAVE_UTIME_H FALSE)
209+
set(HAVE_UTIMES FALSE)
210+
set(HAVE_VASPRINTF FALSE)
211+
set(HAVE_WINSOCK_H TRUE)
212+
set(HAVE_WMMINTRIN_H TRUE)
213+
set(HAVE_WS2TCPIP_H TRUE)
73214
set(PHP_EXT_GD_HAS_FLOORF TRUE)
74215
set(PHP_EXT_OPCACHE_HAS_FLOOR TRUE)
216+
set(PHP_HAS_CREATEPROCESS TRUE)
75217
set(PHP_HAS_DN_EXPAND FALSE)
76218
set(PHP_HAS_DN_SKIPNAME FALSE)
77219
set(PHP_HAS_DNS_SEARCH FALSE)
220+
set(PHP_HAS_ELF FALSE)
221+
set(PHP_HAS_FFP_CONTRACT_OFF_C FALSE)
222+
set(PHP_HAS_FNO_COMMON_C FALSE)
223+
set(PHP_HAS_FNO_COMMON_CXX FALSE)
78224
set(PHP_HAS_GAI_STRERROR FALSE)
79225
set(PHP_HAS_GETADDRINFO TRUE)
80226
set(PHP_HAS_GETADDRINFO_LIBRARY ws2_32)
@@ -85,10 +231,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
85231
set(PHP_HAS_GETHOSTNAME TRUE)
86232
set(PHP_HAS_GETHOSTNAME_LIBRARY ws2_32)
87233
set(PHP_HAS_GETIFADDRS_SYMBOL FALSE)
88-
set(PHP_HAS_GETPROBYNUMBER TRUE)
89-
set(PHP_HAS_GETPROBYNUMBER_LIBRARY ws2_32)
90234
set(PHP_HAS_GETPROTOBYNAME TRUE)
91235
set(PHP_HAS_GETPROTOBYNAME_LIBRARY ws2_32)
236+
set(PHP_HAS_GETPROTOBYNUMBER TRUE)
237+
set(PHP_HAS_GETPROTOBYNUMBER_LIBRARY ws2_32)
92238
set(PHP_HAS_GETSERVBYNAME TRUE)
93239
set(PHP_HAS_GETSERVBYNAME_LIBRARY ws2_32)
94240
set(PHP_HAS_GETSERVBYPORT TRUE)
@@ -98,6 +244,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
98244
set(PHP_HAS_INET_PTON TRUE)
99245
set(PHP_HAS_INET_PTON_LIBRARY ws2_32)
100246
set(PHP_HAS_OPENPTY FALSE)
247+
set(PHP_HAS_PTHREAD_NP_H FALSE)
101248
set(PHP_HAS_RES_9_DN_SKIPNAME FALSE)
102249
set(PHP_HAS_RES_NDESTROY FALSE)
103250
set(PHP_HAS_RES_NSEARCH FALSE)
@@ -109,5 +256,40 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
109256
set(PHP_HAS_SIN TRUE)
110257
set(PHP_HAS_SOCKET TRUE)
111258
set(PHP_HAS_SOCKET_LIBRARY ws2_32)
259+
set(PHP_HAS_VERBOSE_LINKER_FLAG_C TRUE)
260+
set(PHP_HAS_VERBOSE_LINKER_FLAG_CXX TRUE)
261+
set(PHP_HAS_WDUPLICATED_COND_C FALSE)
262+
set(PHP_HAS_WDUPLICATED_COND_CXX FALSE)
263+
set(PHP_HAS_WEXTRA_C FALSE)
264+
set(PHP_HAS_WEXTRA_CXX FALSE)
265+
set(PHP_HAS_WFORMAT_TRUNCATION_C FALSE)
266+
set(PHP_HAS_WFORMAT_TRUNCATION_CXX FALSE)
267+
set(PHP_HAS_WIMPLICIT_FALLTHROUGH_1_C FALSE)
268+
set(PHP_HAS_WIMPLICIT_FALLTHROUGH_1_CXX FALSE)
269+
set(PHP_HAS_WLOGICAL_OP_C FALSE)
270+
set(PHP_HAS_WLOGICAL_OP_CXX FALSE)
271+
set(PHP_HAS_WNO_CLOBBERED_C FALSE)
272+
set(PHP_HAS_WNO_CLOBBERED_CXX FALSE)
273+
set(PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C FALSE)
274+
set(PHP_HAS_WNO_SIGN_COMPARE_C FALSE)
275+
set(PHP_HAS_WNO_SIGN_COMPARE_CXX FALSE)
276+
set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
277+
set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
278+
set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
279+
set(PHP_IS_EBCDIC FALSE)
112280
set(PHP_ZEND_HAS_PGRAB FALSE)
281+
282+
#set(HAVE_SIZEOF_INT TRUE)
283+
#set(HAVE_SIZEOF_LONG TRUE)
284+
#set(HAVE_SIZEOF_LONG_LONG TRUE)
285+
#set(HAVE_SIZEOF_OFF_T TRUE)
286+
#set(HAVE_SIZEOF_PTRDIFF_T TRUE)
287+
#set(HAVE_SIZEOF_SIZE_T TRUE)
288+
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
289+
set(SIZEOF_PTRDIFF_T 4)
290+
set(SIZEOF_SIZE_T 4)
291+
else()
292+
set(SIZEOF_PTRDIFF_T 8)
293+
set(SIZEOF_SIZE_T 8)
294+
endif()
113295
endif()

0 commit comments

Comments
 (0)