summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 20:08:45 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 20:08:45 +0000
commitadfb98c43223a2f40da7d6ee76a9dae3f8c57070 (patch)
treed75858d07360449f8c3e482cb04c6b72711bab2a /build
parent9f57c98d6d1298ba03475e3a97ab4d78d1266d1b (diff)
downloadchromium_src-adfb98c43223a2f40da7d6ee76a9dae3f8c57070.zip
chromium_src-adfb98c43223a2f40da7d6ee76a9dae3f8c57070.tar.gz
chromium_src-adfb98c43223a2f40da7d6ee76a9dae3f8c57070.tar.bz2
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
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
-rw-r--r--build/internal/essential.vsprops2
2 files changed, 2 insertions, 2 deletions
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"