diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:50:11 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:50:11 -0400 |
| commit | 4c03444e7c971185c20fa102eb09b707aea0d4d4 (patch) | |
| tree | c8402158f0090f45bb46b9b539d981633e509f9a /Cryptlib/Include/OpenSslSupport.h | |
| parent | 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (diff) | |
| parent | a14921c5944c340056312f2f5b1728d698f628b1 (diff) | |
| download | efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.tar.gz efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.zip | |
New upstream release.
Diffstat (limited to 'Cryptlib/Include/OpenSslSupport.h')
| -rw-r--r-- | Cryptlib/Include/OpenSslSupport.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h index 5a2745d7..9e56ced7 100644 --- a/Cryptlib/Include/OpenSslSupport.h +++ b/Cryptlib/Include/OpenSslSupport.h @@ -35,6 +35,14 @@ 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
+/*
+ * These are now unconditionally #defined by GNU_EFI's efistdarg.h,
+ * so we should #undef them here before providing a new definition.
+ */
+#undef va_arg
+#undef va_start
+#undef va_end
+
#define va_list VA_LIST
#define va_arg VA_ARG
#define va_start VA_START
|