[2291] 2009-06-10 Pavel Roskin <[email protected]>

Revision: 2291
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2291
Author:   proski
Date:     2009-06-10 20:11:12 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
2009-06-10  Pavel Roskin  <[email protected]>

	* 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/include/grub/multiboot2.h
    trunk/grub2/include/multiboot2.h
    trunk/grub2/loader/i386/pc/multiboot2.c
    trunk/grub2/loader/ieee1275/multiboot2.c
    trunk/grub2/loader/multiboot2.c
    trunk/grub2/loader/multiboot_loader.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/ChangeLog	2009-06-10 20:11:12 UTC (rev 2291)
@@ -1,5 +1,15 @@
 2009-06-10  Pavel Roskin  <[email protected]>
 
+	* 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.
 

Modified: trunk/grub2/include/grub/multiboot2.h
===================================================================
--- trunk/grub2/include/grub/multiboot2.h	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/include/grub/multiboot2.h	2009-06-10 20:11:12 UTC (rev 2291)
@@ -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

Modified: trunk/grub2/include/multiboot2.h
===================================================================
--- trunk/grub2/include/multiboot2.h	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/include/multiboot2.h	2009-06-10 20:11:12 UTC (rev 2291)
@@ -34,7 +34,9 @@
 
 #ifndef ASM_FILE
 
-#include "stdint.h"
+#ifndef __WORDSIZE
+#include <stdint.h>
+#endif
 
 /* XXX not portable? */
 #if __WORDSIZE == 64

Modified: trunk/grub2/loader/i386/pc/multiboot2.c
===================================================================
--- trunk/grub2/loader/i386/pc/multiboot2.c	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/loader/i386/pc/multiboot2.c	2009-06-10 20:11:12 UTC (rev 2291)
@@ -17,8 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/multiboot2.h>
 #include <multiboot2.h>
-#include <grub/multiboot2.h>
 #include <grub/elf.h>
 #include <grub/err.h>
 #include <grub/machine/loader.h>

Modified: trunk/grub2/loader/ieee1275/multiboot2.c
===================================================================
--- trunk/grub2/loader/ieee1275/multiboot2.c	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/loader/ieee1275/multiboot2.c	2009-06-10 20:11:12 UTC (rev 2291)
@@ -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>

Modified: trunk/grub2/loader/multiboot2.c
===================================================================
--- trunk/grub2/loader/multiboot2.c	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/loader/multiboot2.c	2009-06-10 20:11:12 UTC (rev 2291)
@@ -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>

Modified: trunk/grub2/loader/multiboot_loader.c
===================================================================
--- trunk/grub2/loader/multiboot_loader.c	2009-06-10 18:32:13 UTC (rev 2290)
+++ trunk/grub2/loader/multiboot_loader.c	2009-06-10 20:11:12 UTC (rev 2291)
@@ -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>