Move windows.h include out of internal/*.h.

Author: ericsnowcurrently

Include/internal/condvar.h

@@ -32,7 +32,6 @@
 
 /* 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
@@ -50,7 +49,7 @@
 
 #if _PY_EMULATED_WIN_CV
 
-typedef CRITICAL_SECTION PyMUTEX_T;
+typedef struct CRITICAL_SECTION PyMUTEX_T;
 
 /* The ConditionVariable object.  From XP onwards it is easily emulated
    with a Semaphore.
@@ -69,20 +68,16 @@ typedef CRITICAL_SECTION PyMUTEX_T;
    that would otherwise happen.
  */
 
-typedef struct _PyCOND_T
-{
-    HANDLE sem;
-    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
-} PyCOND_T;
+typedef struct _PyCOND_T 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 SRWLOCK PyMUTEX_T;
+typedef struct SRWLOCK PyMUTEX_T;
 
-typedef CONDITION_VARIABLE  PyCOND_T;
+typedef struct CONDITION_VARIABLE  PyCOND_T;
 
 #endif /* _PY_EMULATED_WIN_CV */
 

Include/pyport.h

@@ -641,7 +641,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 /* only get special linkage if built as shared or platform is Cygwin */
 #if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__)
 #       if defined(HAVE_DECLSPEC_DLL)
-#               ifdef Py_BUILD_CORE
+#               if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
 #                       define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE
 #                       define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
         /* module init functions inside the core need no external linkage */
@@ -773,7 +773,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #define PY_LITTLE_ENDIAN 1
 #endif
 
-#ifdef Py_BUILD_CORE
+#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
 /*
  * Macros to protect CRT calls against instant termination when passed an
  * invalid parameter (issue23524).

PC/pyconfig.h

@@ -277,21 +277,20 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 
 /* For an MSVC DLL, we can nominate the .lib files used by extensions */
 #ifdef MS_COREDLL
-#       ifndef Py_BUILD_CORE /* not building the core - must be an ext */
-#               ifndef Py_BUILD_CORE_MODULE
-#                       if defined(_MSC_VER)
-                                /* So MSVC users need not specify the .lib
-                                file in their Makefile (other compilers are
-                                generally taken care of by distutils.) */
-#                               if defined(_DEBUG)
-#                                       pragma comment(lib,"python37_d.lib")
-#                               elif defined(Py_LIMITED_API)
-#                                       pragma comment(lib,"python3.lib")
-#                               else
-#                                       pragma comment(lib,"python37.lib")
-#                               endif /* _DEBUG */
-#                       endif /* _MSC_VER */
-#               endif /* Py_BUILD_CORE_MODULE */
+#       if !defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
+                /* not building the core - must be an ext */
+#               if defined(_MSC_VER)
+                        /* So MSVC users need not specify the .lib
+                        file in their Makefile (other compilers are
+                        generally taken care of by distutils.) */
+#                       if defined(_DEBUG)
+#                               pragma comment(lib,"python37_d.lib")
+#                       elif defined(Py_LIMITED_API)
+#                               pragma comment(lib,"python3.lib")
+#                       else
+#                               pragma comment(lib,"python37.lib")
+#                       endif /* _DEBUG */
+#               endif /* _MSC_VER */
 #       endif /* Py_BUILD_CORE */
 #endif /* MS_COREDLL */
 

Python/condvar.h

@@ -104,6 +104,8 @@ 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
@@ -121,6 +123,12 @@ 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)
 {