cvs: ZendEngine2 / zend_alloc.c

felipe Wed Apr 1 16:55:11 2009 UTC Modified files: /ZendEngine2 zend_alloc.c Log: - Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.223&r2=1.224&diff_format=u Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.223 ZendEngine2/zend_alloc.c:1.224 --- ZendEngine2/zend_alloc.c:1.223 Fri Mar 20 11:23:22 2009 +++ ZendEngine2/zend_alloc.c Wed Apr 1 16:55:11 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.c,v 1.223 2009/03/20 11:23:22 dmitry Exp $ */ +/* $Id: zend_alloc.c,v 1.224 2009/04/01 16:55:11 felipe Exp $ */ #include "zend.h" #include "zend_alloc.h" @@ -155,7 +155,12 @@ { 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);