]> granicus.if.org Git - php/commitdiff
fix argument type & remove warning
authorStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2013 05:59:07 +0000 (22:59 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2013 06:04:38 +0000 (23:04 -0700)
ext/intl/dateformat/dateformat_parse.c

index 4193e890175b921e97ca4dffb62238d0047e4831..993077854646e8983b1ba64766b545bf8776822e 100644 (file)
@@ -62,7 +62,7 @@ static void internal_parse_to_timestamp(IntlDateFormatter_object *dfo, char* tex
 }
 /* }}} */
 
-static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_value, UCalendar parsed_calendar, long calendar_field, char* key_name TSRMLS_DC)
+static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_value, const UCalendar *parsed_calendar, long calendar_field, char* key_name TSRMLS_DC)
 {
        long calendar_field_val = ucal_get( parsed_calendar, calendar_field, &INTL_DATA_ERROR_CODE(dfo));       
        INTL_METHOD_CHECK_STATUS( dfo, "Date parsing - localtime failed : could not get a field from calendar" );
@@ -83,7 +83,7 @@ static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_va
 */
 static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* text_to_parse, int32_t text_len, int32_t *parse_pos, zval *return_value TSRMLS_DC)
 {
-       UCalendar*      parsed_calendar = NULL;
+       UCalendar      *parsed_calendar = NULL;
        UChar*          text_utf16  = NULL;
        int32_t         text_utf16_len = 0;
        long            isInDST = 0;
@@ -92,7 +92,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex
        intl_convert_utf8_to_utf16(&text_utf16, &text_utf16_len, text_to_parse, text_len, &INTL_DATA_ERROR_CODE(dfo));
        INTL_METHOD_CHECK_STATUS(dfo, "Error converting timezone to UTF-16" );
 
-       parsed_calendar = udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
+       parsed_calendar = (UCalendar *)udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
        udat_parseCalendar( DATE_FORMAT_OBJECT(dfo), parsed_calendar, text_utf16, text_utf16_len, parse_pos, &INTL_DATA_ERROR_CODE(dfo));
        
        if (text_utf16) {