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.
This commit is contained in:
Mark Hammond 2007-07-30 00:45:29 +00:00
parent 9efd9b6fa4
commit a6a21fabbc
1 changed files with 7 additions and 7 deletions

View File

@ -32,6 +32,11 @@ MS_CORE_DLL.
#define MS_WINCE #define MS_WINCE
#endif #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 /* Visual Studio 2005 introduces deprecation warnings for
"insecure" and POSIX functions. The insecure functions should "insecure" and POSIX functions. The insecure functions should
be replaced by *_s versions (according to Microsoft); the be replaced by *_s versions (according to Microsoft); the
@ -168,8 +173,8 @@ MS_CORE_DLL.
#ifndef WINVER #ifndef WINVER
#define WINVER Py_WINVER #define WINVER Py_WINVER
#endif #endif
#ifndef _WINNT_WIN32 #ifndef _WIN32_WINNT
#define _WINNT_WIN32 Py_WINVER #define _WIN32_WINNT Py_WINVER
#endif #endif
#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 */ # define MS_COREDLL /* deprecated old symbol */
#endif /* !MS_NO_COREDLL && ... */ #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 */ /* All windows compilers that use this header support __declspec */
#define HAVE_DECLSPEC_DLL #define HAVE_DECLSPEC_DLL