Worked around bug/quirk in some EFIs that prevented filesystem drivers

[refind] / gptsync / gptsync.h

diff --git a/gptsync/gptsync.h b/gptsync/gptsync.h
index 17150e28dc14900b9bb9f01a57e51fac456dd1d7..54576fa6b89b4784511fd855f621bbedad0b384d 100644 (file)
--- a/gptsync/gptsync.h
+++ b/gptsync/gptsync.h
@@ -35,14 +35,14 @@
  */
 /* Changes copyright (c) 2013 Roderick W. Smith */
 
-#define VERSION L"0.6.9"
+//#define VERSION L"0.9.1"
 
 //
 // config
 //
 
 
-#if defined(EFI32) || defined(EFIX64)
+#if defined(EFI32) || defined(EFIX64) || defined(EFIAARCH64)
 #define CONFIG_EFI
 #endif
 
@@ -81,6 +81,7 @@ typedef CHAR16 CHARN;
 #include <sys/time.h>
 #include <fcntl.h>
 
+/*
 typedef int                 INTN;
 typedef unsigned int        UINTN;
 typedef unsigned char       UINT8;
@@ -88,6 +89,7 @@ typedef unsigned short      UINT16;
 typedef unsigned long       UINT32;
 typedef unsigned long long  UINT64;
 typedef void                VOID;
+*/
 
 typedef int                 BOOLEAN;
 #ifndef FALSE
@@ -105,11 +107,7 @@ void Print(wchar_t *format, ...);
 
 // FUTURE: use STR(),  #define Print printf
 
-#define CopyMem     memcpy
-#define SetMem      memset
-#define CompareMem  memcmp
-
-#define copy_guid(destguid, srcguid) (memcpy(destguid, srcguid, 16))
+#define copy_guid(destguid, srcguid) (CopyMem(destguid, srcguid, 16))
 #define guids_are_equal(guid1, guid2) (memcmp(guid1, guid2, 16) == 0)
 
 #define EFI_UNSUPPORTED 1