diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-08-12 10:54:05 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2014-08-12 10:54:05 -0400 |
| commit | 4dabdb22b4d72ac21e9817c3d60711dc03f58059 (patch) | |
| tree | ea5723d76f6cfb6ea2a779fb551b7b41b0ee219a /Cryptlib/Include | |
| parent | 2220be4e6aa959175230bdf71820c11c150d8b2e (diff) | |
| download | efi-boot-shim-4dabdb22b4d72ac21e9817c3d60711dc03f58059.tar.gz efi-boot-shim-4dabdb22b4d72ac21e9817c3d60711dc03f58059.zip | |
CryptLib: undefine va_arg and friends before redefining them
Upstream GNU-EFI contains changes to efistdarg.h resulting in the va_start,
va_arg and va_end macros to be #defined unconditionally. Make sure we #undef
them before overriding the definitions.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'Cryptlib/Include')
| -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
|