Declare GRUB_EFI_VENDOR_APPLE_GUID.

diff --git a/ChangeLog b/ChangeLog
index 21106903c5df89838bddad990d3bf0a164319906..20cc11f67f6d58b094a5f6a61fe5fd4bf96caa93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Declare GRUB_EFI_VENDOR_APPLE_GUID.
+
 2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Dump type and vendor specific data when printing device path.

diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
index 3777c7f0b2c6c2b1e0df382101530bca23c385a0..74888c463badded765411ed69c655ac9b9b1dfa9 100644 (file)
--- a/grub-core/loader/efi/appleloader.c
+++ b/grub-core/loader/efi/appleloader.c
@@ -89,8 +89,7 @@ struct piwg_full_device_path
          .subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,                 \
          .length = sizeof (struct grub_efi_piwg_device_path)           \
        },                                                              \
-       .guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,   \
-                                             0x01, 0xAE, 0xF2, 0xB7}}  \
+       .guid = GRUB_EFI_VENDOR_APPLE_GUID                              \
       },                                                               \
        .end =                                                          \
          {                                                             \

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 233e792a584550ec33413a95b528621f4040cf8d..ad0f0ec710529a496423ecabc86c458fa5acd30d 100644 (file)
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -280,6 +280,12 @@
   { 0xb1b621d5, 0xf19c, 0x41a5, \
       { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \
   }
+
+#define GRUB_EFI_VENDOR_APPLE_GUID \
+  { 0x2B0585EB, 0xD8B8, 0x49A9,        \
+      { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \
+  }
+
 struct grub_efi_sal_system_table
 {
   grub_uint32_t signature;