From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 26 Mar 2011 11:49:34 +0000 (+0100)
Subject: 	Fix FreeBSD compilation problem.
X-Git-Tag: 1.99~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82fe6c751bb32337045a57a18f2bb1f05c91d47b;p=thirdparty%2Fgrub.git

	Fix FreeBSD compilation problem.

	* grub-core/kern/emu/hostdisk.c (MAJOR) [FreeBSD]: New definition.
	(FLOPPY_MAJOR) [FreeBSD]: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index b556c77e8..bf69511a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix FreeBSD compilation problem.
+
+	* grub-core/kern/emu/hostdisk.c (MAJOR) [FreeBSD]: New definition.
+	(FLOPPY_MAJOR) [FreeBSD]: Likewise.
+
 2011-03-24  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/video/fb/video_fb.c (grub_video_fb_get_info_and_fini):
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 12dbe7469..b4f51da0f 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -92,6 +92,8 @@ struct hd_geometry
 # include <sys/disk.h> /* DIOCGMEDIASIZE */
 # include <sys/param.h>
 # include <sys/sysctl.h>
+# define MAJOR(dev) major(dev)
+# define FLOPPY_MAJOR	2
 #endif
 
 #if defined(__APPLE__)