Fix hurd build.

* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
not define nr variable.

diff --git a/ChangeLog b/ChangeLog
index 986267b9c78f6bfee89ea9b5a2aef920ace9fce0..8d27fdb7fcceaa1622ee1580120dea162491f901 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-22  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       Fix hurd build.
+
+       * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
+       not define nr variable.
+
 2012-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix kfreebsd compile and behaviour.

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 3b41ce8a91dae3ed0c2b856291a02e1df5463543..de5df6224e82f6f65fdbbf04e3aef8520b970366 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -242,13 +242,15 @@ grub_util_biosdisk_iterate (int (*hook) (const char *name),
 grub_uint64_t
 grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize)
 {
+#if !defined (__GNU__)
 # if defined(__NetBSD__)
   struct disklabel label;
 # elif defined (__sun__)
   struct dk_minfo minfo;
-#else
+# else
   unsigned long long nr;
 # endif
+#endif
   unsigned sector_size, log_sector_size;
   struct stat st;