From 2763ac183d5a6be9b97a0c1aee0b8933bd4fed97 Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Wed, 10 Jun 2009 20:11:12 +0000
Subject: [PATCH] 2009-06-10  Pavel Roskin  <proski@gnu.org>

	* include/grub/multiboot2.h: Provide compatibility defines for
	multiboot2.h.
	* include/multiboot2.h: Include stdint.h only if needed, using
	angle brackets.
	* loader/i386/pc/multiboot2.c: Include multiboot2.h after
	grub/multiboot2.h.
	* loader/ieee1275/multiboot2.c: Likewise.
	* loader/multiboot2.c: Likewise.
	* loader/multiboot_loader.c: Likewise.
---
 ChangeLog                    | 10 ++++++++++
 include/grub/multiboot2.h    |  6 ++++++
 include/multiboot2.h         |  4 +++-
 loader/i386/pc/multiboot2.c  |  2 +-
 loader/ieee1275/multiboot2.c |  2 +-
 loader/multiboot2.c          |  2 +-
 loader/multiboot_loader.c    |  2 +-
 7 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbc2262fe..ce7330e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-06-10  Pavel Roskin  <proski@gnu.org>
 
+	* include/grub/multiboot2.h: Provide compatibility defines for
+	multiboot2.h.
+	* include/multiboot2.h: Include stdint.h only if needed, using
+	angle brackets.
+	* loader/i386/pc/multiboot2.c: Include multiboot2.h after
+	grub/multiboot2.h.
+	* loader/ieee1275/multiboot2.c: Likewise.
+	* loader/multiboot2.c: Likewise.
+	* loader/multiboot_loader.c: Likewise.
+
 	* configure.ac: Use -nostdlib when probing for the target.  It
 	should not be required to have libc for the target.
 
diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h
index bfbffcc06..0d53f8ff7 100644
--- a/include/grub/multiboot2.h
+++ b/include/grub/multiboot2.h
@@ -24,6 +24,12 @@
 #include <grub/err.h>
 #include <grub/elf.h>
 
+#ifndef GRUB_UTIL
+typedef grub_uint32_t uint32_t;
+typedef grub_uint64_t uint64_t;
+#define __WORDSIZE (8 * GRUB_TARGET_SIZEOF_VOID_P)
+#endif
+
 struct multiboot_tag_header;
 
 grub_err_t
diff --git a/include/multiboot2.h b/include/multiboot2.h
index 0f2b0cf2d..c87c3d175 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -34,7 +34,9 @@
 
 #ifndef ASM_FILE
 
-#include "stdint.h"
+#ifndef __WORDSIZE
+#include <stdint.h>
+#endif
 
 /* XXX not portable? */
 #if __WORDSIZE == 64
diff --git a/loader/i386/pc/multiboot2.c b/loader/i386/pc/multiboot2.c
index 2c14ee254..7d7c685ee 100644
--- a/loader/i386/pc/multiboot2.c
+++ b/loader/i386/pc/multiboot2.c
@@ -17,8 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <multiboot2.h>
 #include <grub/multiboot2.h>
+#include <multiboot2.h>
 #include <grub/elf.h>
 #include <grub/err.h>
 #include <grub/machine/loader.h>
diff --git a/loader/ieee1275/multiboot2.c b/loader/ieee1275/multiboot2.c
index c253fc938..61f21b0e5 100644
--- a/loader/ieee1275/multiboot2.c
+++ b/loader/ieee1275/multiboot2.c
@@ -17,10 +17,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <multiboot2.h>
 #include <grub/loader.h>
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/multiboot2.h>
+#include <multiboot2.h>
 #include <grub/err.h>
 #include <grub/elf.h>
 #include <grub/misc.h>
diff --git a/loader/multiboot2.c b/loader/multiboot2.c
index fd8282849..6f8a6795b 100644
--- a/loader/multiboot2.c
+++ b/loader/multiboot2.c
@@ -17,10 +17,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <multiboot2.h>
 #include <grub/loader.h>
 #include <grub/machine/loader.h>
 #include <grub/multiboot2.h>
+#include <multiboot2.h>
 #include <grub/elfload.h>
 #include <grub/file.h>
 #include <grub/err.h>
diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c
index 11ba666b1..707f55e34 100644
--- a/loader/multiboot_loader.c
+++ b/loader/multiboot_loader.c
@@ -17,10 +17,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <multiboot2.h>
 #include <grub/machine/machine.h>
 #include <grub/multiboot.h>
 #include <grub/multiboot2.h>
+#include <multiboot2.h>
 #include <grub/elf.h>
 #include <grub/file.h>
 #include <grub/err.h>