summaryrefslogtreecommitdiffstats
path: root/Modules/mmapmodule.c
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2009-03-31 18:48:42 (GMT)
committerJesse Noller <jnoller@gmail.com>2009-03-31 18:48:42 (GMT)
commit32d68c27880d4ad40c3f06e5397a539a38a85a6f (patch)
tree5c0163cf6777d3d923f1eab229371cde1b4af25f /Modules/mmapmodule.c
parentce9fbd3662f87f5e3192b0c4c1c39a6c4ef452ee (diff)
downloadcpython-32d68c27880d4ad40c3f06e5397a539a38a85a6f.zip
cpython-32d68c27880d4ad40c3f06e5397a539a38a85a6f.tar.gz
cpython-32d68c27880d4ad40c3f06e5397a539a38a85a6f.tar.bz2
Merged revisions 70849,70852 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70849 | jesse.noller | 2009-03-31 13:12:35 -0500 (Tue, 31 Mar 2009) | 1 line Apply patch for netbsd multiprocessing support ........ r70852 | jesse.noller | 2009-03-31 13:27:14 -0500 (Tue, 31 Mar 2009) | 1 line missed the news/acks for netbsd patch ........
Diffstat (limited to 'Modules/mmapmodule.c')
-rw-r--r--Modules/mmapmodule.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index d903eca..c6c8a30 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -520,7 +520,11 @@ mmap_resize_method(mmap_object *self,
#ifdef MREMAP_MAYMOVE
newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
#else
- newmap = mremap(self->data, self->size, new_size, 0);
+ #if defined(__NetBSD__)
+ newmap = mremap(self->data, self->size, self->data, new_size, 0);
+ #else
+ newmap = mremap(self->data, self->size, new_size, 0);
+ #endif /* __NetBSD__ */
#endif
if (newmap == (void *)-1)
{