From: Max Bachmann <kontakt@maxbachmann.de>
Date: Tue, 11 Mar 2025 11:33:01 +0000 (+0100)
Subject: gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (#131044)
X-Git-Tag: v3.14.0a6~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de8818ae233b8e7722aa5d6f91d4b5a04bd039df;p=thirdparty%2FPython%2Fcpython.git

gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (#131044)

* Add missing guards for WIN32_LEAN_AND_MEAN

* add missing whitespaces
---

diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h
index ee9533484e80..55271f0a4116 100644
--- a/Include/internal/pycore_condvar.h
+++ b/Include/internal/pycore_condvar.h
@@ -31,7 +31,9 @@
 #define Py_HAVE_CONDVAR
 
 /* include windows if it hasn't been done before */
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>              // CRITICAL_SECTION
 
 /* options */
diff --git a/Include/internal/pycore_semaphore.h b/Include/internal/pycore_semaphore.h
index ffcc6d80344d..269538384606 100644
--- a/Include/internal/pycore_semaphore.h
+++ b/Include/internal/pycore_semaphore.h
@@ -10,7 +10,9 @@
 #include "pycore_pythread.h"      // _POSIX_SEMAPHORES
 
 #ifdef MS_WINDOWS
-#   define WIN32_LEAN_AND_MEAN
+#   ifndef WIN32_LEAN_AND_MEAN
+#       define WIN32_LEAN_AND_MEAN
+#   endif
 #   include <windows.h>
 #elif defined(HAVE_PTHREAD_H)
 #   include <pthread.h>
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
index fc54277cdc0b..ae64037d56ca 100644
--- a/Modules/_interpchannelsmodule.c
+++ b/Modules/_interpchannelsmodule.c
@@ -11,7 +11,9 @@
 #include "pycore_pystate.h"       // _PyInterpreterState_GetIDObject()
 
 #ifdef MS_WINDOWS
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>        // SwitchToThread()
 #elif defined(HAVE_SCHED_H)
 #include <sched.h>          // sched_yield()
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index 27c320ed0731..3f137fa1f541 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -23,7 +23,7 @@
 #include <stddef.h> /* For offsetof */
 
 #ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <fcntl.h>
diff --git a/Python/lock.c b/Python/lock.c
index 554c51d77803..f2067ee2cd5f 100644
--- a/Python/lock.c
+++ b/Python/lock.c
@@ -8,7 +8,9 @@
 #include "pycore_time.h"          // _PyTime_Add()
 
 #ifdef MS_WINDOWS
-#  define WIN32_LEAN_AND_MEAN
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <windows.h>            // SwitchToThread()
 #elif defined(HAVE_SCHED_H)
 #  include <sched.h>              // sched_yield()
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 8030bbbdeafd..adaa5ee1c74a 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -45,7 +45,9 @@ Data members:
 #endif
 
 #ifdef MS_WINDOWS
-#  define WIN32_LEAN_AND_MEAN
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <windows.h>
 #endif /* MS_WINDOWS */