[coreboot-gerrit] Patch set updated for coreboot: vendorcode/intel/uefi_2.4: Only use __APPLE__ if defined

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13028

-gerrit

commit 28931e3103856114b65eaf18bc9525ffa92baaf9
Author: Martin Roth <martinroth at google.com>
Date:   Sun Jan 17 17:00:48 2016 -0700

    vendorcode/intel/uefi_2.4: Only use __APPLE__ if defined
    
    Instead of defining __APPLE__ to 0, then testing to see if it's
    zero, let the compiler define it. Next, test to verify
    that it's defined before checking to see if it's zero.
    
    Change-Id: I36ca0d75424ed6164afd52138520374cfbe44bae
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h | 2 +-
 src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h b/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h
index e403ebd..ec3fc41 100644
--- a/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h
+++ b/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h
@@ -94,7 +94,7 @@ VERIFY_SIZE_OF (CHAR16, 2);
 ///
 #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
 
-#if __APPLE__
+#if defined __APPLE__ && __APPLE__
   //
   // Apple extension that is used by the linker to optimize code size
   // with assembly functions. Put at the end of your .S files
diff --git a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
index e68f8c9..910730b 100644
--- a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
+++ b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h
@@ -34,7 +34,6 @@ are permitted provided that the following conditions are met:
 //
 // Set the UEFI types and attributes
 //
-#define __APPLE__ 0
 #include <stdlib.h>
 #include <Uefi/UefiBaseType.h>
 #include <Pi/PiBootMode.h>