* grub-core/loader/machoXX.c: Fix compilation on non-i386.

diff --git a/ChangeLog b/ChangeLog
index 6d9c9988a70b99dbab56a5f296405203e8ea5429..440e9ca44a9c16d4170424c1a45217f2e4541d04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/machoXX.c: Fix compilation on non-i386.
+
 2013-12-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/xen_fileXX.c: Silence cast-align.

diff --git a/grub-core/loader/macho32.c b/grub-core/loader/macho32.c
index eda8d9ed7d67d8738b1efdc671fe3362d7cb6c0f..2de3a5c6f867dcd21abbca535b3ae1f7285b44e8 100644 (file)
--- a/grub-core/loader/macho32.c
+++ b/grub-core/loader/macho32.c
@@ -1,4 +1,4 @@
-#include <grub/cpu/macho.h>
+#include <grub/macho.h>
 #include <grub/machoload.h>
 
 #define SUFFIX(x) x ## 32

diff --git a/grub-core/loader/macho64.c b/grub-core/loader/macho64.c
index 417a4a83d5c3c4733cb4fba680f1cd47362aa448..0affceb770e44e8c520b43d62f856ada96cc1864 100644 (file)
--- a/grub-core/loader/macho64.c
+++ b/grub-core/loader/macho64.c
@@ -1,4 +1,4 @@
-#include <grub/cpu/macho.h>
+#include <grub/macho.h>
 #include <grub/machoload.h>
 
 #define SUFFIX(x) x ## 64

diff --git a/include/grub/i386/macho.h b/include/grub/i386/macho.h
index 5bdf9b2132f99fddec6718d93befe0df9232bee2..e15167a50159f376879955fecc67ef1d28c36c92 100644 (file)
--- a/include/grub/i386/macho.h
+++ b/include/grub/i386/macho.h
@@ -29,23 +29,4 @@
 #define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x) == GRUB_MACHO_CPUTYPE_IA32)
 #endif
 
-struct grub_macho_thread32
-{
-  grub_uint32_t cmd;
-  grub_uint32_t cmdsize;
-  grub_uint8_t unknown1[48];
-  grub_uint32_t entry_point;
-  grub_uint8_t unknown2[20];
-} GRUB_PACKED;
-
-
-struct grub_macho_thread64
-{
-  grub_uint32_t cmd;
-  grub_uint32_t cmdsize;
-  grub_uint8_t unknown1[0x88];
-  grub_uint64_t entry_point;
-  grub_uint8_t unknown2[0x20];
-} GRUB_PACKED;
-
 #endif

diff --git a/include/grub/macho.h b/include/grub/macho.h
index 3c88e71ca40efd8ce09f087e6497bec5cb36bbe8..2dea625f1be53f425f6a4f0f7103dbcd1059456b 100644 (file)
--- a/include/grub/macho.h
+++ b/include/grub/macho.h
@@ -139,6 +139,24 @@ union grub_macho_filestart
   struct grub_macho_lzss_header lzss;
 } GRUB_PACKED;
 
+struct grub_macho_thread32
+{
+  grub_uint32_t cmd;
+  grub_uint32_t cmdsize;
+  grub_uint8_t unknown1[48];
+  grub_uint32_t entry_point;
+  grub_uint8_t unknown2[20];
+} GRUB_PACKED;
+
+struct grub_macho_thread64
+{
+  grub_uint32_t cmd;
+  grub_uint32_t cmdsize;
+  grub_uint8_t unknown1[0x88];
+  grub_uint64_t entry_point;
+  grub_uint8_t unknown2[0x20];
+} GRUB_PACKED;
+
 #define GRUB_MACHO_LZSS_OFFSET 0x180
 
 grub_size_t