summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2009-04-01 16:55:47 +0000
committerFelipe Pena <felipe@php.net>2009-04-01 16:55:47 +0000
commitdc683c85f4f219f0d58b03bd1eaf0bfbe959176e (patch)
treee1cc6bf0ae82070b01d680b3cc0110c553f6b255 /Zend/zend_alloc.c
parent2c243e2bb579ceecb3f728cc68ab37f42fd84916 (diff)
downloadphp-git-dc683c85f4f219f0d58b03bd1eaf0bfbe959176e.tar.gz
- MFH: Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo)
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 97c10018c1..da64081c3a 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -150,7 +150,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);