summaryrefslogtreecommitdiffstats
path: root/src/partgpt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/partgpt.c')
-rw-r--r--src/partgpt.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/partgpt.c b/src/partgpt.c
index 0652a09..19cc8b0 100644
--- a/src/partgpt.c
+++ b/src/partgpt.c
@@ -25,6 +25,12 @@
#include <config.h>
#endif
+#if defined(__FRAMAC__)
+#undef HAVE_SYS_UUID_H
+#undef HAVE_UUID_H
+#undef HAVE_UUID_UUID_H
+#endif
+
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -38,8 +44,7 @@
#include <uuid.h>
#elif defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
-#endif
-#if defined(HAVE_SYS_UUID_H)
+#elif defined(HAVE_SYS_UUID_H)
#include <sys/uuid.h>
#endif
#include <assert.h>
@@ -91,6 +96,7 @@ const struct systypes_gtp gpt_sys_types[] = {
{ GPT_ENT_TYPE_MS_LDM_METADATA, "MS LDM MetaData" },
{ GPT_ENT_TYPE_MS_LDM_DATA, "MS LDM Data" },
{ GPT_ENT_TYPE_MS_RECOVERY, "Windows Recovery Env" },
+ { GPT_ENT_TYPE_MS_SPACES, "MS Storage Spaces" },
// { GPT_ENT_TYPE_LINUX_DATA
{ GPT_ENT_TYPE_LINUX_RAID, "Linux Raid" },
{ GPT_ENT_TYPE_LINUX_SWAP, "Linux Swap" },
@@ -101,7 +107,7 @@ const struct systypes_gtp gpt_sys_types[] = {
{ GPT_ENT_TYPE_LINUX_DATA, "Linux filesys. data" },
{ GPT_ENT_TYPE_HPUX_DATA, "HPUX Data" },
{ GPT_ENT_TYPE_HPUX_SERVICE, "HPUX Service" },
- { GPT_ENT_TYPE_MAC_AFS, "Apple APFS" },
+ { GPT_ENT_TYPE_MAC_APFS, "Apple APFS" },
{ GPT_ENT_TYPE_MAC_HFS, "Mac HFS" },
{ GPT_ENT_TYPE_MAC_UFS, "Mac UFS" },
{ GPT_ENT_TYPE_MAC_RAID, "Mac Raid" },
@@ -109,6 +115,7 @@ const struct systypes_gtp gpt_sys_types[] = {
{ GPT_ENT_TYPE_MAC_BOOT, "Mac Boot" },
{ GPT_ENT_TYPE_MAC_LABEL, "Mac Label" },
{ GPT_ENT_TYPE_MAC_TV_RECOVERY, "Mac TV Recovery" },
+ { GPT_ENT_TYPE_APPLE_CORE_STORAGE, "Apple Core Storage" },
{ GPT_ENT_TYPE_SOLARIS_BOOT, "Solaris /boot" },
{ GPT_ENT_TYPE_SOLARIS_ROOT, "Solaris /" },
{ GPT_ENT_TYPE_SOLARIS_SWAP, "Solaris Swap" },