]> 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:56:08 +0000 (16:56 +0000)
committerFelipe Pena <felipe@php.net>
Wed, 1 Apr 2009 16:56:08 +0000 (16:56 +0000)
Zend/zend_alloc.c

index bdb6ff80c29499075b2c8b011329852e29910aa9..2efd15efcfb1a35481f6e67bc224b76c9357f893 100644 (file)
@@ -148,7 +148,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);