From: Christian Heimes <christian@python.org>
Date: Mon, 8 Nov 2021 11:48:34 +0000 (+0200)
Subject: bpo-45743: Move __APPLE_USE_RFC_3542 into socketmodule.c (GH-29456)
X-Git-Tag: v3.11.0a3~290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24af9a40a8f85af813ea89998aa4e931fcc78cd9;p=thirdparty%2FPython%2Fcpython.git

bpo-45743: Move __APPLE_USE_RFC_3542 into socketmodule.c (GH-29456)
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 50962c41cd3a..ed1043c0c43a 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -86,6 +86,8 @@ Local naming conventions:
 */
 
 #ifdef __APPLE__
+// Issue #35569: Expose RFC 3542 socket options.
+#define __APPLE_USE_RFC_3542 1
 #include <AvailabilityMacros.h>
 /* for getaddrinfo thread safety test on old versions of OS X */
 #ifndef MAC_OS_X_VERSION_10_5
diff --git a/setup.py b/setup.py
index b6bf8e129373..fb641bd57d0d 100644
--- a/setup.py
+++ b/setup.py
@@ -1222,13 +1222,7 @@ class PyBuildExt(build_ext):
         self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs))
 
     def detect_socket(self):
-        # socket(2)
-        kwargs = {'depends': ['socketmodule.h']}
-        if MACOS:
-            # Issue #35569: Expose RFC 3542 socket options.
-            kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']
-
-        self.add(Extension('_socket', ['socketmodule.c'], **kwargs))
+        self.add(Extension('_socket', ['socketmodule.c'], depends=['socketmodule.h']))
 
     def detect_dbm_gdbm(self):
         # Modules that provide persistent dictionary-like semantics.  You will