summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/cryptlib.h
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2021-03-09 12:16:23 -0500
committerPeter Jones <pjones@redhat.com>2021-03-10 15:54:20 -0500
commit78809820b5a3f79a0bfbec00e630e40011acf4ec (patch)
treefaa20391b132a2749a978ab60bebb38b457c3807 /Cryptlib/OpenSSL/crypto/cryptlib.h
parentf033a1da9f4c3acf7e3dfef906d01e348b6fcf42 (diff)
downloadefi-boot-shim-78809820b5a3f79a0bfbec00e630e40011acf4ec.tar.gz
efi-boot-shim-78809820b5a3f79a0bfbec00e630e40011acf4ec.zip
Fix Cryptlib's va_* definitions.
Some time ago, commit e571428e212 ("Update to openssl to 1.0.2e") changed the way we define the va_* (and VA_*) functions and macros. Unfortunately, it only changed for some parts of the tree, and the different parts of the tree need to both call each other and use the same types in all cases. Additionally, they need to all be able to call gnu-efi functions such as VPrint, which means they need the same va_list type definitions everywhere. This partially reverts that patch, adding EFIAPI back and unsetting NO_BUILTIN_VA_FUNCS everywhere.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/cryptlib.h')
-rw-r--r--Cryptlib/OpenSSL/crypto/cryptlib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Cryptlib/OpenSSL/crypto/cryptlib.h b/Cryptlib/OpenSSL/crypto/cryptlib.h
index 3e3ea5e3..2bce19ff 100644
--- a/Cryptlib/OpenSSL/crypto/cryptlib.h
+++ b/Cryptlib/OpenSSL/crypto/cryptlib.h
@@ -100,7 +100,7 @@ extern "C" {
void OPENSSL_cpuid_setup(void);
extern unsigned int OPENSSL_ia32cap_P[];
-void OPENSSL_showfatal(const char *fmta, ...);
+void EFIAPI OPENSSL_showfatal(const char *fmta, ...);
#ifndef OPENSSL_NO_STDIO
void *OPENSSL_stderr(void);
#endif