Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 52561:8f51dd09f3f2
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
........
| author | Jesse Noller <jnoller@gmail.com> |
|---|---|
| date | Tue, 31 Mar 2009 18:48:42 +0000 |
| parents | 648e07dd0825 |
| children | 911df82bc25d |
line wrap: on
line diff
--- a/Modules/socketmodule.c Tue Mar 31 18:41:03 2009 +0000 +++ b/Modules/socketmodule.c Tue Mar 31 18:48:42 2009 +0000 @@ -382,7 +382,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
