summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2017-09-12 01:30:43 (GMT)
committerGitHub <noreply@github.com>2017-09-12 01:30:43 (GMT)
commitfc1bf872e9d31f3e837f686210f94e57ad3d6582 (patch)
tree022ec284a8087f2704288cb675889574f5cca8ca /Include
parent8728018624f257c7cfe44014742ae46134047f49 (diff)
downloadcpython-fc1bf872e9d31f3e837f686210f94e57ad3d6582.zip
cpython-fc1bf872e9d31f3e837f686210f94e57ad3d6582.tar.gz
cpython-fc1bf872e9d31f3e837f686210f94e57ad3d6582.tar.bz2
bpo-30860: Move windows.h include out of internal/*.h. (#3458)
PR #3397 introduced a large number of warnings to the Windows build. This patch fixes them.
Diffstat (limited to 'Include')
-rw-r--r--Include/pyport.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 6c91898..dbf6db6 100644
--- a/Include/pyport.h
+++ b/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_BUILTIN)
# 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_BUILTIN)
/*
* Macros to protect CRT calls against instant termination when passed an
* invalid parameter (issue23524).