2008-07-02 Pavel Roskin <proski@gnu.org>

	* disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings.
	(memdisk): Make memdisk_orig_addr a pointer.

diff --git a/ChangeLog b/ChangeLog
index 7eee7f23c64a95c55f372dfed7e67d9e9e60637f..050ce284d6368d9d590c63bf348aca483855526e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-02  Pavel Roskin  <proski@gnu.org>
 
+       * disk/memdisk.c (memdisk_addr): Make a pointer to fix warnings.
+       (memdisk): Make memdisk_orig_addr a pointer.
+
        * fs/reiserfs.c (grub_reiserfs_read): Fix misuse of grub_size_t
        for file offsets, use grub_off_t instead.  Fix printf format
        warnings.

diff --git a/disk/memdisk.c b/disk/memdisk.c
index 840ef369c25786ce34348c359ac17cf5eced3dcf..d7f0670d13264992596fd1db953b47952f8d8d6e 100644 (file)
--- a/disk/memdisk.c
+++ b/disk/memdisk.c
@@ -25,7 +25,7 @@
 #include <grub/types.h>
 #include <grub/machine/kernel.h>
 
-static grub_addr_t memdisk_addr;
+static char *memdisk_addr;
 static grub_off_t memdisk_size = 0;
 
 static int
@@ -82,13 +82,13 @@ static struct grub_disk_dev grub_memdisk_dev =
 
 GRUB_MOD_INIT(memdisk)
 {
-  grub_addr_t memdisk_orig_addr;
+  char *memdisk_orig_addr;
 
   memdisk_size = grub_arch_memdisk_size ();
   if (! memdisk_size)
     return;
 
-  memdisk_orig_addr = grub_arch_memdisk_addr ();
+  memdisk_orig_addr = (char *) grub_arch_memdisk_addr ();
   grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr);
 
   memdisk_addr = grub_malloc (memdisk_size);