]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-132734: Fix build on FreeBSD and old Linux (GH-132829)
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 23 Apr 2025 11:08:30 +0000 (14:08 +0300)
committerGitHub <noreply@github.com>
Wed, 23 Apr 2025 11:08:30 +0000 (14:08 +0300)
Lib/test/test_socket.py
Modules/socketmodule.c

index ed45180a5f7d99c393ddac25b33160519d1578f3..e88611ee3147ba930497256da061fe2804e54c4b 100644 (file)
@@ -2647,14 +2647,13 @@ class BasicBluetoothTest(unittest.TestCase):
             socket.BT_POWER
             socket.BT_CHANNEL_POLICY
             socket.BT_CHANNEL_POLICY_BREDR_ONLY
-            socket.BT_PHY
-            socket.BT_PHY_BR_1M_1SLOT
-            socket.BT_MODE
-            socket.BT_MODE_BASIC
-            socket.BT_VOICE
-            socket.BT_VOICE_TRANSPARENT
-            socket.BT_VOICE_CVSD_16BIT
-            socket.BT_CODEC
+            if hasattr(socket, 'BT_PHY'):
+                socket.BT_PHY_BR_1M_1SLOT
+            if hasattr(socket, 'BT_MODE'):
+                socket.BT_MODE_BASIC
+            if hasattr(socket, 'BT_VOICE'):
+                socket.BT_VOICE_TRANSPARENT
+                socket.BT_VOICE_CVSD_16BIT
             socket.L2CAP_LM
             socket.L2CAP_LM_MASTER
             socket.L2CAP_LM_AUTH
index 22b94e4b03a27ccf73ebfd4d8c7316d93e76b8d4..a4176f907bf828ed25d11a1ac9a7e89423dc4cf1 100644 (file)
@@ -208,7 +208,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 #  include <sys/ioctl.h>
 #endif
 
-#ifdef HAVE_BLUETOOTH_H
+#if defined(HAVE_BLUETOOTH_H) && !defined(__FreeBSD__)
 #  include <netbt/l2cap.h>
 #  include <netbt/rfcomm.h>
 #  include <netbt/hci.h>
@@ -8014,6 +8014,7 @@ socket_exec(PyObject *m)
 #endif
     ADD_INT_MACRO(m, BT_SNDMTU);
     ADD_INT_MACRO(m, BT_RCVMTU);
+#ifdef BT_PHY
     ADD_INT_MACRO(m, BT_PHY);
     ADD_INT_MACRO(m, BT_PHY_BR_1M_1SLOT);
     ADD_INT_MACRO(m, BT_PHY_BR_1M_3SLOT);
@@ -8030,15 +8031,24 @@ socket_exec(PyObject *m)
     ADD_INT_MACRO(m, BT_PHY_LE_2M_RX);
     ADD_INT_MACRO(m, BT_PHY_LE_CODED_TX);
     ADD_INT_MACRO(m, BT_PHY_LE_CODED_RX);
+#endif
+#ifdef BT_MODE
     ADD_INT_MACRO(m, BT_MODE);
     ADD_INT_MACRO(m, BT_MODE_BASIC);
     ADD_INT_MACRO(m, BT_MODE_ERTM);
     ADD_INT_MACRO(m, BT_MODE_STREAMING);
     ADD_INT_MACRO(m, BT_MODE_LE_FLOWCTL);
     ADD_INT_MACRO(m, BT_MODE_EXT_FLOWCTL);
+#endif
+#ifdef BT_PKT_STATUS
     ADD_INT_MACRO(m, BT_PKT_STATUS);
+#endif
+#ifdef BT_ISO_QOS
     ADD_INT_MACRO(m, BT_ISO_QOS);
+#endif
+#ifdef BT_CODEC
     ADD_INT_MACRO(m, BT_CODEC);
+#endif
 #endif /* HAVE_BLUETOOTH_BLUETOOTH_H */
 #endif /* USE_BLUETOOTH */