Allow socketmodule to compile on NetBSD -current, whose bluetooth API

differs from both Linux and FreeBSD. Accepted by Neal Norwitz.

diff --git a/Misc/ACKS b/Misc/ACKS
index f6803bbe589a6e34eed01b3cad0d04099b6303f1..5998bca41e7778e7ab7659e837a5d6db9fa09b19 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -203,6 +203,7 @@ Vincent Fiack
 Russell Finn
 Nils Fischbeck
 Frederik Fix
+Matt Fleming
 Hernán Martínez Foffani
 Doug Fort
 John Fouhy

diff --git a/Misc/NEWS b/Misc/NEWS
index 663203ba420fd9ce78823234f6192cb1649ac255..ff46fa49c8cef1a2b1a50f210e9e60f3d8460ff6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ Extension Modules
   methods now allow their database parameter to be None as the
   sleepycat API allows.
 
+- Bug #1526460: Fix socketmodule compile on NetBSD as it has a different
+  bluetooth API compared with Linux and FreeBSD.
+
 Tests
 -----
 

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d07ce350a7c7ed7abb2857a261c30e56bbced014..55539ca69908bc1787e28de19cd24f5dac3736bb 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -367,6 +367,14 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #define _BT_SOCKADDR_MEMB(s, proto) &((s)->sock_addr)
 #define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
 #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
+#elif defined(__NetBSD__)
+#define sockaddr_l2 sockaddr_bt
+#define sockaddr_rc sockaddr_bt
+#define sockaddr_sco sockaddr_bt
+#define _BT_SOCKADDR_MEMB(s, proto) &((s)->sock_addr)
+#define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
+#define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
+#define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
 #else
 #define _BT_SOCKADDR_MEMB(s, proto) (&((s)->sock_addr).bt_##proto)
 #define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)