Skip to content

Commit be70f42

Browse files
authored
Add HAVE_MEMMOVE to ext/pcre (#18862)
The pcre2 library still needs HAVE_MEMMOVE defined to use the system (C99 standard) memmove() function, otherwise emulation is used. On Windows, this is already enabled.
1 parent 2f55291 commit be70f42

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

ext/pcre/config0.m4

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,14 @@ else
9999
[PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,
100100
[-Werror])
101101

102-
PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
102+
PHP_PCRE_CFLAGS=m4_normalize(["
103+
$PHP_PCRE_CFLAGS
104+
-DHAVE_CONFIG_H
105+
-DHAVE_MEMMOVE
106+
-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
107+
-I@ext_srcdir@/pcre2lib
108+
"])
109+
103110
AC_DEFINE([HAVE_BUNDLED_PCRE], [1],
104111
[Define to 1 if PHP uses the bundled PCRE library.])
105112
AC_DEFINE([PCRE2_CODE_UNIT_WIDTH], [8])

0 commit comments

Comments
 (0)