From: Felipe Pena <felipe@php.net>
Date: Wed, 1 Apr 2009 16:55:11 +0000 (+0000)
Subject: - Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo)
X-Git-Tag: php-5.4.0alpha1~191^2~3997
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=925fd93440950899ced769978229f077e3e4c13a;p=php

- Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo)
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 9cebad116e..002e64d68c 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -155,7 +155,12 @@ static zend_mm_segment* zend_mm_mem_mmap_realloc(zend_mm_storage *storage, zend_
 {
 	zend_mm_segment *ret;
 #ifdef HAVE_MREMAP
+#if defined(__NetBSD__)
+	/* NetBSD 5 supports mremap but takes an extra newp argument */
+	ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE);
+#else
 	ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE);
+#endif
 	if (ret == MAP_FAILED) {
 #endif
 		ret = storage->handlers->_alloc(storage, size);