summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-10-29 21:20:52 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-10-29 21:20:52 (GMT)
commitedfda1f9221f2aec37556db71fcf7208197290cd (patch)
tree23ecc0bcf4cbd590f31d52407ac4006bc2287c44
parent47674bc470871413cf7fcb77be317b6edfbdd875 (diff)
parentf2f48c5620e9e57b9acdaa68ca3cfd31c4e6bd3a (diff)
downloadcpython-edfda1f9221f2aec37556db71fcf7208197290cd.zip
cpython-edfda1f9221f2aec37556db71fcf7208197290cd.tar.gz
cpython-edfda1f9221f2aec37556db71fcf7208197290cd.tar.bz2
merge
-rw-r--r--PC/VS9.0/x64.vsprops2
-rw-r--r--PCbuild/x64.props2
2 files changed, 2 insertions, 2 deletions
diff --git a/PC/VS9.0/x64.vsprops b/PC/VS9.0/x64.vsprops
index 9f88d44..d06f470 100644
--- a/PC/VS9.0/x64.vsprops
+++ b/PC/VS9.0/x64.vsprops
@@ -8,7 +8,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/USECL:MS_OPTERON /GS-"
+ AdditionalOptions="/GS-"
PreprocessorDefinitions="_WIN64;_M_X64"
/>
<Tool
diff --git a/PCbuild/x64.props b/PCbuild/x64.props
index 289d95b..985c0ef 100644
--- a/PCbuild/x64.props
+++ b/PCbuild/x64.props
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
<PreprocessorDefinitions>_WIN64;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>