X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FInclude%2FOpenSslSupport.h;h=33eda7dd50e1457c58bf8fb0be59b897a276e485;hp=571511582edd673d1f34a911d1e188722d749d42;hb=b7d320f8117ed2fffe001b1a0b7bfcd4f40fafc4;hpb=4a567c9690db97ecbf982e9428727f073bada504

diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
index 571511582e..33eda7dd50 100644
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ b/CryptoPkg/Include/OpenSslSupport.h
@@ -1,7 +1,7 @@
 /** @file
   Root include file to support building OpenSSL Crypto Library.
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -30,10 +30,16 @@ 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 +217,9 @@ __sighandler_t *signal     (int, __sighandler_t *);
 //
 // Global variables from EFI Application Toolkit required to buiild Open SSL
 //
-FILE  *stderr;
-FILE  *stdin;
-FILE  *stdout;
+extern FILE  *stderr;
+extern FILE  *stdin;
+extern FILE  *stdout;
 
 //
 // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
@@ -233,7 +239,6 @@ FILE  *stdout;
 #define abort()                           ASSERT (FALSE)
 #define assert(expression)
 #define localtime(timer)                  NULL
-#define gmtime(timer)                     NULL
 #define gmtime_r(timer,result)            (result = NULL)
 
 #endif