From a30276e095c10be69b5282d01c20cf5daf3fa671 Mon Sep 17 00:00:00 2001

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Date: Tue, 12 Aug 2014 15:33:18 +0200

Subject: [PATCH 45/74] CryptLib: undefine va_arg and friends before redefining

 them

Upstream GNU-EFI contains changes to efistdarg.h resulting in the va_start,

va_arg and va_end macros to be #defined unconditionally. Make sure we #undef

them before overriding the definitions.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---

 Cryptlib/Include/OpenSslSupport.h | 8 ++++++++

 1 file changed, 8 insertions(+)

diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h

index 5a2745d..9e56ced 100644

--- a/Cryptlib/Include/OpenSslSupport.h

+++ b/Cryptlib/Include/OpenSslSupport.h

@@ -35,6 +35,14 @@ typedef VOID  *FILE;

 // Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h

 //

 #if !defined(__CC_ARM) // if va_list is not already defined

+/*

+ * These are now unconditionally #defined by GNU_EFI's efistdarg.h,

+ * so we should #undef them here before providing a new definition.

+ */

+#undef va_arg

+#undef va_start

+#undef va_end

+

 #define va_list   VA_LIST

 #define va_arg    VA_ARG

 #define va_start  VA_START

-- 

1.9.3