diff options
| author | Felipe Pena <felipe@php.net> | 2009-04-01 16:56:08 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-04-01 16:56:08 +0000 |
| commit | 79dbf136b0f4976e30fc7390c69e2205cd3de5eb (patch) | |
| tree | 406aa2d66aa3e68958262421921dbc65c3e7160c | |
| parent | 72fed70e476b99998a8202eeb9e695568ef20f58 (diff) | |
| download | php-git-79dbf136b0f4976e30fc7390c69e2205cd3de5eb.tar.gz | |
- MFH: Fixed bug #47852 (Compilation failure in zend_alloc.c) (Matteo)
| -rw-r--r-- | Zend/zend_alloc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index bdb6ff80c2..2efd15efcf 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -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); |