Clean-up Windows includes and ifdefs

colesbury · colesbury · commit 153a0b35aa94 · 2023-09-12T14:21:42.000-07:00
diff --git a/Modules/_testinternalcapi/test_lock.c b/Modules/_testinternalcapi/test_lock.c
@@ -5,7 +5,8 @@
 #include "pycore_lock.h"
 #include "clinic/test_lock.c.h"
 
-#ifdef _WIN32
+#ifdef MS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #else
 #include <unistd.h>         // usleep()
@@ -20,7 +21,7 @@ module _testinternalcapi
 static void
 pysleep(int ms)
 {
-#ifdef _WIN32
+#ifdef MS_WINDOWS
     Sleep(ms);
 #else
     usleep(ms * 1000);
diff --git a/Python/lock.c b/Python/lock.c
@@ -5,7 +5,8 @@
 #include "pycore_lock.h"
 #include "pycore_parking_lot.h"
 
-#ifdef _WIN32
+#ifdef MS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>        // SwitchToThread()
 #elif defined(HAVE_SCHED_H)
 #include <sched.h>          // sched_yield()
@@ -37,7 +38,7 @@ struct mutex_entry {
 static void
 _Py_yield(void)
 {
-#ifdef _WIN32
+#ifdef MS_WINDOWS
     SwitchToThread();
 #elif defined(HAVE_SCHED_H)
     sched_yield();
diff --git a/Python/parking_lot.c b/Python/parking_lot.c
@@ -6,7 +6,8 @@
 #include "pycore_pyerrors.h"    // _Py_FatalErrorFormat
 #include "pycore_pystate.h"     // _PyThreadState_GET
 
-#ifdef _WIN32
+#ifdef MS_WINDOWS
+#   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #elif (defined(_POSIX_SEMAPHORES) && !defined(HAVE_BROKEN_POSIX_SEMAPHORES) && \
      defined(HAVE_SEM_TIMEDWAIT))
@@ -23,7 +24,7 @@
 // A simple, cross-platform binary semaphore that can be used to implement
 // wakeup/sleep.
 struct _PySemaphore {
-#if defined(_WIN32)
+#if defined(MS_WINDOWS)
     HANDLE platform_sem;
 #elif defined(USE_SEMAPHORES)
     sem_t platform_sem;
@@ -73,7 +74,7 @@ static _Py_thread_local ThreadData *thread_data = NULL;
 static void
 _PySemaphore_Init(_PySemaphore *sema)
 {
-#if defined(_WIN32)
+#if defined(MS_WINDOWS)
     sema->platform_sem = CreateSemaphore(
         NULL,   //  attributes
         0,      //  initial count
@@ -100,7 +101,7 @@ _PySemaphore_Init(_PySemaphore *sema)
 static void
 _PySemaphore_Destroy(_PySemaphore *sema)
 {
-#if defined(_WIN32)
+#if defined(MS_WINDOWS)
     CloseHandle(sema->platform_sem);
 #elif defined(USE_SEMAPHORES)
     sem_destroy(&sema->platform_sem);
@@ -114,7 +115,7 @@ static int
 _PySemaphore_PlatformWait(_PySemaphore *sema, _PyTime_t timeout)
 {
     int res = Py_PARK_INTR;
-#if defined(_WIN32)
+#if defined(MS_WINDOWS)
     DWORD wait;
     DWORD millis = 0;
     if (timeout < 0) {
@@ -213,7 +214,7 @@ _PySemaphore_Wait(_PySemaphore *sema, _PyTime_t timeout, int detach)
 void
 _PySemaphore_Wakeup(_PySemaphore *sema)
 {
-#if defined(_WIN32)
+#if defined(MS_WINDOWS)
     if (!ReleaseSemaphore(sema->platform_sem, 1, NULL)) {
         Py_FatalError("parking_lot: ReleaseSemaphore failed");
     }
