Skip to content

Commit 3d6bd16

Browse files
authored
Sync missing hash and pcre dependencies for opcache on Windows (#14682)
- ext/hash is required only on Windows - ext/pcre is required
1 parent 54e5e7b commit 3d6bd16

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
#include "zend_file_cache.h"
4949
#include "ext/pcre/php_pcre.h"
5050
#include "ext/standard/md5.h"
51-
#include "ext/hash/php_hash.h"
51+
52+
#ifdef ZEND_WIN32
53+
# include "ext/hash/php_hash.h"
54+
#endif
5255

5356
#ifdef HAVE_JIT
5457
# include "jit/zend_jit.h"

ext/opcache/config.w32

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ if (PHP_OPCACHE != "no") {
1818
zend_shared_alloc.c \
1919
shared_alloc_win32.c", true, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
2020

21+
ADD_EXTENSION_DEP('opcache', 'hash');
22+
ADD_EXTENSION_DEP('opcache', 'pcre');
23+
2124
if (PHP_OPCACHE_JIT == "yes") {
2225
if (CHECK_HEADER_ADD_INCLUDE("ir/ir.h", "CFLAGS_OPCACHE", PHP_OPCACHE + ";ext\\opcache\\jit")) {
2326
var dasm_flags = (X64 ? "-D X64=1" : "") + (X64 ? " -D X64WIN=1" : "") + " -D WIN=1";

0 commit comments

Comments
 (0)