summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/php_intl.h')
-rwxr-xr-xext/intl/php_intl.h7
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;