C++ compile fixes

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d8ebb20ac87178fdd350684f9c11a9265f8a6b0b..b9fc4b51404d9562560eeff3ef5a1c22e06b7b59 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -58,7 +58,9 @@ BEGIN_EXTERN_C()
 #define ZEND_MODULE_INFO_D(module)                     void ZEND_MODULE_INFO_N(module)(ZEND_MODULE_INFO_FUNC_ARGS)
 
 #define ZEND_GET_MODULE(name) \
-       ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }
+    BEGIN_EXTERN_C()\
+       ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }\
+    END_EXTERN_C()
 
 #define ZEND_BEGIN_MODULE_GLOBALS(module_name)         \
        typedef struct _zend_##module_name##_globals {

diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index 06fd50c4a431e5d7302feda886cc95a1e5e76e3f..c6125a0f4273281794e4d0135198881af3187df9 100644 (file)
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -45,6 +45,7 @@ typedef struct _zend_constant {
 #define REGISTER_MAIN_STRING_CONSTANT(name, str, flags)  zend_register_string_constant((name), sizeof(name), (str), (flags), 0 TSRMLS_CC)
 #define REGISTER_MAIN_STRINGL_CONSTANT(name, str, len, flags)  zend_register_stringl_constant((name), sizeof(name), (str), (len), (flags), 0 TSRMLS_CC)
 
+BEGIN_EXTERN_C()
 void clean_module_constants(int module_number TSRMLS_DC);
 void free_zend_constant(zend_constant *c);
 int zend_startup_constants(TSRMLS_D);
@@ -59,6 +60,7 @@ ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *st
 ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC);
 void zend_copy_constants(HashTable *target, HashTable *sourc);
 void copy_zend_constant(zend_constant *c);
+END_EXTERN_C();
 
 #define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant
 

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 8d724480cf3ff116085fb7414423fa98501897e4..2819323e11fbd5ba3a3a4acf0976cd05bbf1c9f4 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -152,7 +152,7 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
        end -= needle_len;
 
        while (p <= end) {
-               if ((p = memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
+               if ((p = (char *)memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
                        if (!memcmp(needle, p, needle_len-1)) {
                                return p;
                        }