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/common/common_enum.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/common/common_enum.cpp')
| -rw-r--r-- | ext/intl/common/common_enum.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp index 14265d4597..a0e346061a 100644 --- a/ext/intl/common/common_enum.cpp +++ b/ext/intl/common/common_enum.cpp @@ -18,6 +18,8 @@ #include "config.h" #endif +#include "../intl_cppshims.h" + // Fix build on Windows/old versions of ICU #include <stdio.h> |