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

freebsd/hostdisk.c is only ever compiled on FreeBSD

Browse source 
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
redundant preprocessor conditional.
This commit is contained in:
Colin Watson 2014-01-17 02:30:52 +00:00
parent 0776112c53
commit 09a836e59c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-17 Colin Watson <cjwatson@debian.org>
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
redundant preprocessor conditional.
2014-01-08 Colin Watson <cjwatson@ubuntu.com> 2014-01-08 Colin Watson <cjwatson@ubuntu.com>
* Makefile.util.def (grub-macbless): Change mansection to 8. * Makefile.util.def (grub-macbless): Change mansection to 8.

2
grub-core/osdep/freebsd/hostdisk.c
View file

@ -108,7 +108,6 @@ grub_util_fd_open (const char *os_dev, int flags)
ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR); ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (! (sysctl_oldflags & 0x10) if (! (sysctl_oldflags & 0x10)
&& sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_oldflags, sysctl_size)) && sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_oldflags, sysctl_size))
{ {
@ -116,7 +115,6 @@ grub_util_fd_open (const char *os_dev, int flags)
close (ret); close (ret);
return GRUB_UTIL_FD_INVALID; return GRUB_UTIL_FD_INVALID;
} }
#endif
return ret; return ret;
} }