[Python-checkins] r56624 - python/trunk/PC/pyconfig.h

[mark.hammond]

Author: mark.hammond
Date: Mon Jul 30 02:45:29 2007
New Revision: 56624

Modified:
   python/trunk/PC/pyconfig.h
Log:
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.


Modified: python/trunk/PC/pyconfig.h
==============================================================================
--- python/trunk/PC/pyconfig.h	(original)
+++ python/trunk/PC/pyconfig.h	Mon Jul 30 02:45:29 2007
@@ -32,6 +32,11 @@
 #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 @@
 #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 @@
 #	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