diff options
author | Jesse Noller <jnoller@gmail.com> | 2009-03-31 18:12:35 (GMT) |
---|---|---|
committer | Jesse Noller <jnoller@gmail.com> | 2009-03-31 18:12:35 (GMT) |
commit | 40a6164afa79f6b97e7e40e0f35f6081fde437c2 (patch) | |
tree | 3451eabd1be9e42982a3d13ef770bd924e6377b1 | |
parent | 3476d1279f469125c62bcea8a84ab65c1e271152 (diff) | |
download | cpython-40a6164afa79f6b97e7e40e0f35f6081fde437c2.zip cpython-40a6164afa79f6b97e7e40e0f35f6081fde437c2.tar.gz cpython-40a6164afa79f6b97e7e40e0f35f6081fde437c2.tar.bz2 |
Apply patch for netbsd multiprocessing support
-rw-r--r-- | Modules/mmapmodule.c | 6 | ||||
-rw-r--r-- | Modules/socketmodule.c | 2 | ||||
-rw-r--r-- | setup.py | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index d191c1e..bd7f7cc 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -509,7 +509,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) { diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9cefe04..b5f53a3 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); #define SOCKETCLOSE close #endif -#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) +#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) && !defined(__NetBSD__) #define USE_BLUETOOTH 1 #if defined(__FreeBSD__) #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP @@ -1280,6 +1280,15 @@ class PyBuildExt(build_ext): ) libraries = [] + elif platform.startswith('netbsd'): + macros = dict( # at least NetBSD 5 + HAVE_SEM_OPEN=1, + HAVE_SEM_TIMEDWAIT=0, + HAVE_FD_TRANSFER=1, + HAVE_BROKEN_SEM_GETVALUE=1 + ) + libraries = [] + else: # Linux and other unices macros = dict( HAVE_SEM_OPEN=1, |