diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-03 23:08:19 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-03 23:08:19 +0100 |
| commit | 6efc877826d327186dbf8055a10856363bc94aa2 (patch) | |
| tree | 4a198a2473e58a2d054ff302b678c9fb3abef8c7 /ext/intl/intl_convertcpp.cpp | |
| parent | 9434f5e41fd321e9e8a893451c6fabb3c658fa27 (diff) | |
| parent | 758f0686d41cd39176f5055c50f0b094580cbbf0 (diff) | |
| download | php-git-6efc877826d327186dbf8055a10856363bc94aa2.tar.gz | |
Merge branch 'datefmt_tz_cal_interop'
* datefmt_tz_cal_interop:
Added and fixed tests given eb346ef
DateFormat plays nice with Calendar, TimeZone
Added private constructor to IntlTimeZone.
Fixed write in constant memory.
Diffstat (limited to 'ext/intl/intl_convertcpp.cpp')
| -rw-r--r-- | ext/intl/intl_convertcpp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index 503402871c..f699a3c61c 100644 --- a/ext/intl/intl_convertcpp.cpp +++ b/ext/intl/intl_convertcpp.cpp @@ -16,8 +16,7 @@ /* $Id$ */ -//Fixes the build on old versions of ICU with Windows -#include <stdio.h> +#include "intl_cppshims.h" #include "intl_convertcpp.h" #include <unicode/ustring.h> |