From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 25 Dec 2005 16:28:48 +0000 (+0000)
Subject: Repair longstanding damage introduced by the AST merge:
X-Git-Tag: v2.5a0~954
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=903a9444a84b4af2c947e15d08968f9e990ae2bc;p=thirdparty%2FPython%2Fcpython.git

Repair longstanding damage introduced by the AST merge:

- Get rid of pgen.c and tokenizer_pgen.c.

- Include tokenizer.c.

All the -uall tests pass on my WinXP VC7.1 box now.
---

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index d220d3513897..aceb7652dc8f 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -2485,9 +2485,6 @@
 					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\Parser\pgen.c">
-		</File>
 		<File
 			RelativePath="..\Modules\posixmodule.c">
 			<FileConfiguration
@@ -3227,7 +3224,31 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Parser\tokenizer_pgen.c">
+			RelativePath="..\Parser\tokenizer.c">
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="ReleaseItanium|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\Python\traceback.c">