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 d191c1e..bd7f7cc 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -509,7 +509,11 @@
#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 c1e3cfe..ca10fb5 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -379,7 +379,7 @@
#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