Although pyconfig.h claims that WIN32 is obsolete it is still required for the locale...

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 27cb17fce790c29998ae4884c399920a4832b0ab..9ab20f7fe98c4641f32085c8a87012561e79a3d2 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -23,9 +23,11 @@ compiler specific".  Therefore, these should be very rare.
 
 
 NOTE: The following symbols are deprecated:
-NT, WIN32, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
+NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
 MS_CORE_DLL.
 
+WIN32 is still required for the locale module.
+
 */
 
 #ifdef _WIN32_WCE

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index 8a3f495c2ae8633ff20574b4ce0c298553fff952..55a53e966b9960c631b5fe0f777660b511c9a3c8 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool
@@ -119,7 +119,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool
@@ -197,7 +197,7 @@
                                InlineFunctionExpansion="0"
                                EnableIntrinsicFunctions="false"
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="3"
                        />
                        <Tool
@@ -275,7 +275,7 @@
                                InlineFunctionExpansion="0"
                                EnableIntrinsicFunctions="false"
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="3"
                        />
                        <Tool
@@ -349,7 +349,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool
@@ -424,7 +424,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool
@@ -499,7 +499,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool
@@ -574,7 +574,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
-                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
                                RuntimeLibrary="2"
                        />
                        <Tool