1 files changed, 21 insertions, 5 deletions
diff --git a/Cryptlib/Library/BaseLib.h b/Cryptlib/Library/BaseLib.h
index 5d326844..94b25c93 100644
--- a/Cryptlib/Library/BaseLib.h
+++ b/Cryptlib/Library/BaseLib.h
@@ -1,9 +1,25 @@
+#if defined(__x86_64__)
+/* shim.h will check if the compiler is new enough in some other CU */
+
+#if !defined(GNU_EFI_USE_EXTERNAL_STDARG)
+#define GNU_EFI_USE_EXTERNAL_STDARG
+#endif
+
+#if !defined(GNU_EFI_USE_MS_ABI)
+#define GNU_EFI_USE_MS_ABI
+#endif
+
+#ifdef NO_BUILTIN_VA_FUNCS
+#undef NO_BUILTIN_VA_FUNCS
+#endif
+#endif
+
 #include <efi.h>
 #include <efilib.h>
 
 UINT32 WriteUnaligned32 (UINT32 *Buffer, UINT32 Value);
-UINTN AsciiStrSize (CHAR8 *string);
-char *AsciiStrnCpy(char *Destination, char *Source, UINTN count);
-char *AsciiStrCat(char *Destination, char *Source);
-CHAR8 *AsciiStrCpy(CHAR8 *Destination, CHAR8 *Source);
-UINTN AsciiStrDecimalToUintn(const char *String);
+UINTN AsciiStrSize (const CHAR8 *string);
+CHAR8 *AsciiStrnCpy(CHAR8 *Destination, const CHAR8 *Source, UINTN count);
+CHAR8 *AsciiStrCat(CHAR8 *Destination, const CHAR8 *Source);
+CHAR8 *AsciiStrCpy(CHAR8 *Destination, const CHAR8 *Source);
+UINTN AsciiStrDecimalToUintn(const CHAR8 *String);