Skip to content

Commit 221a46f

Browse files
petkpetk
committed
Merge branch 'PHP-8.4'
2 parents 48f6855 + 1c53425 commit 221a46f

File tree

2 files changed

+184
-6
lines changed

2 files changed

+184
-6
lines changed

‎cmake/cmake/ConfigureChecks.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,11 +677,11 @@ php_search_libraries(
677677
socket # Solaris <= 11.3, illumos
678678
network # Haiku
679679
ws2_32 # Windows
680-
VARIABLE PHP_HAS_GETPROBYNUMBER
681-
LIBRARY_VARIABLE PHP_HAS_GETPROBYNUMBER_LIBRARY
680+
VARIABLE PHP_HAS_GETPROTOBYNUMBER
681+
LIBRARY_VARIABLE PHP_HAS_GETPROTOBYNUMBER_LIBRARY
682682
TARGET php_config INTERFACE
683683
)
684-
set(HAVE_GETPROTOBYNUMBER ${PHP_HAS_GETPROBYNUMBER})
684+
set(HAVE_GETPROTOBYNUMBER ${PHP_HAS_GETPROTOBYNUMBER})
685685

686686
# The getservbyname() is mostly in C library (Solaris 11.4...)
687687
php_search_libraries(

‎cmake/cmake/platforms/Windows.cmake‎

Lines changed: 181 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,173 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
5151
# known on Windows targets.
5252
##############################################################################
5353

54+
set(HAVE_ALIGNOF FALSE)
55+
set(HAVE_ALLOCA TRUE)
5456
set(HAVE_ALLOCA_H FALSE)
57+
set(HAVE_ALPHASORT FALSE)
58+
set(HAVE_ARC4RANDOM_BUF FALSE)
59+
set(HAVE_ARPA_INET_H FALSE)
60+
set(HAVE_ARPA_NAMESER_H FALSE)
61+
set(HAVE_ASPRINTF FALSE)
62+
set(HAVE_CHROOT FALSE)
63+
set(HAVE_CLOCK_GETTIME_NSEC_NP FALSE)
64+
set(HAVE_COMMONCRYPTO_COMMONRANDOM_H FALSE)
65+
set(HAVE_CPUID_H FALSE)
5566
set(HAVE_DIRENT_H FALSE)
67+
set(HAVE_DLFCN_H FALSE)
68+
set(HAVE_DNS_H FALSE)
69+
set(HAVE_ELF_AUX_INFO FALSE)
70+
set(HAVE_EXPLICIT_BZERO FALSE)
71+
set(HAVE_EXPLICIT_MEMSET FALSE)
72+
set(HAVE_FCNTL_H TRUE)
73+
set(HAVE_FDATASYNC FALSE)
5674
set(HAVE_FLOCK FALSE)
75+
set(HAVE_FORK FALSE)
76+
set(HAVE_FUNOPEN FALSE)
77+
set(HAVE_GCC_GLOBAL_REGS FALSE)
78+
set(HAVE_GETGRNAM_R FALSE)
79+
set(HAVE_GETLOADAVG FALSE)
80+
set(HAVE_GETLOGIN FALSE)
81+
set(HAVE_GETPWNAM_R FALSE)
82+
set(HAVE_GETPWUID_R FALSE)
83+
set(HAVE_GETRANDOM FALSE)
84+
set(HAVE_GETTID FALSE)
85+
set(HAVE_GETWD FALSE)
5786
set(HAVE_GLOB FALSE)
5887
set(HAVE_GRP_H FALSE)
88+
set(HAVE_HSTRERROR FALSE)
89+
set(HAVE_IEEEFP_H FALSE)
90+
set(HAVE_IF_INDEXTONAME FALSE)
91+
set(HAVE_IF_NAMETOINDEX FALSE)
92+
set(HAVE_IFADDRS_H FALSE)
93+
set(HAVE_IMMINTRIN_H TRUE)
94+
set(HAVE_IO_H TRUE)
95+
set(HAVE_ISSETUGID FALSE)
5996
set(HAVE_KILL FALSE)
97+
set(HAVE_LANGINFO_H FALSE)
98+
set(HAVE_LCHOWN FALSE)
99+
set(HAVE_LIBPROC_H FALSE)
100+
set(HAVE_LIBUTIL_H FALSE)
101+
set(HAVE_LINUX_FILTER_H FALSE)
102+
set(HAVE_LINUX_IF_ETHER_H FALSE)
103+
set(HAVE_LINUX_IF_PACKET_H FALSE)
104+
set(HAVE_LINUX_SOCK_DIAG_H FALSE)
105+
set(HAVE_LINUX_UDP_H FALSE)
106+
set(HAVE_MATH_H TRUE)
107+
set(HAVE_MEMCNTL FALSE)
108+
set(HAVE_MEMFD_CREATE FALSE)
109+
set(HAVE_MEMMEM FALSE)
110+
set(HAVE_MEMPCPY FALSE)
111+
set(HAVE_MEMRCHR FALSE)
112+
set(HAVE_MKSTEMP FALSE)
113+
set(HAVE_MMAP FALSE)
114+
set(HAVE_MPROTECT FALSE)
115+
set(HAVE_MREMAP FALSE)
116+
set(HAVE_MSCOREE_H TRUE)
117+
set(HAVE_NET_IF_H FALSE)
118+
set(HAVE_NETDB_H FALSE)
119+
set(HAVE_NETINET_IN_H FALSE)
120+
set(HAVE_NL_LANGINFO FALSE)
121+
set(HAVE_NMMINTRIN_H TRUE)
122+
set(HAVE_POLL FALSE)
123+
set(HAVE_POLL_H FALSE)
124+
set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP FALSE)
125+
set(HAVE_PRCTL FALSE)
126+
set(HAVE_PROCCTL FALSE)
127+
set(HAVE_PS_STRINGS FALSE)
128+
set(HAVE_PTHREAD_ATTR_GET_NP FALSE)
129+
set(HAVE_PTHREAD_ATTR_GETSTACK FALSE)
130+
set(HAVE_PTHREAD_GET_STACKADDR_NP FALSE)
131+
set(HAVE_PTHREAD_GETATTR_NP FALSE)
132+
set(HAVE_PTHREAD_JIT_WRITE_PROTECT_NP FALSE)
133+
set(HAVE_PTHREAD_STACKSEG_NP FALSE)
134+
set(HAVE_PTY_H FALSE)
135+
set(HAVE_PUTENV TRUE)
60136
set(HAVE_PWD_H FALSE)
137+
set(HAVE_REALLOCARRAY FALSE)
138+
set(HAVE_RESOLV_H FALSE)
139+
set(HAVE_SCANDIR FALSE)
140+
set(HAVE_SETENV FALSE)
61141
set(HAVE_SETITIMER FALSE)
142+
set(HAVE_SETPROCTITLE FALSE)
143+
set(HAVE_SHM_CREATE_LARGEPAGE FALSE)
144+
set(HAVE_SIGACTION FALSE)
145+
set(HAVE_SIGPROCMASK FALSE)
146+
set(HAVE_SIZEOF_GID_T FALSE)
147+
set(HAVE_SIZEOF_UID_T FALSE)
148+
set(HAVE_SOCKATMARK FALSE)
149+
set(HAVE_SOCKLEN_T TRUE)
150+
set(HAVE_STATFS FALSE)
151+
set(HAVE_STATVFS FALSE)
152+
set(HAVE_STD_SYSLOG FALSE)
153+
set(HAVE_STDDEF_H TRUE)
154+
set(HAVE_STDINT_H TRUE)
155+
set(HAVE_STRCASESTR FALSE)
156+
set(HAVE_STRINGS_H FALSE)
157+
set(HAVE_STRLCAT FALSE)
158+
set(HAVE_STRLCPY FALSE)
159+
set(HAVE_STRNDUP FALSE)
160+
set(HAVE_STRNLEN TRUE)
161+
set(HAVE_STRUCT_CMSGCRED FALSE)
162+
set(HAVE_STRUCT_FLOCK FALSE)
163+
set(HAVE_STRUCT_SOCKADDR_SA_LEN FALSE)
164+
set(HAVE_STRUCT_SOCKADDR_STORAGE FALSE)
165+
set(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY FALSE)
166+
set(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN FALSE)
62167
set(HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
63168
set(HAVE_STRUCT_STAT_ST_BLOCKS FALSE)
169+
set(HAVE_STRUCT_STAT_ST_RDEV TRUE)
170+
set(HAVE_STRUCT_TM_TM_GMTOFF FALSE)
171+
set(HAVE_STRUCT_TM_TM_ZONE FALSE)
172+
set(HAVE_STRUCT_UCRED FALSE)
64173
set(HAVE_SYMLINK FALSE)
65174
set(HAVE_SYS_FILE_H FALSE)
175+
set(HAVE_SYS_IOCTL_H FALSE)
176+
set(HAVE_SYS_IPC_H FALSE)
177+
set(HAVE_SYS_LOADAVG_H FALSE)
178+
set(HAVE_SYS_MMAN_H FALSE)
179+
set(HAVE_SYS_MOUNT_H FALSE)
180+
set(HAVE_SYS_PARAM_H FALSE)
181+
set(HAVE_SYS_POLL_H FALSE)
182+
set(HAVE_SYS_PSTAT_H FALSE)
183+
set(HAVE_SYS_RESOURCE_H FALSE)
184+
set(HAVE_SYS_SELECT_H FALSE)
66185
set(HAVE_SYS_SOCKET_H FALSE)
186+
set(HAVE_SYS_SOCKIO_H FALSE)
187+
set(HAVE_SYS_STAT_H TRUE)
188+
set(HAVE_SYS_STATFS_H FALSE)
189+
set(HAVE_SYS_STATVFS_H FALSE)
190+
set(HAVE_SYS_SYSEXITS_H FALSE)
67191
set(HAVE_SYS_TIME_H FALSE)
192+
set(HAVE_SYS_TYPES_H TRUE)
193+
set(HAVE_SYS_UIO_H FALSE)
194+
set(HAVE_SYS_UTSNAME_H FALSE)
195+
set(HAVE_SYS_VFS_H FALSE)
68196
set(HAVE_SYS_WAIT_H FALSE)
197+
set(HAVE_SYSEXITS_H FALSE)
198+
set(HAVE_TMMINTRIN_H TRUE)
199+
set(HAVE_TZSET TRUE)
69200
set(HAVE_UNISTD_H FALSE)
70-
201+
set(HAVE_UNIX_H FALSE)
202+
set(HAVE_UNSETENV FALSE)
203+
set(HAVE_UTIL_H FALSE)
204+
set(HAVE_UTIME TRUE)
205+
set(HAVE_UTIME_H FALSE)
206+
set(HAVE_UTIMES FALSE)
207+
set(HAVE_VASPRINTF FALSE)
208+
set(HAVE_WINSOCK_H TRUE)
209+
set(HAVE_WMMINTRIN_H TRUE)
210+
set(HAVE_WS2TCPIP_H TRUE)
71211
set(PHP_EXT_GD_HAS_FLOORF TRUE)
72212
set(PHP_EXT_OPCACHE_HAS_FLOOR TRUE)
213+
set(PHP_HAS_CREATEPROCESS TRUE)
73214
set(PHP_HAS_DN_EXPAND FALSE)
74215
set(PHP_HAS_DN_SKIPNAME FALSE)
75216
set(PHP_HAS_DNS_SEARCH FALSE)
217+
set(PHP_HAS_ELF FALSE)
218+
set(PHP_HAS_FFP_CONTRACT_OFF_C FALSE)
219+
set(PHP_HAS_FNO_COMMON_C FALSE)
220+
set(PHP_HAS_FNO_COMMON_CXX FALSE)
76221
set(PHP_HAS_GAI_STRERROR FALSE)
77222
set(PHP_HAS_GETADDRINFO TRUE)
78223
set(PHP_HAS_GETADDRINFO_LIBRARY ws2_32)
@@ -83,10 +228,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
83228
set(PHP_HAS_GETHOSTNAME TRUE)
84229
set(PHP_HAS_GETHOSTNAME_LIBRARY ws2_32)
85230
set(PHP_HAS_GETIFADDRS_SYMBOL FALSE)
86-
set(PHP_HAS_GETPROBYNUMBER TRUE)
87-
set(PHP_HAS_GETPROBYNUMBER_LIBRARY ws2_32)
88231
set(PHP_HAS_GETPROTOBYNAME TRUE)
89232
set(PHP_HAS_GETPROTOBYNAME_LIBRARY ws2_32)
233+
set(PHP_HAS_GETPROTOBYNUMBER TRUE)
234+
set(PHP_HAS_GETPROTOBYNUMBER_LIBRARY ws2_32)
90235
set(PHP_HAS_GETSERVBYNAME TRUE)
91236
set(PHP_HAS_GETSERVBYNAME_LIBRARY ws2_32)
92237
set(PHP_HAS_GETSERVBYPORT TRUE)
@@ -96,6 +241,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
96241
set(PHP_HAS_INET_PTON TRUE)
97242
set(PHP_HAS_INET_PTON_LIBRARY ws2_32)
98243
set(PHP_HAS_OPENPTY FALSE)
244+
set(PHP_HAS_PTHREAD_NP_H FALSE)
99245
set(PHP_HAS_RES_9_DN_SKIPNAME FALSE)
100246
set(PHP_HAS_RES_NDESTROY FALSE)
101247
set(PHP_HAS_RES_NSEARCH FALSE)
@@ -107,5 +253,37 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
107253
set(PHP_HAS_SIN TRUE)
108254
set(PHP_HAS_SOCKET TRUE)
109255
set(PHP_HAS_SOCKET_LIBRARY ws2_32)
256+
set(PHP_HAS_VERBOSE_LINKER_FLAG_C TRUE)
257+
set(PHP_HAS_VERBOSE_LINKER_FLAG_CXX TRUE)
258+
set(PHP_HAS_WDUPLICATED_COND_C FALSE)
259+
set(PHP_HAS_WDUPLICATED_COND_CXX FALSE)
260+
set(PHP_HAS_WEXTRA_C FALSE)
261+
set(PHP_HAS_WEXTRA_CXX FALSE)
262+
set(PHP_HAS_WFORMAT_TRUNCATION_C FALSE)
263+
set(PHP_HAS_WFORMAT_TRUNCATION_CXX FALSE)
264+
set(PHP_HAS_WIMPLICIT_FALLTHROUGH_1_C FALSE)
265+
set(PHP_HAS_WIMPLICIT_FALLTHROUGH_1_CXX FALSE)
266+
set(PHP_HAS_WLOGICAL_OP_C FALSE)
267+
set(PHP_HAS_WLOGICAL_OP_CXX FALSE)
268+
set(PHP_HAS_WNO_CLOBBERED_C FALSE)
269+
set(PHP_HAS_WNO_CLOBBERED_CXX FALSE)
270+
set(PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C FALSE)
271+
set(PHP_HAS_WNO_SIGN_COMPARE_C FALSE)
272+
set(PHP_HAS_WNO_SIGN_COMPARE_CXX FALSE)
273+
set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
274+
set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
275+
set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
276+
set(PHP_IS_EBCDIC FALSE)
110277
set(PHP_ZEND_HAS_PGRAB FALSE)
278+
279+
#set(HAVE_SIZEOF_INT TRUE)
280+
#set(HAVE_SIZEOF_LONG TRUE)
281+
#set(HAVE_SIZEOF_LONG_LONG TRUE)
282+
#set(HAVE_SIZEOF_OFF_T TRUE)
283+
#set(HAVE_SIZEOF_SIZE_T TRUE)
284+
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
285+
set(SIZEOF_SIZE_T 4)
286+
else()
287+
set(SIZEOF_SIZE_T 8)
288+
endif()
111289
endif()

0 commit comments

Comments
 (0)