vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix hurd build.

Browse source 
* 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.
This commit is contained in:
root 2012-04-22 19:02:55 +00:00
parent 524b5d3a7c
commit fe4824e998
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -4,6 +4,9 @@
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
not define nr variable. 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> 2012-04-21 Vladimir Serbinenko <phcoder@gmail.com>

8
util/getroot.c
View file

@ -175,7 +175,7 @@ static int
grub_util_is_imsm (const char *os_dev); grub_util_is_imsm (const char *os_dev);
#endif #endif
#if ! defined(__CYGWIN__) #if ! defined(__CYGWIN__) && !defined(__GNU__)
static void static void
strip_extra_slashes (char *dir) strip_extra_slashes (char *dir)
@ -218,7 +218,7 @@ xgetcwd (void)
#endif #endif
#if !defined (__MINGW32__) && !defined (__CYGWIN__) #if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
static pid_t static pid_t
exec_pipe (char **argv, int *fd) exec_pipe (char **argv, int *fd)
@ -665,7 +665,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
#endif /* __linux__ */ #endif /* __linux__ */
#if !defined (__MINGW32__) && !defined (__CYGWIN__) #if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
static char ** static char **
find_root_devices_from_libzfs (const char *dir) find_root_devices_from_libzfs (const char *dir)
@ -698,6 +698,8 @@ grub_find_device (const char *dir __attribute__ ((unused)),
return 0; return 0;
} }
#elif defined (__GNU__)
#elif ! defined(__CYGWIN__) #elif ! defined(__CYGWIN__)
char * char *