2006-10-28 Yoshinori K. Okuji <okuji@enbug.org>

        * normal/menu.c: Include grub/script.h.
        * normal/menu_entry.c: Likewise.
        * include/grub/normal.h: Do not include grub/script.h.

diff --git a/ChangeLog b/ChangeLog
index cf08be842069b55806997623167c23ec19ca407b..e3a62d94240d65d60549a5b81ff6ac6550a8d90a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-28  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * normal/menu.c: Include grub/script.h.
+       * normal/menu_entry.c: Likewise.
+       * include/grub/normal.h: Do not include grub/script.h.
+
 2006-10-27  Hollis Blanchard  <hollis@penguinppc.org>
 
        * kern/disk.c (grub_disk_read): Correct debug printf formatting.

diff --git a/include/grub/normal.h b/include/grub/normal.h
index 898cfa3500cdb8ec70ede3c239b902706ea23d41..ecca40cb0aadb1c1395b50e2a65b0a7d32ba8712 100644 (file)
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -25,7 +25,6 @@
 #include <grub/symbol.h>
 #include <grub/err.h>
 #include <grub/arg.h>
-#include <grub/script.h>
 
 /* The maximum size of a command-line.  */
 #define GRUB_MAX_CMDLINE       1600

diff --git a/normal/menu.c b/normal/menu.c
index b712581abdacbb15fc88cd58dd22cc03f17b4b93..967b308b24ba245a3912059242b9b44530ceaeb2 100644 (file)
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -24,6 +24,7 @@
 #include <grub/mm.h>
 #include <grub/machine/time.h>
 #include <grub/env.h>
+#include <grub/script.h>
 
 static void
 draw_border (void)

diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 1690c77a96ea16e23f2b51a2c29ee37ff88bae7f..9bc6bba1ed98d2b0b74a7bb90f927d4c3e1d3940 100644 (file)
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/loader.h>
+#include <grub/script.h>
 
 enum update_mode
   {