summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:42:10 +0000
committerGregory P. Smith <greg@mad-scientist.com>2010-10-13 03:42:10 +0000
commitbcb61956e34b18a00ac0ecdc8f268902af003ff7 (patch)
tree972899bee6f7156209f3d8906acf48f03d1e2525
parent25def7d9b032a7f1afe86806b1551aa2a79683e5 (diff)
downloadcpython-git-bcb61956e34b18a00ac0ecdc8f268902af003ff7.tar.gz
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 ........
-rw-r--r--Modules/socketmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 884cfe54dc..7a7bde906f 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
#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