From 8529e0f7f70f427a7202815061362eceba6bfc50 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Wed, 27 Apr 2022 22:41:59 +0100
Subject: New upstream version 15.5

---
 gnu-efi/lib/misc.c | 6 +++---
 gnu-efi/lib/str.c  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu-efi/lib')

diff --git a/gnu-efi/lib/misc.c b/gnu-efi/lib/misc.c
index 47331d07..c9a4b0ba 100644
--- a/gnu-efi/lib/misc.c
+++ b/gnu-efi/lib/misc.c
@@ -98,7 +98,7 @@ ZeroMem (
     RtZeroMem (Buffer, Size);
 }
 
-VOID
+VOID EFIAPI
 SetMem (
     IN VOID     *Buffer,
     IN UINTN    Size,
@@ -108,10 +108,10 @@ SetMem (
     RtSetMem (Buffer, Size, Value);
 }
 
-VOID
+VOID EFIAPI
 CopyMem (
     IN VOID     *Dest,
-    IN CONST VOID     *Src,
+    IN VOID     *Src,
     IN UINTN    len
     )
 {
diff --git a/gnu-efi/lib/str.c b/gnu-efi/lib/str.c
index cf5c7246..b78bf862 100644
--- a/gnu-efi/lib/str.c
+++ b/gnu-efi/lib/str.c
@@ -211,7 +211,7 @@ StrDuplicate (
     Size = StrSize(Src);
     Dest = AllocatePool (Size);
     if (Dest) {
-        CopyMem (Dest, Src, Size);
+        CopyMem (Dest, (void *)Src, Size);
     }
     return Dest;
 }
-- 
cgit v1.2.3