mirror of
https://github.com/python/cpython.git
synced 2026-05-06 12:49:07 -04:00
gh-131082: Add missing guards for WIN32_LEAN_AND_MEAN (#131044)
(cherry picked from commit de8818ae23)
Co-authored-by: Max Bachmann <kontakt@maxbachmann.de>
This commit is contained in:
@@ -37,8 +37,10 @@
|
||||
#define Py_HAVE_CONDVAR
|
||||
|
||||
/* include windows if it hasn't been done before */
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#include <windows.h> // CRITICAL_SECTION
|
||||
|
||||
/* options */
|
||||
/* non-emulated condition variables are provided for those that want
|
||||
|
||||
@@ -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>
|
||||
|
||||
+4
-2
@@ -39,8 +39,10 @@ Data members:
|
||||
#include <locale.h>
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
# ifndef WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# endif
|
||||
# include <windows.h>
|
||||
#endif /* MS_WINDOWS */
|
||||
|
||||
#ifdef MS_COREDLL
|
||||
|
||||
Reference in New Issue
Block a user