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

Fix hurd build.

Browse source 
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
not define nr variable.
This commit is contained in:
Samuel Thibault 2012-04-22 18:44:19 +02:00
parent 9a06490c07
commit 524b5d3a7c
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2012-04-21 Vladimir Serbinenko <phcoder@gmail.com>
Fix kfreebsd compile and behaviour. Fix kfreebsd compile and behaviour.

4
grub-core/kern/emu/hostdisk.c
View file

@ -242,13 +242,15 @@ grub_util_biosdisk_iterate (int (*hook) (const char *name),
grub_uint64_t grub_uint64_t
grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize) grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize)
{ {
#if !defined (__GNU__)
# if defined(__NetBSD__) # if defined(__NetBSD__)
struct disklabel label; struct disklabel label;
# elif defined (__sun__) # elif defined (__sun__)
struct dk_minfo minfo; struct dk_minfo minfo;
#else # else
unsigned long long nr; unsigned long long nr;
# endif # endif
#endif
unsigned sector_size, log_sector_size; unsigned sector_size, log_sector_size;
struct stat st; struct stat st;