| Message ID | 1407850402-11193-2-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h index 5a2745d7ac4a..84c819a20a3b 100644 --- a/Cryptlib/Include/OpenSslSupport.h +++ b/Cryptlib/Include/OpenSslSupport.h @@ -35,6 +35,15 @@ 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
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 | 9 +++++++++ 1 file changed, 9 insertions(+)