From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 14 Feb 2015 17:38:19 +0000 (-0800)
Subject: Issue #23461: Normalise line endings when comparing old and new contents of importlib.h
X-Git-Tag: v3.5.0a2~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9076d655134386ddc7f9fca40c926a102f35b84;p=python

Issue #23461: Normalise line endings when comparing old and new contents of importlib.h
---

diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj
index 7f4e419348..f7714c003a 100644
--- a/PCbuild/_freeze_importlib.vcxproj
+++ b/PCbuild/_freeze_importlib.vcxproj
@@ -85,8 +85,8 @@
     <Exec Command='"$(TargetPath)" "$(PySourcePath)Lib\importlib\_bootstrap.py" "$(IntDir)importlib.g.h"' />
     
     <PropertyGroup>
-      <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h'))</_OldContent>
-      <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h'))</_NewContent>
+      <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_OldContent>
+      <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h').Replace(`&#x0D;&#x0A;`, `&#x0A;`))</_NewContent>
     </PropertyGroup>
     
     <Copy SourceFiles="$(IntDir)importlib.g.h"