From 82740ef31e5c8a6497fca6a37637a840ee80b030 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 20 May 2012 16:17:17 -0300 Subject: [PATCH] - Fixed build using g++ (which complains about jump that crosses initialization) --- ext/intl/calendar/calendar_methods.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index fc0a3064d22..1e8c9e7fefd 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -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(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;