Merged revisions 70849 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
........

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index d191c1e6fb122ed47e6113834052508f06db3913..bd7f7cc8889037531c0d93cffb8ccf6629b4d621 100644 (file)
--- 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 c1e3cfe175d82d3e041df46abf5e614a49b96710..ca10fb55a2a3d0b8d2128fb32497155548538b06 100644 (file)
--- 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

diff --git a/setup.py b/setup.py
index 556f70f1f8a9f75fdcd4b3e48912507f258d6996..62f61d64783a2fe030469df619b5b1e7b5ad16b1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1291,6 +1291,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,