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
........

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ce594dc9ddd70d25a15a4e207c4a095685a7c4fc..f88043c9a522a8bd9364002102c15b301aa0cacd 100644 (file)
--- 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