X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Nt32Pkg%2FInclude%2FCommon%2FWinNTInclude.h;h=3f4fb2373219fc69383a8d656594d97dae00784f;hb=f66a43b26e6e0f4c1e5871dd3a88f2970b3abf87;hp=a8d31c35186f2856ce957d15080d3351fccd5a4d;hpb=45a20a7fd8b12de926a87f6d7b121287354d63af;p=mirror_edk2.git diff --git a/Nt32Pkg/Include/Common/WinNTInclude.h b/Nt32Pkg/Include/Common/WinNTInclude.h index a8d31c3518..3f4fb23732 100644 --- a/Nt32Pkg/Include/Common/WinNTInclude.h +++ b/Nt32Pkg/Include/Common/WinNTInclude.h @@ -1,7 +1,7 @@ -/*++ +/**@file -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials +Copyright (c) 2006 - 2013, 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 http://opensource.org/licenses/bsd-license.php @@ -15,7 +15,7 @@ Module Name: Abstract: Public include file for the WinNt Library ---*/ +**/ #ifndef __WIN_NT_INCLUDE_H__ #define __WIN_NT_INCLUDE_H__ @@ -28,19 +28,28 @@ Abstract: // #pragma warning(disable : 4115) #pragma warning(disable : 4201) -#pragma warning(disable : 4214) #pragma warning(disable : 4028) #pragma warning(disable : 4133) #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) #define InterlockedIncrement _WINNT_DUP_InterlockedIncrement #define InterlockedDecrement _WINNT_DUP_InterlockedDecrement #define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64 +#endif #undef UNALIGNED #undef CONST #undef VOID +#undef DEBUG_EVENT + +// WQBugBug: This typedef is to make "windows.h" buildable. +// It should be removed after the root cause why +// size_t is undefined when go into the line below is found. +#if defined (MDE_CPU_IA32) +typedef UINT32 size_t ; +#endif #include "windows.h" @@ -51,6 +60,7 @@ Abstract: #undef InterlockedDecrement #undef InterlockedCompareExchange64 #undef InterlockedCompareExchangePointer +#undef CreateEventEx #define VOID void @@ -65,7 +75,6 @@ Abstract: // #pragma warning(default : 4115) #pragma warning(default : 4201) -#pragma warning(default : 4214) #endif