From: srs5694 <srs5694@users.sourceforge.net>
Date: Wed, 9 Dec 2015 22:31:02 +0000 (-0500)
Subject: Fixed compile problem on ARM64/GNU-EFI.
X-Git-Url: https://code.delx.au/refind/commitdiff_plain/430a0cb5b65d028351f2aa71f3bf3d225803d1fb

Fixed compile problem on ARM64/GNU-EFI.
---

diff --git a/Makefile b/Makefile
index ec8c892..829d1a6 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ MOK_DIR=mok
 GPTSYNC_DIR=gptsync
 EFILIB_DIR=EfiLib
 export EDK2BASE=/usr/local/UDK2014/MyWorkSpace
-export REFIND_VERSION='L"0.10.0.11"'
+export REFIND_VERSION='L"0.10.0.13"'
 
 # The "all" target builds with the TianoCore library if possible, but falls
 # back on the more easily-installed GNU-EFI library if TianoCore isn't
diff --git a/debian/changelog b/debian/changelog
index d2462d8..afdd614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-refind (0.10.0.11-0ppa9) trusty; urgency=medium
+refind (0.10.0.12-0ppa1) wily; urgency=medium
 
   * Version bump
 
- -- Roderick Smith <rodsmith@rodsbooks.com>  Wed, 09 Dec 2015 12:52:52 -0500
+ -- Roderick Smith <rodsmith@rodsbooks.com>  Wed, 09 Dec 2015 16:20:11 -0500
 
 refind (0.10.0-0ppa1) trusty; urgency=medium
 
diff --git a/libeg/lodepng.h b/libeg/lodepng.h
index 2b2cc89..1d2cd25 100644
--- a/libeg/lodepng.h
+++ b/libeg/lodepng.h
@@ -46,6 +46,10 @@ int MyStrlen(const char *InString);
 #else
 #include "../include/tiano_includes.h"
 #endif
+VOID *MyMemSet(VOID *s, int c, size_t n);
+VOID *MyMemCpy(void *__restrict __dest, const void *__restrict __src, size_t __n);
+#define memset(s, c, n) MyMemSet(s, c, n)
+#define memcpy(d, s, n) MyMemCpy(d, s, n)
 
 #ifdef __cplusplus
 #include <vector>
diff --git a/libeg/lodepng_xtra.c b/libeg/lodepng_xtra.c
index 684e10e..bf28c64 100644
--- a/libeg/lodepng_xtra.c
+++ b/libeg/lodepng_xtra.c
@@ -85,12 +85,12 @@ int MyStrlen(const char *InString) {
    return Length;
 } // int MyStrlen()
 
-VOID *memset (VOID *s, int c, size_t n) {
+VOID *MyMemSet(VOID *s, int c, size_t n) {
     SetMem(s, c, n);
     return s;
 }
 
-VOID *memcpy (void *__restrict __dest, const void *__restrict __src, size_t __n) {
+VOID *MyMemCpy(void *__restrict __dest, const void *__restrict __src, size_t __n) {
     CopyMem(__dest, __src, __n);
     return __dest;
 }