From f2f48c5620e9e57b9acdaa68ca3cfd31c4e6bd3a Mon Sep 17 00:00:00 2001
From: Tim Golden <mail@timgolden.me.uk>
Date: Tue, 29 Oct 2013 21:02:25 +0000
Subject: [PATCH] Issue 15792 Correct build options on Win64. Patch by Jeremy
 Kloth.

---
 PC/VS9.0/x64.vsprops | 2 +-
 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 9f88d443fe47b9..d06f470cebad18 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 289d95b1918d40..985c0ef7f7f8e7 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>