Skip to content

Commit be9dac0

Browse files
committed
Sync with upstream: ext/intl, ext/opcache
1 parent f0787e1 commit be9dac0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

cmake/ext/intl/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,16 @@ target_sources(
137137
locale/locale_methods.cpp
138138
locale/locale.cpp
139139
locale/locale.stub.php
140-
msgformat/msgformat_attr.c
141-
msgformat/msgformat_class.c
142-
msgformat/msgformat_data.c
143-
msgformat/msgformat_format.c
140+
msgformat/msgformat_attr.cpp
141+
msgformat/msgformat_class.cpp
142+
msgformat/msgformat_data.cpp
143+
msgformat/msgformat_format.cpp
144144
msgformat/msgformat_helpers.cpp
145-
msgformat/msgformat_parse.c
146-
msgformat/msgformat.c
145+
msgformat/msgformat_parse.cpp
146+
msgformat/msgformat.cpp
147147
msgformat/msgformat.stub.php
148-
normalizer/normalizer_class.c
149-
normalizer/normalizer_normalize.c
148+
normalizer/normalizer_class.cpp
149+
normalizer/normalizer_normalize.cpp
150150
normalizer/normalizer.stub.php
151151
php_intl.c
152152
php_intl.stub.php

cmake/ext/opcache/cmake/CheckSHM.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ _php_ext_opcache_check_shm_open(HAVE_SHM_MMAP_POSIX)
330330

331331
if(NOT HAVE_SHM_IPC AND NOT HAVE_SHM_MMAP_ANON AND NOT HAVE_SHM_MMAP_POSIX)
332332
message(
333-
FATAL_ERROR
333+
WARNING
334334
"No supported shared memory caching support was found when configuring "
335-
"opcache extension."
335+
"opcache extension. Opcache will be disabled."
336336
)
337337
endif()

0 commit comments

Comments
 (0)