34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From 0eeaba52f1900f5b3bc389ee0a44e2b70a7ab8f6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Remi Collet <remi@remirepo.net>
|
||
|
|
Date: Fri, 14 Apr 2023 10:23:21 +0200
|
||
|
|
Subject: [PATCH] Fix GH-11071: Revert "Fix [-Wundef] warning in INTL
|
||
|
|
extension"
|
||
|
|
|
||
|
|
This reverts commit ea8686540ac43e59dd3f8784e29a0c06e3446df2.
|
||
|
|
---
|
||
|
|
ext/intl/php_intl.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
|
||
|
|
index 5826c2e3372f..a15e16604133 100644
|
||
|
|
--- a/ext/intl/php_intl.c
|
||
|
|
+++ b/ext/intl/php_intl.c
|
||
|
|
@@ -281,7 +281,7 @@ PHP_RSHUTDOWN_FUNCTION( intl )
|
||
|
|
/* {{{ PHP_MINFO_FUNCTION */
|
||
|
|
PHP_MINFO_FUNCTION( intl )
|
||
|
|
{
|
||
|
|
-#ifndef UCONFIG_NO_FORMATTING
|
||
|
|
+#if !UCONFIG_NO_FORMATTING
|
||
|
|
UErrorCode status = U_ZERO_ERROR;
|
||
|
|
const char *tzdata_ver = NULL;
|
||
|
|
#endif
|
||
|
|
@@ -292,7 +295,7 @@ PHP_MINFO_FUNCTION( intl )
|
||
|
|
#ifdef U_ICU_DATA_VERSION
|
||
|
|
php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION );
|
||
|
|
#endif
|
||
|
|
-#ifndef UCONFIG_NO_FORMATTING
|
||
|
|
+#if !UCONFIG_NO_FORMATTING
|
||
|
|
tzdata_ver = ucal_getTZDataVersion(&status);
|
||
|
|
if (U_ZERO_ERROR == status) {
|
||
|
|
php_info_print_table_row( 2, "ICU TZData version", tzdata_ver);
|
