[Python-checkins] r85406 - in python/branches/release31-maint: Modules/socketmodule.c

[gregory.p.smith]

Author: gregory.p.smith
Date: Wed Oct 13 05:51:16 2010
New Revision: 85406

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/socketmodule.c

Modified: python/branches/release31-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/socketmodule.c	(original)
+++ python/branches/release31-maint/Modules/socketmodule.c	Wed Oct 13 05:51:16 2010
@@ -379,7 +379,7 @@
 #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