summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:51:16 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:51:16 (GMT)
commitbc5d78d30407a102fb9c1388bf8ca10825b4cefc (patch)
treeaa0abba2efa597dc0fbcaab58150d426e061812a /Modules
parenta356271bd73451d4ce05ea3c6d5ac4f528f185f2 (diff)
downloadcpython-bc5d78d30407a102fb9c1388bf8ca10825b4cefc.zip
cpython-bc5d78d30407a102fb9c1388bf8ca10825b4cefc.tar.gz
cpython-bc5d78d30407a102fb9c1388bf8ca10825b4cefc.tar.bz2
Merged revisions 85404 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85404 | gregory.p.smith | 2010-10-12 20:39:47 -0700 (Tue, 12 Oct 2010) | 2 lines fix compliation on NetBSD ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ce594dc..f88043c 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -379,7 +379,7 @@ dup_socket(SOCKET handle)
#define SOCKETCLOSE close
#endif
-#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) && !defined(__NetBSD__)
+#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