From c334bdee7bb06d6de3056257e098ca5a9b319a9c Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 24 Mar 2026 00:27:01 +0100
Subject: [PATCH] [3.14] GH-131296: Fix clang-cl warning on Windows in
 socketmodule.h (GH-131832) (GH-146340)

(cherry picked from commit 59e2330cf391a9dc324690f8579acd179e66d19d)

Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
---
 Modules/socketmodule.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 63624d511c35..6f8f4b21599c 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -18,6 +18,10 @@
  */
 #ifdef AF_BTH
 # include <ws2bth.h>
+# ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wpragma-pack"
+# endif
 # include <pshpack1.h>
 
 /*
@@ -51,7 +55,10 @@ struct SOCKADDR_BTH_REDEF {
 
 };
 # include <poppack.h>
-#endif
+# ifdef __clang__
+#  pragma clang diagnostic pop
+# endif
+#endif /* AF_BTH */
 
 /* Windows 'supports' CMSG_LEN, but does not follow the POSIX standard
  * interface at all, so there is no point including the code that
-- 
2.47.3