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/php_intl.h | |
| 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/php_intl.h')
| -rwxr-xr-x | ext/intl/php_intl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 38f61ad8ac..c3d5c60f07 100755 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -22,8 +22,13 @@ #include <php.h> +/* Even if we're included from C++, don't introduce C++ definitions + * because we were included with extern "C". The effect would be that + * when the headers defined any method, they would do so with C linkage */ +#undef U_SHOW_CPLUSPLUS_API +#define U_SHOW_CPLUSPLUS_API 0 #include "collator/collator_sort.h" -#include "grapheme/grapheme.h" +#include <unicode/ubrk.h> #include "intl_error.h" extern zend_module_entry intl_module_entry; |