X-Git-Url: https://code.delx.au/refind/blobdiff_plain/7dc003e307f043bdcb897c22d96a34ab0eedef8f..40ae0d1307c090f26cbf102d64547d558d62e9f2:/gptsync/gptsync.h

diff --git a/gptsync/gptsync.h b/gptsync/gptsync.h
index 2a1bbf0..54576fa 100644
--- a/gptsync/gptsync.h
+++ b/gptsync/gptsync.h
@@ -35,13 +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
 
@@ -80,6 +81,7 @@ typedef CHAR16 CHARN;
 #include <sys/time.h>
 #include <fcntl.h>
 
+/*
 typedef int                 INTN;
 typedef unsigned int        UINTN;
 typedef unsigned char       UINT8;
@@ -87,6 +89,7 @@ typedef unsigned short      UINT16;
 typedef unsigned long       UINT32;
 typedef unsigned long long  UINT64;
 typedef void                VOID;
+*/
 
 typedef int                 BOOLEAN;
 #ifndef FALSE
@@ -104,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
@@ -116,6 +115,13 @@ void Print(wchar_t *format, ...);
 
 #endif
 
+#define GPT_KIND_SYSTEM     (0)
+#define GPT_KIND_DATA       (1)
+#define GPT_KIND_BASIC_DATA (2)
+#define GPT_KIND_FATAL      (3)
+
+#define MAX_MBR_LBA  0xFFFFFFFF
+
 //
 // platform-independent types
 //
@@ -160,11 +166,6 @@ typedef struct {
     CHAR16  name[36];
 } GPT_ENTRY;
 
-#define GPT_KIND_SYSTEM     (0)
-#define GPT_KIND_DATA       (1)
-#define GPT_KIND_BASIC_DATA (2)
-#define GPT_KIND_FATAL      (3)
-
 typedef struct {
     UINT8   guid[16];
     UINT8   mbr_type;