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_methods.cpp | |
| 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_methods.cpp')
| -rw-r--r-- | ext/intl/timezone/timezone_methods.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index caf5dcdedc..9ca6b44c89 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -24,6 +24,9 @@ #include <unicode/timezone.h> #include <unicode/ustring.h> #include "intl_convertcpp.h" + +#include "../common/common_date.h" + extern "C" { #include "../php_intl.h" #define USE_TIMEZONE_POINTER 1 |