From 47e255dfa3baeeb99e0ae3c8a5a4559e475a40c9 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Mon, 28 Jul 2014 07:36:46 +0000 Subject: Fix build error with VS2013 toolchain for NT32 Package caused by function redefinition, use #if fix the error. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15691 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/Include/Common/WinNTInclude.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Nt32Pkg') diff --git a/Nt32Pkg/Include/Common/WinNTInclude.h b/Nt32Pkg/Include/Common/WinNTInclude.h index 3f4fb2373..63256587b 100644 --- a/Nt32Pkg/Include/Common/WinNTInclude.h +++ b/Nt32Pkg/Include/Common/WinNTInclude.h @@ -1,6 +1,6 @@ /**@file -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -34,7 +34,7 @@ Abstract: #define GUID _WINNT_DUP_GUID_____ #define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD #define LIST_ENTRY _WINNT_DUP_LIST_ENTRY -#if defined (MDE_CPU_IA32) +#if defined (MDE_CPU_IA32) && (_MSC_VER < 1800) #define InterlockedIncrement _WINNT_DUP_InterlockedIncrement #define InterlockedDecrement _WINNT_DUP_InterlockedDecrement #define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64 -- cgit v1.2.3