Skip to content

Commit 12835f8

Browse files
committed
Sync windows cache
1 parent eefe09e commit 12835f8

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

cmake/cmake/platforms/Windows.cmake

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
5858
set(HAVE_ALLOCA TRUE)
5959
set(HAVE_ALLOCA_H FALSE)
6060
set(HAVE_ALPHASORT FALSE)
61-
set(HAVE_ARC4RANDOM_BUF FALSE)
6261
set(HAVE_ARPA_INET_H FALSE)
6362
set(HAVE_ARPA_NAMESER_H FALSE)
6463
set(HAVE_ASPRINTF FALSE)
6564
set(HAVE_CHROOT FALSE)
6665
set(HAVE_CLOCK_GETTIME_NSEC_NP FALSE)
6766
set(HAVE_COMMONCRYPTO_COMMONRANDOM_H FALSE)
6867
set(HAVE_CPUID_H FALSE)
68+
set(HAVE_DECL_ARC4RANDOM_BUF FALSE)
6969
set(HAVE_DIRENT_H FALSE)
7070
set(HAVE_DLFCN_H FALSE)
7171
set(HAVE_DNS_H FALSE)
@@ -98,14 +98,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
9898
set(HAVE_KILL FALSE)
9999
set(HAVE_LANGINFO_H FALSE)
100100
set(HAVE_LCHOWN FALSE)
101-
set(HAVE_LIBPROC_H FALSE)
102-
set(HAVE_LIBUTIL_H FALSE)
103101
set(HAVE_LINUX_FILTER_H FALSE)
104-
set(HAVE_LINUX_IF_ETHER_H FALSE)
105-
set(HAVE_LINUX_IF_PACKET_H FALSE)
106102
set(HAVE_LINUX_SOCK_DIAG_H FALSE)
107-
set(HAVE_LINUX_UDP_H FALSE)
108-
set(HAVE_MATH_H TRUE)
109103
set(HAVE_MEMCNTL FALSE)
110104
set(HAVE_MEMFD_CREATE FALSE)
111105
set(HAVE_MEMMEM FALSE)
@@ -137,8 +131,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
137131
set(HAVE_PTY_H FALSE)
138132
set(HAVE_PUTENV TRUE)
139133
set(HAVE_PWD_H FALSE)
140-
set(HAVE_REALLOCARRAY FALSE)
141134
set(HAVE_RESOLV_H FALSE)
135+
set(HAVE_SA_SS_FAMILY FALSE)
142136
set(HAVE_SCANDIR FALSE)
143137
set(HAVE_SETENV FALSE)
144138
set(HAVE_SETITIMER FALSE)
@@ -151,6 +145,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
151145
set(HAVE_SIZEOF_SSIZE_T FALSE)
152146
set(HAVE_SIZEOF_UID_T FALSE)
153147
set(HAVE_SOCKADDR_SA_LEN FALSE)
148+
set(HAVE_SOCKADDR_STORAGE FALSE)
149+
set(HAVE_SOCKADDR_UN_SUN_LEN FALSE)
154150
set(HAVE_SOCKATMARK FALSE)
155151
set(HAVE_SOCKLEN_T TRUE)
156152
set(HAVE_STATFS FALSE)
@@ -166,8 +162,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
166162
set(HAVE_STRNLEN TRUE)
167163
set(HAVE_STRUCT_CMSGCRED FALSE)
168164
set(HAVE_STRUCT_FLOCK FALSE)
169-
set(HAVE_SOCKADDR_STORAGE FALSE)
170-
set(HAVE_SA_SS_FAMILY FALSE)
171165
set(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN FALSE)
172166
set(HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
173167
set(HAVE_STRUCT_STAT_ST_BLOCKS FALSE)
@@ -278,9 +272,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
278272
set(PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C FALSE)
279273
set(PHP_HAS_WNO_SIGN_COMPARE_C FALSE)
280274
set(PHP_HAS_WNO_SIGN_COMPARE_CXX FALSE)
275+
set(PHP_HAS_WNO_TYPEDEF_REDEFINITION FALSE)
281276
set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
282277
set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
283278
set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
279+
set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)
284280

285281
set(HAVE_SIZEOF_INT TRUE)
286282
set(SIZEOF_INT 4)

cmake/sapi/cgi/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ set_target_properties(
5959
)
6060

6161
# BSD systems.
62-
check_struct_has_member("struct sockaddr_un" sun_len sys/un.h HAVE_SOCKADDR_UN_SUN_LEN)
62+
check_struct_has_member(
63+
"struct sockaddr_un"
64+
sun_len
65+
sys/un.h
66+
HAVE_SOCKADDR_UN_SUN_LEN
67+
)
6368

6469
message(CHECK_START "Checking whether accept() requires cross-process locking")
6570
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")

0 commit comments

Comments
 (0)