X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FInclude%2FOpenSslSupport.h;h=258854b10172b4d2510fb53964186fd7fda70a55;hp=571511582edd673d1f34a911d1e188722d749d42;hb=8e01b449de91cfcd1bdf473ae1bc766c22eb616e;hpb=c220787b13fbbff9a0b0bc2e03d88577a5e9b52b

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