Re: [edk2-devel] [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error

["Ni, Ray" <ray.ni@intel.com>]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Saturday, July 22, 2023 9:06 AM
> To: devel@edk2.groups.io
> Cc: Gerd Hoffmann <kraxel@redhat.com>; Rebecca Cran <rebecca@bsdio.com>;
> Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION
> redefinition error
> 
> Update WinInclude.h to prevent error due to redefinition of
> RUNTIME_FUNCTION using same technique that has been used
> in the past for structure types such as LIST_ENTRY.
> 
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/EmulatorPkg/Win/Host/WinInclude.h
> b/EmulatorPkg/Win/Host/WinInclude.h
> index c2b6cfa3d658..877d2b0ed016 100644
> --- a/EmulatorPkg/Win/Host/WinInclude.h
> +++ b/EmulatorPkg/Win/Host/WinInclude.h
> @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  //
>  // Win32 include files do not compile clean with /W4, so we use the warning
> -// pragma to suppress the warnings for Win32 only. This way our code can stil
> +// pragma to suppress the warnings for Win32 only. This way our code can still
>  // compile at /W4 (highest warning level) with /WX (warnings cause build
>  // errors).
>  //
> @@ -19,9 +19,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #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
> +#define GUID              _WINNT_DUP_GUID_____
> +#define _LIST_ENTRY       _WINNT_DUP_LIST_ENTRY_FORWARD
> +#define LIST_ENTRY        _WINNT_DUP_LIST_ENTRY
> +#define RUNTIME_FUNCTION  _WINNT_DUP_RUNTIME_FUNCTION
>  #if defined (MDE_CPU_IA32) && (_MSC_VER < 1800)
>  #define InterlockedIncrement          _WINNT_DUP_InterlockedIncrement
>  #define InterlockedDecrement          _WINNT_DUP_InterlockedDecrement
> @@ -45,6 +46,7 @@ typedef UINT32 size_t;
>  #undef GUID
>  #undef _LIST_ENTRY
>  #undef LIST_ENTRY
> +#undef RUNTIME_FUNCTION
>  #undef InterlockedIncrement
>  #undef InterlockedDecrement
>  #undef InterlockedCompareExchange64
> --
> 2.40.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107151): https://edk2.groups.io/g/devel/message/107151
Mute This Topic: https://groups.io/mt/100288521/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-