EmulatorPkg: Undefine CR3 macro in Host.h

[edk2] [Patch] EmulatorPkg: Undefine CR3 macro in Host.h

Posted by Liming Gao 6 years, 1 month ago

CR3 has been used as structure field name in BaseLib IA32_TASK_STATE_SEGMENT.
Undefine CR3 to make sure there is no conflict to it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Andrew Fish <afish@apple.com>
---
 EmulatorPkg/Unix/Host/Host.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 9d6d36e..f7db46c 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -82,7 +82,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #undef NTOHS
 #undef HTONS
 #undef B0
-
+#undef CR3

 #include <PiPei.h>
 #include <Uefi.h>
--
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] EmulatorPkg: Undefine CR3 macro in Host.h

Posted by Jordan Justen 6 years, 1 month ago

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

On 2018-02-22 22:22:18, Liming Gao wrote:
> CR3 has been used as structure field name in BaseLib IA32_TASK_STATE_SEGMENT.
> Undefine CR3 to make sure there is no conflict to it.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> ---
>  EmulatorPkg/Unix/Host/Host.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
> index 9d6d36e..f7db46c 100644
> --- a/EmulatorPkg/Unix/Host/Host.h
> +++ b/EmulatorPkg/Unix/Host/Host.h
> @@ -82,7 +82,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>  #undef NTOHS
>  #undef HTONS
>  #undef B0
> -
> +#undef CR3
> 
>  #include <PiPei.h>
>  #include <Uefi.h>
> --
> 2.8.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel