From d51739a416400ad348d8a1c7e3886abce11fff1b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Apr 2015 11:59:25 -0400 Subject: gcc 5.0 changes some include bits, so copy what arm does on x86. Basically they messed around with stdarg some and now we need to do it the other way. Signed-off-by: Peter Jones --- Cryptlib/Include/OpenSslSupport.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Cryptlib/Include/OpenSslSupport.h') diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h index 9e56ced7..b77838db 100644 --- a/Cryptlib/Include/OpenSslSupport.h +++ b/Cryptlib/Include/OpenSslSupport.h @@ -34,7 +34,7 @@ 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 +#if !defined(__CC_ARM) || defined(_STDARG_H) // 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. @@ -94,7 +94,9 @@ typedef __builtin_va_list VA_LIST; portably, hence it is provided by a Standard C header file. For pre-Standard C compilers, here is a version that usually works (but watch out!): */ +#ifndef offsetof #define offsetof(type, member) ( (int) & ((type*)0) -> member ) +#endif // // Basic types from EFI Application Toolkit required to buiild Open SSL -- cgit v1.2.3