1
0
mirror of https://github.com/php/php-src.git synced 2026-04-16 12:31:06 +02:00

- Fixed build using g++ (which complains about jump that crosses initialization)

This commit is contained in:
Felipe Pena
2012-05-20 16:17:17 -03:00
parent 6ea4d0d839
commit 82740ef31e

View File

@@ -1118,6 +1118,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
int locale_str_len;
TimeZone *timeZone;
UErrorCode status = U_ZERO_ERROR;
Calendar *cal;
intl_error_reset(NULL TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|s!",
@@ -1172,7 +1173,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
locale_str = const_cast<char*>(intl_locale_get_default(TSRMLS_C));
}
Calendar *cal = Calendar::createInstance(timeZone,
cal = Calendar::createInstance(timeZone,
Locale::createFromName(locale_str), status);
if (cal == NULL) {
delete timeZone;