diff options
| author | Jesse Noller <jnoller@gmail.com> | 2009-03-31 18:48:42 (GMT) |
|---|---|---|
| committer | Jesse Noller <jnoller@gmail.com> | 2009-03-31 18:48:42 (GMT) |
| commit | 32d68c27880d4ad40c3f06e5397a539a38a85a6f (patch) | |
| tree | 5c0163cf6777d3d923f1eab229371cde1b4af25f /Modules/socketmodule.c | |
| parent | ce9fbd3662f87f5e3192b0c4c1c39a6c4ef452ee (diff) | |
| download | cpython-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/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 35809ee..c229c07 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -382,7 +382,7 @@ dup_socket(SOCKET handle) #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 |