From e45d2d604606b63becebcd2ed26afb15a9768ad1 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 29 May 2024 07:53:36 +0200 Subject: [PATCH] Sync HAVE_BUNDLED_PCRE #if/ifdef/defined (#14354) Follow up of GH-5526 (-Wundef) --- ext/pcre/php_pcre.c | 2 +- ext/zend_test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index f734b91a76b..92594c8ede8 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -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; diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 7feb1920a58..7eea02cd07d 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -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;