Move the windows.h include back.

Author: ericsnowcurrently

Include/internal/condvar.h

@@ -32,6 +32,7 @@
 
 /* include windows if it hasn't been done before */
 #define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 /* options */
 /* non-emulated condition variables are provided for those that want
@@ -49,7 +50,7 @@
 
 #if _PY_EMULATED_WIN_CV
 
-typedef struct CRITICAL_SECTION PyMUTEX_T;
+typedef CRITICAL_SECTION PyMUTEX_T;
 
 /* The ConditionVariable object.  From XP onwards it is easily emulated
    with a Semaphore.
@@ -68,16 +69,20 @@ typedef struct CRITICAL_SECTION PyMUTEX_T;
    that would otherwise happen.
  */
 
-typedef struct _PyCOND_T PyCOND_T;
+typedef struct _PyCOND_T
+{
+    HANDLE sem;
+    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
+} PyCOND_T;
 
 #else /* !_PY_EMULATED_WIN_CV */
 
 /* Use native Win7 primitives if build target is Win7 or higher */
 
 /* SRWLOCK is faster and better than CriticalSection */
-typedef struct SRWLOCK PyMUTEX_T;
+typedef SRWLOCK PyMUTEX_T;
 
-typedef struct CONDITION_VARIABLE  PyCOND_T;
+typedef CONDITION_VARIABLE  PyCOND_T;
 
 #endif /* _PY_EMULATED_WIN_CV */
 

Python/condvar.h

@@ -104,8 +104,6 @@ PyCOND_TIMEDWAIT(PyCOND_T *cond, PyMUTEX_T *mut, long long us)
  * example native support on VISTA and onwards.
  */
 
-#include <windows.h>
-
 #if _PY_EMULATED_WIN_CV
 
 /* The mutex is a CriticalSection object and
@@ -123,12 +121,6 @@ PyCOND_TIMEDWAIT(PyCOND_T *cond, PyMUTEX_T *mut, long long us)
    http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
 */
 
-struct _PyCOND_T
-{
-    HANDLE sem;
-    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
-};
-
 Py_LOCAL_INLINE(int)
 PyMUTEX_INIT(PyMUTEX_T *cs)
 {