From: Marcus Boerger <helly@php.net>
Date: Wed, 20 Dec 2006 20:49:01 +0000 (+0000)
Subject: - Compilers mightnot like the zstr return,thus return void*
X-Git-Tag: RELEASE_1_0_0RC1~604
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f7e1b8ef3941cd7da5c08912dcae9f1d9995918;p=php

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

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 0dc91d0233..e86be9f95f 100644
--- 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 186efdffe7..a7a3891d07 100644
--- 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;