diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-10-29 22:20:52 +0100 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-10-29 22:20:52 +0100 |
| commit | edfda1f9221f2aec37556db71fcf7208197290cd (patch) | |
| tree | 23ecc0bcf4cbd590f31d52407ac4006bc2287c44 | |
| parent | 47674bc470871413cf7fcb77be317b6edfbdd875 (diff) | |
| parent | f2f48c5620e9e57b9acdaa68ca3cfd31c4e6bd3a (diff) | |
| download | cpython-git-edfda1f9221f2aec37556db71fcf7208197290cd.tar.gz | |
merge
| -rw-r--r-- | PC/VS9.0/x64.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/x64.props | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/PC/VS9.0/x64.vsprops b/PC/VS9.0/x64.vsprops index 9f88d443fe..d06f470ceb 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 289d95b191..985c0ef7f7 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> |