diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2017-09-12 01:30:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 01:30:43 (GMT) |
| commit | fc1bf872e9d31f3e837f686210f94e57ad3d6582 (patch) | |
| tree | 022ec284a8087f2704288cb675889574f5cca8ca /PC | |
| parent | 8728018624f257c7cfe44014742ae46134047f49 (diff) | |
| download | cpython-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 'PC')
| -rw-r--r-- | PC/pyconfig.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 4e25fbd..db745de 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -143,7 +143,7 @@ WIN32 is still required for the locale module. structures etc so it can optionally use new Windows features if it determines at runtime they are available. */ -#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE) +#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_BUILTIN) || defined(Py_BUILD_CORE_MODULE) #ifndef NTDDI_VERSION #define NTDDI_VERSION Py_NTDDI #endif @@ -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_BUILTIN) + /* 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 */ |