Skip to content

Commit

Permalink
- Fixed build using g++ (which complains about jump that crosses init…
Browse files Browse the repository at this point in the history
…ialization)
  • Loading branch information
felipensp committed May 20, 2012
1 parent 6ea4d0d commit 82740ef
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ext/intl/calendar/calendar_methods.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1118,6 +1118,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
int locale_str_len; int locale_str_len;
TimeZone *timeZone; TimeZone *timeZone;
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
Calendar *cal;
intl_error_reset(NULL TSRMLS_CC); intl_error_reset(NULL TSRMLS_CC);


if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|s!", if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|s!",
Expand Down Expand Up @@ -1172,7 +1173,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
locale_str = const_cast<char*>(intl_locale_get_default(TSRMLS_C)); 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); Locale::createFromName(locale_str), status);
if (cal == NULL) { if (cal == NULL) {
delete timeZone; delete timeZone;
Expand Down

0 comments on commit 82740ef

Please sign in to comment.