diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-22 04:22:48 +0200 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-22 04:22:48 +0200 |
| commit | 99e48d3a5751b486fdc49a3409edd509faa3b27c (patch) | |
| tree | 911f0481885ad0039d09b9d69fd5c6138776ae13 /ext/intl/timezone/timezone_class.h | |
| parent | 11a5afec22e62af1555ceedc41460b96f8c06ed5 (diff) | |
| parent | 2498c90c71980168b5b9ac2fa006340b9460b1f2 (diff) | |
| download | php-git-99e48d3a5751b486fdc49a3409edd509faa3b27c.tar.gz | |
Merge branch 'datefmt_tz_cal_interop'
* datefmt_tz_cal_interop:
Readded accidentally removed line
Added IntlDateFormatter::formatObject(). Refactor
Refactored internal_get_timestamp()
Unified zval -> UDate conversions
Diffstat (limited to 'ext/intl/timezone/timezone_class.h')
| -rw-r--r-- | ext/intl/timezone/timezone_class.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/intl/timezone/timezone_class.h b/ext/intl/timezone/timezone_class.h index 0d3c0edde4..a638f6dbf4 100644 --- a/ext/intl/timezone/timezone_class.h +++ b/ext/intl/timezone/timezone_class.h @@ -59,7 +59,6 @@ typedef struct { RETURN_FALSE; \ } -TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC); zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, intl_error *outside_error, const char *func TSRMLS_DC); TimeZone *timezone_process_timezone_argument(zval **zv_timezone, intl_error *error, const char *func TSRMLS_DC); |