From 8e01b449de91cfcd1bdf473ae1bc766c22eb616e Mon Sep 17 00:00:00 2001 From: qlong Date: Tue, 19 Apr 2011 16:25:31 +0000 Subject: Patch from open source community for CryptoPkg to allow it to build for ARM using the RVCT toolchain. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11565 6f19259b-4bc3-4df7-8a09-765794883524 --- CryptoPkg/Include/OpenSslSupport.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'CryptoPkg/Include') diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index 571511582e..258854b101 100644 --- a/CryptoPkg/Include/OpenSslSupport.h +++ b/CryptoPkg/Include/OpenSslSupport.h @@ -30,10 +30,18 @@ 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 #define va_list VA_LIST #define va_arg VA_ARG #define va_start VA_START #define va_end VA_END +#else // __CC_ARM +#define va_start(Marker, Parameter) __va_start(Marker, Parameter) +#define va_arg(Marker, TYPE) __va_arg(Marker, TYPE) +#define va_end(Marker) ((void)0) +#endif + + // // #defines from EFI Application Toolkit required to buiild Open SSL @@ -211,9 +219,9 @@ __sighandler_t *signal (int, __sighandler_t *); // // Global variables from EFI Application Toolkit required to buiild Open SSL // -FILE *stderr; -FILE *stdin; -FILE *stdout; +static FILE *stderr; +static FILE *stdin; +static FILE *stdout; // // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions -- cgit v1.2.3