archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Sync HAVE_BUNDLED_PCRE #if/ifdef/defined (#14354)

Browse source 
Follow up of GH-5526 (-Wundef)
This commit is contained in:
Peter Kokot 2024-05-29 07:53:36 +02:00 • committed by GitHub
parent cb2c5de3db
commit e45d2d6046
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/pcre/php_pcre.c
View file

@ -587,7 +587,7 @@ static zend_always_inline size_t calculate_unit_length(pcre_cache_entry *pce, co
PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, bool locale_aware)
{
pcre2_code *re = NULL;
#if 10 == PCRE2_MAJOR && 37 == PCRE2_MINOR && !HAVE_BUNDLED_PCRE
#if 10 == PCRE2_MAJOR && 37 == PCRE2_MINOR && !defined(HAVE_BUNDLED_PCRE)
uint32_t coptions = PCRE2_NO_START_OPTIMIZE;
#else
uint32_t coptions = 0;

2
ext/zend_test/test.c
View file

@ -732,7 +732,7 @@ static ZEND_FUNCTION(get_open_basedir)
static ZEND_FUNCTION(zend_test_is_pcre_bundled)
{
ZEND_PARSE_PARAMETERS_NONE();
#if HAVE_BUNDLED_PCRE
#ifdef HAVE_BUNDLED_PCRE
RETURN_TRUE;
#else
RETURN_FALSE;