- Compilers mightnot like the zstr return,thus return void*

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 0dc91d0233f1777aa7ee4b8d34dad9a75fcddbf6..e86be9f95fe03975f2e584d9a36a2fefc1a98bb5 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2033,7 +2033,7 @@ ZEND_API UChar *zend_ustrndup(const UChar *s, uint length)
        return p;
 }
 
-ZEND_API zstr zend_zstrndup(int type, const zstr s, uint length)
+ZEND_API void *zend_zstrndup(int type, const zstr s, uint length)
 {
        zstr result;
        if (type == IS_STRING) {

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 186efdffe7701936e6c9344135c9bf57db94eca5..a7a3891d071a6fde869ec6e5e49701e3913624b7 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -41,7 +41,7 @@ BEGIN_EXTERN_C()
 
 ZEND_API char *zend_strndup(const char *s, unsigned int length) ZEND_ATTRIBUTE_MALLOC;
 ZEND_API UChar *zend_ustrndup(const UChar *s, uint length) ZEND_ATTRIBUTE_MALLOC;
-ZEND_API zstr zend_zstrndup(int type, const zstr s, uint length) ZEND_ATTRIBUTE_MALLOC;
+ZEND_API void *zend_zstrndup(int type, const zstr s, uint length) ZEND_ATTRIBUTE_MALLOC;
 
 ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
 ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;