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>
This commit is contained in:
Ard Biesheuvel 2014-08-12 15:33:18 +02:00 committed by Peter Jones
parent 81ee561dde
commit a30276e095

View File

@ -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