diff options
| author | Eric Dong <eric.dong@intel.com> | 2014-07-28 07:36:46 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-07-28 07:36:46 +0000 |
| commit | 47e255dfa3baeeb99e0ae3c8a5a4559e475a40c9 (patch) | |
| tree | 4b248e384bba0b6b64b7fa0aa24dd6c3b11fe5c6 /Nt32Pkg/Include | |
| parent | 40578d09d1f9e8864e6d1eff95b9eeabee4b9947 (diff) | |
| download | edk2-47e255dfa3baeeb99e0ae3c8a5a4559e475a40c9.tar.gz edk2-47e255dfa3baeeb99e0ae3c8a5a4559e475a40c9.tar.bz2 edk2-47e255dfa3baeeb99e0ae3c8a5a4559e475a40c9.zip | |
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 <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
Diffstat (limited to 'Nt32Pkg/Include')
| -rw-r--r-- | Nt32Pkg/Include/Common/WinNTInclude.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Nt32Pkg/Include/Common/WinNTInclude.h b/Nt32Pkg/Include/Common/WinNTInclude.h index 3f4fb23732..63256587bf 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.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
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
|