summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-04-01 15:37:07 +0200
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-04-01 23:28:00 +0100
commitd3a29c108bf146440645d8b1a3b2e0f22a34ac59 (patch)
tree971a81f5136b3facb6d9a8c76d619df1e28b4609 /ext/intl/php_intl.c
parent7460741f991aa646e54456ef022676ca184b54fe (diff)
downloadphp-git-d3a29c108bf146440645d8b1a3b2e0f22a34ac59.tar.gz
Supported Calendar methods new to ICU 49.
Diffstat (limited to 'ext/intl/php_intl.c')
-rwxr-xr-xext/intl/php_intl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 54b1e76073..95045551ce 100755
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -556,6 +556,11 @@ ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_set_lenient, 0, 0, 2 )
ZEND_ARG_INFO( 0, isLenient )
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX( ainfo_cal_wall_time_option, 0, 0, 2 )
+ ZEND_ARG_OBJ_INFO( 0, calendar, IntlCalendar, 0 )
+ ZEND_ARG_INFO( 0, wallTimeOption )
+ZEND_END_ARG_INFO()
+
/* Gregorian Calendar */
ZEND_BEGIN_ARG_INFO_EX( ainfo_gregcal_create_instance, 0, 0, 0 )
ZEND_ARG_INFO(0, timeZoneOrYear)
@@ -765,6 +770,12 @@ zend_function_entry intl_functions[] = {
PHP_FE( intlcal_set_first_day_of_week, ainfo_cal_dow )
PHP_FE( intlcal_set_lenient, ainfo_cal_set_lenient )
PHP_FE( intlcal_equals, ainfo_cal_other_cal )
+#if U_ICU_VERSION_MAJOR_NUM >= 49
+ PHP_FE( intlcal_get_repeated_wall_time_option, ainfo_cal_only_cal )
+ PHP_FE( intlcal_get_skipped_wall_time_option, ainfo_cal_only_cal )
+ PHP_FE( intlcal_set_repeated_wall_time_option, ainfo_cal_wall_time_option )
+ PHP_FE( intlcal_set_skipped_wall_time_option, ainfo_cal_wall_time_option )
+#endif
PHP_FE( intlcal_get_error_code, ainfo_cal_only_cal )
PHP_FE( intlcal_get_error_message, ainfo_cal_only_cal )