summaryrefslogtreecommitdiff
path: root/CryptoPkg/Include
diff options
context:
space:
mode:
authorqlong <qlong@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-19 16:25:31 +0000
committerqlong <qlong@6f19259b-4bc3-4df7-8a09-765794883524>2011-04-19 16:25:31 +0000
commit8e01b449de91cfcd1bdf473ae1bc766c22eb616e (patch)
tree1c77cf41957844a4ebf2897cc6be834fb84429ff /CryptoPkg/Include
parentc220787b13fbbff9a0b0bc2e03d88577a5e9b52b (diff)
downloadedk2-platforms-8e01b449de91cfcd1bdf473ae1bc766c22eb616e.tar.xz
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
Diffstat (limited to 'CryptoPkg/Include')
-rw-r--r--CryptoPkg/Include/OpenSslSupport.h14
1 files changed, 11 insertions, 3 deletions
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