diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-10-07 01:48:11 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-10-07 01:48:11 +0300 |
| commit | 2c92f33b1d97d979d4f5d6f2f15de14b5c89452c (patch) | |
| tree | 3bbc08dee23456e44689efde4b19272ebeb21677 /ext/intl/timezone/timezone_methods.cpp | |
| parent | e0b3b3c7524603d57dce62ae1cb1eae3b1bc3e42 (diff) | |
| parent | cd2b0a7bb89101bcb9cb31bbe232a540f6b6eadc (diff) | |
| download | php-git-2c92f33b1d97d979d4f5d6f2f15de14b5c89452c.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
Drop HAVE_PACKED_OBJECT_VALUE
More zpp cleanup in ext/intl
Diffstat (limited to 'ext/intl/timezone/timezone_methods.cpp')
| -rw-r--r-- | ext/intl/timezone/timezone_methods.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index c46b448bbe..a35174d3da 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -440,7 +440,7 @@ U_CFUNC PHP_FUNCTION(intltz_use_daylight_time) U_CFUNC PHP_FUNCTION(intltz_get_offset) { - UDate date; + double date; zend_bool local; zval *rawOffsetArg, *dstOffsetArg; @@ -458,7 +458,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_offset) TIMEZONE_METHOD_FETCH_OBJECT; - to->utimezone->getOffset(date, (UBool) local, rawOffset, dstOffset, + to->utimezone->getOffset((UDate) date, (UBool) local, rawOffset, dstOffset, TIMEZONE_ERROR_CODE(to)); INTL_METHOD_CHECK_STATUS(to, "intltz_get_offset: error obtaining offset"); |