Blame SOURCES/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch

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