Fix hurd build.

* util/getroot.c [__GNU__] (strip_extra_slashes, xgetcwd, exec_pipe,
find_root_devices_from_poolname, find_root_devices_from_libzfs,
grub_find_device): Do not define.

diff --git a/ChangeLog b/ChangeLog
index 8d27fdb7fcceaa1622ee1580120dea162491f901..8d03e4be532ae1d18a2f7731832d2d97891281a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 
        * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
        not define nr variable.
+       * util/getroot.c [__GNU__] (strip_extra_slashes, xgetcwd, exec_pipe,
+       find_root_devices_from_poolname, find_root_devices_from_libzfs,
+       grub_find_device): Do not define.
 
 2012-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/util/getroot.c b/util/getroot.c
index 508a40d03755773ef449ae27e644095a74fc934b..2d62d63bf800fc725675c5e8da7c267d57ed9435 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -175,7 +175,7 @@ static int
 grub_util_is_imsm (const char *os_dev);
 #endif
 
-#if ! defined(__CYGWIN__)
+#if ! defined(__CYGWIN__) && !defined(__GNU__)
 
 static void
 strip_extra_slashes (char *dir)
@@ -218,7 +218,7 @@ xgetcwd (void)
 
 #endif
 
-#if !defined (__MINGW32__) && !defined (__CYGWIN__)
+#if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
 
 static pid_t
 exec_pipe (char **argv, int *fd)
@@ -665,7 +665,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
 
 #endif /* __linux__ */
 
-#if !defined (__MINGW32__) && !defined (__CYGWIN__)
+#if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
 
 static char **
 find_root_devices_from_libzfs (const char *dir)
@@ -698,6 +698,8 @@ grub_find_device (const char *dir __attribute__ ((unused)),
   return 0;
 }
 
+#elif defined (__GNU__)
+
 #elif ! defined(__CYGWIN__)
 
 char *