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

index 97c10018c162414ee4f42e3a834e8cdc38d2199b..da64081c3a8d8b8387e5599c29475f9d17f584d9 100644 (file)
@@ -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);