011fe8
From a433d177585c8355c6ede67469a521d05cf1e9d7 Mon Sep 17 00:00:00 2001
78a3d7
From: Colin Watson <cjwatson@ubuntu.com>
78a3d7
Date: Fri, 17 Jan 2014 02:30:52 +0000
4dcaf2
Subject: [PATCH 017/143] freebsd/hostdisk.c is only ever compiled on FreeBSD
78a3d7
78a3d7
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
78a3d7
redundant preprocessor conditional.
78a3d7
---
78a3d7
 ChangeLog                          | 5 +++++
78a3d7
 grub-core/osdep/freebsd/hostdisk.c | 2 --
78a3d7
 2 files changed, 5 insertions(+), 2 deletions(-)
78a3d7
78a3d7
diff --git a/ChangeLog b/ChangeLog
011fe8
index b445f12..6613b4e 100644
78a3d7
--- a/ChangeLog
78a3d7
+++ b/ChangeLog
78a3d7
@@ -1,3 +1,8 @@
78a3d7
+2014-01-17  Colin Watson  <cjwatson@debian.org>
78a3d7
+
78a3d7
+	* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
78a3d7
+	redundant preprocessor conditional.
78a3d7
+
78a3d7
 2014-01-08  Colin Watson  <cjwatson@ubuntu.com>
78a3d7
 
78a3d7
 	* Makefile.util.def (grub-macbless): Change mansection to 8.
78a3d7
diff --git a/grub-core/osdep/freebsd/hostdisk.c b/grub-core/osdep/freebsd/hostdisk.c
78a3d7
index bd5fddb..eb202dc 100644
78a3d7
--- a/grub-core/osdep/freebsd/hostdisk.c
78a3d7
+++ b/grub-core/osdep/freebsd/hostdisk.c
78a3d7
@@ -108,7 +108,6 @@ grub_util_fd_open (const char *os_dev, int flags)
78a3d7
 
78a3d7
   ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
78a3d7
 
78a3d7
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
78a3d7
   if (! (sysctl_oldflags & 0x10)
78a3d7
       && sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_oldflags, sysctl_size))
78a3d7
     {
78a3d7
@@ -116,7 +115,6 @@ grub_util_fd_open (const char *os_dev, int flags)
78a3d7
       close (ret);
78a3d7
       return GRUB_UTIL_FD_INVALID;
78a3d7
     }
78a3d7
-#endif
78a3d7
 
78a3d7
   return ret;
78a3d7
 }
78a3d7
-- 
37b39b
1.9.3
78a3d7