[Python-checkins] r70850 - in python/branches/release26-maint: Modules/mmapmodule.c Modules/socketmodule.c setup.py
jesse.noller
python-checkins at python.org
Tue Mar 31 20:20:48 CEST 2009
Author: jesse.noller
Date: Tue Mar 31 20:20:48 2009
New Revision: 70850
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Modules/mmapmodule.c
python/branches/release26-maint/Modules/socketmodule.c
python/branches/release26-maint/setup.py
Modified: python/branches/release26-maint/Modules/mmapmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/mmapmodule.c (original)
+++ python/branches/release26-maint/Modules/mmapmodule.c Tue Mar 31 20:20:48 2009
@@ -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)
{
Modified: python/branches/release26-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/socketmodule.c (original)
+++ python/branches/release26-maint/Modules/socketmodule.c Tue Mar 31 20:20:48 2009
@@ -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
Modified: python/branches/release26-maint/setup.py
==============================================================================
--- python/branches/release26-maint/setup.py (original)
+++ python/branches/release26-maint/setup.py Tue Mar 31 20:20:48 2009
@@ -1291,6 +1291,15 @@
)
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,
More information about the Python-checkins
mailing list