]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Fix build error with VS2013 toolchain for NT32 Package caused by function redefinitio...
authorEric Dong <eric.dong@intel.com>
Mon, 28 Jul 2014 07:36:46 +0000 (07:36 +0000)
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 28 Jul 2014 07:36:46 +0000 (07:36 +0000)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15691 6f19259b-4bc3-4df7-8a09-765794883524

Nt32Pkg/Include/Common/WinNTInclude.h

index 3f4fb2373219fc69383a8d656594d97dae00784f..63256587bf376b1f68a3c824cbc728c1df8dfae9 100644 (file)
@@ -1,6 +1,6 @@
 /**@file\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -34,7 +34,7 @@ Abstract:
 #define GUID  _WINNT_DUP_GUID_____\r
 #define _LIST_ENTRY  _WINNT_DUP_LIST_ENTRY_FORWARD\r
 #define LIST_ENTRY   _WINNT_DUP_LIST_ENTRY\r
-#if defined (MDE_CPU_IA32)\r
+#if defined (MDE_CPU_IA32) && (_MSC_VER < 1800)\r
 #define InterlockedIncrement _WINNT_DUP_InterlockedIncrement\r
 #define InterlockedDecrement _WINNT_DUP_InterlockedDecrement\r
 #define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64\r