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.

diff --git a/ChangeLog b/ChangeLog
index bbc2262feeab64d4db274fbcee4e442e7ca4b237..ce7330e78d39be1d4b6a50a6f8edf74b1a9190a9 100644 (file)
--- 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 bfbffcc0643e50c2e4b825fc9f40e68de84db71f..0d53f8ff7239b3a7278b32756d03b24911b42eb2 100644 (file)
--- 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 0f2b0cf2d1363175d78ca21258b3bf0ec8df25af..c87c3d175f986cbe85e374958101273df0930191 100644 (file)
--- 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 2c14ee254538c9a9fb7f0a898df8112f7c605ce4..7d7c685ee98d4389f08d0a3bcf81d5d23dd876c0 100644 (file)
--- 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 c253fc938e787bbdee903a843c5b696ecb6c8039..61f21b0e5927cd1ee4b28229ad3338d6ccc1dc68 100644 (file)
--- 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 fd8282849a91d8055fe85b90e1dada1535e8e0b4..6f8a6795bfbaae408738ae9e5da027954fc2bf46 100644 (file)
--- 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 11ba666b1a44c4a79131f1b00dfc7ca16f2bbc02..707f55e34ef68838081cad08c88e3ed22f8cb7b2 100644 (file)
--- 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>