1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-30860: Move windows.h include out of internal/*.h. (#3458)

Browse Source 
PR #3397 introduced a large number of warnings to the Windows build. This patch fixes them.
This commit is contained in:
Eric Snow 2017-09-11 18:30:43 -07:00 committed by GitHub
parent 8728018624
commit fc1bf872e9
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/pyport.h
View File

@ -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 */ /* only get special linkage if built as shared or platform is Cygwin */
#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__) #if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__)
# if defined(HAVE_DECLSPEC_DLL) # 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_FUNC(RTYPE) __declspec(dllexport) RTYPE
# define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE # define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
/* module init functions inside the core need no external linkage */ /* 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 #define PY_LITTLE_ENDIAN 1
#endif #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 * Macros to protect CRT calls against instant termination when passed an
* invalid parameter (issue23524). * invalid parameter (issue23524).

2
Modules/_json.c
View File

@ -1,7 +1,7 @@
/* Core extension modules are built-in on some platforms (e.g. Windows). */ /* Core extension modules are built-in on some platforms (e.g. Windows). */
#ifdef Py_BUILD_CORE #ifdef Py_BUILD_CORE
#define Py_BUILD_CORE_MODULE #define Py_BUILD_CORE_BUILTIN
#undef Py_BUILD_CORE #undef Py_BUILD_CORE
#endif #endif

2
Modules/_pickle.c
View File

@ -1,7 +1,7 @@
/* Core extension modules are built-in on some platforms (e.g. Windows). */ /* Core extension modules are built-in on some platforms (e.g. Windows). */
#ifdef Py_BUILD_CORE #ifdef Py_BUILD_CORE
#define Py_BUILD_CORE_MODULE #define Py_BUILD_CORE_BUILTIN
#undef Py_BUILD_CORE #undef Py_BUILD_CORE
#endif #endif

31
PC/pyconfig.h
View File

@ -143,7 +143,7 @@ WIN32 is still required for the locale module.
structures etc so it can optionally use new Windows features if it structures etc so it can optionally use new Windows features if it
determines at runtime they are available. 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 #ifndef NTDDI_VERSION
#define NTDDI_VERSION Py_NTDDI #define NTDDI_VERSION Py_NTDDI
#endif #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 */ /* For an MSVC DLL, we can nominate the .lib files used by extensions */
#ifdef MS_COREDLL #ifdef MS_COREDLL
# ifndef Py_BUILD_CORE /* not building the core - must be an ext */ # if !defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_BUILTIN)
# ifndef Py_BUILD_CORE_MODULE /* not building the core - must be an ext */
# if defined(_MSC_VER) # if defined(_MSC_VER)
/* So MSVC users need not specify the .lib /* So MSVC users need not specify the .lib
file in their Makefile (other compilers are file in their Makefile (other compilers are
generally taken care of by distutils.) */ generally taken care of by distutils.) */
# if defined(_DEBUG) # if defined(_DEBUG)
# pragma comment(lib,"python37_d.lib") # pragma comment(lib,"python37_d.lib")
# elif defined(Py_LIMITED_API) # elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib") # pragma comment(lib,"python3.lib")
# else # else
# pragma comment(lib,"python37.lib") # pragma comment(lib,"python37.lib")
# endif /* _DEBUG */ # endif /* _DEBUG */
# endif /* _MSC_VER */ # endif /* _MSC_VER */
# endif /* Py_BUILD_CORE_MODULE */
# endif /* Py_BUILD_CORE */ # endif /* Py_BUILD_CORE */
#endif /* MS_COREDLL */ #endif /* MS_COREDLL */