php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix GH-11071: Revert "Fix [-Wundef] warning in INTL extension"
This commit is contained in:
Remi Collet
2023-04-18 11:05:23 +02:00
parent b340e10d6e f5dc2c31d9
commit c75facb566
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/intl/php_intl.c
View File

@@ -251,7 +251,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
@@ -262,7 +262,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);