From adfb98c43223a2f40da7d6ee76a9dae3f8c57070 Mon Sep 17 00:00:00 2001
From: "ajwong@chromium.org"
 <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 23 Jun 2009 20:08:45 +0000
Subject: Disable TR1 for windows (set _HAS_TR1=0).  This change requires a
 clobber build.

Review URL: http://codereview.chromium.org/147015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19049 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/common.gypi                | 2 +-
 build/internal/essential.vsprops | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/common.gypi b/build/common.gypi
index f7ec8c2..ea21eaa 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -448,7 +448,7 @@
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
           '_SECURE_ATL',
-          '_HAS_TR1=1',
+          '_HAS_TR1=0',
         ],
         'include_dirs': [
           '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Include',
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops
index 6f7fc90..6b0f1c4f 100644
--- a/build/internal/essential.vsprops
+++ b/build/internal/essential.vsprops
@@ -11,7 +11,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="$(SolutionDir)..;$(SDKIncludes)"
-		PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=1"
+		PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=0"
 		MinimalRebuild="false"
 		ExceptionHandling="0"
 		BufferSecurityCheck="true"
-- 
cgit v1.1