diff options
| author | Mark Hammond <mhammond@skippinet.com.au> | 2007-07-30 00:45:29 (GMT) |
|---|---|---|
| committer | Mark Hammond <mhammond@skippinet.com.au> | 2007-07-30 00:45:29 (GMT) |
| commit | a6a21fabbcecb163c14110b0d62a3ad053f97f7e (patch) | |
| tree | 9c4f52edaad18d008b6c9f7b708ad813af1cd1e8 /PC | |
| parent | 9efd9b6fa446978566f5b146f552aac87e62a7b0 (diff) | |
| download | cpython-a6a21fabbcecb163c14110b0d62a3ad053f97f7e.zip cpython-a6a21fabbcecb163c14110b0d62a3ad053f97f7e.tar.gz cpython-a6a21fabbcecb163c14110b0d62a3ad053f97f7e.tar.bz2 | |
Correct use of Py_BUILD_CORE - now make sure it is defined before it is
referenced, and also fix definition of _WIN32_WINNT.
Resolves patch 1761803.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/pyconfig.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 16cc9c5..bdac0a6 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -32,6 +32,11 @@ MS_CORE_DLL. #define MS_WINCE #endif +/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ +#ifdef USE_DL_EXPORT +# define Py_BUILD_CORE +#endif /* USE_DL_EXPORT */ + /* Visual Studio 2005 introduces deprecation warnings for "insecure" and POSIX functions. The insecure functions should be replaced by *_s versions (according to Microsoft); the @@ -168,8 +173,8 @@ MS_CORE_DLL. #ifndef WINVER #define WINVER Py_WINVER #endif -#ifndef _WINNT_WIN32 -#define _WINNT_WIN32 Py_WINVER +#ifndef _WIN32_WINNT +#define _WIN32_WINNT Py_WINVER #endif #endif @@ -301,11 +306,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # define MS_COREDLL /* deprecated old symbol */ #endif /* !MS_NO_COREDLL && ... */ -/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ -#ifdef USE_DL_EXPORT -# define Py_BUILD_CORE -#endif /* USE_DL_EXPORT */ - /* All windows compilers that use this header support __declspec */ #define HAVE_DECLSPEC_DLL |