From 6ec313be7b8ca54261a1561b935aeed9dfd95020 Mon Sep 17 00:00:00 2001
From: Juergen Lock <nox@FreeBSD.org>
Date: Tue, 27 Sep 2011 17:37:18 +0000
Subject: Fix build on 9 and 10.

Submitted by:	pointyhat via erwin
---
 .../linux_dvbwrapper-kmod/files/linux_dvbwrapper.c     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c')

diff --git a/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c b/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c
index 8045c12e94c7..c1f1b680fe9b 100644
--- a/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c
+++ b/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: /tmp/pcvs/ports/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c,v 1.1 2011-04-24 15:51:13 nox Exp $");
+__FBSDID("$FreeBSD: /tmp/pcvs/ports/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c,v 1.2 2011-09-27 17:37:18 nox Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,6 +39,10 @@ __FBSDID("$FreeBSD: /tmp/pcvs/ports/multimedia/linux_dvbwrapper-kmod/files/linux
 #include <sys/mman.h>
 #include <sys/resourcevar.h>
 
+#if __FreeBSD_version > 900040
+#include <sys/capability.h>
+#endif
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
@@ -295,7 +299,12 @@ linux_ioctl_dvb(struct thread *td, struct linux_ioctl_args *args)
 			goto out2;
 		copyout(vp, (void *)uvp, propsiz);
 
-		if ((error = fget(td, args->fd, &fp)) != 0) {
+#if __FreeBSD_version > 900040
+		if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0)
+#else
+		if ((error = fget(td, args->fd, &fp)) != 0)
+#endif
+		{
 			(void)copyout_unmap(td, uvp, propsiz);
 			goto out2;
 		}
@@ -329,6 +338,11 @@ linux_ioctl_dvb(struct thread *td, struct linux_ioctl_args *args)
 	default:			return (ENOIOCTL);
 	}
 
+/* actually r225618 but __FreeBSD_version wasn't bumped */
+#if __FreeBSD_version > 900043
+	error = sys_ioctl(td, (struct ioctl_args *)args);
+#else
 	error = ioctl(td, (struct ioctl_args *)args);
+#endif
 	return (error);
 }
-- 
cgit v1.2.3