]> granicus.if.org Git - php/commitdiff
- Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo)
authorFelipe Pena <felipe@php.net>
Wed, 1 Apr 2009 16:55:11 +0000 (16:55 +0000)
committerFelipe Pena <felipe@php.net>
Wed, 1 Apr 2009 16:55:11 +0000 (16:55 +0000)
Zend/zend_alloc.c

index 9cebad116ee3d1a41e98a3322aa89ee1b710308c..002e64d68cec969b98dd5446a0fbb3e353838b85 100644 (file)
@@ -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);