ports/x11/XFree86/files/patch-q
Jean-Marc Zucconi 88f9a9e1d6 Compilation fixes for changes in machine/console.h and machine/mouse.h in
-current. patch-r and patch-s come from the XFRee86-4 port, another patch is
required here for scanpci.c (patch-q, submitted by Donald J. Maddox
<dmaddox@sc.rr.com>)
2000-12-05 15:57:00 +00:00

21 lines
569 B
Text

--- programs/Xserver/hw/xfree86/etc/scanpci.c.orig Fri Dec 3 04:43:47 1999
+++ programs/Xserver/hw/xfree86/etc/scanpci.c Mon Dec 4 14:14:39 2000
@@ -101,7 +101,17 @@
#endif
#if defined(__FreeBSD__) || defined(__386BSD__)
#include <sys/file.h>
-#include <machine/console.h>
+#if defined(__FreeBSD__)
+# include <osreldate.h>
+# if __FreeBSD_version >= 410000
+# include <sys/consio.h>
+# include <sys/kbio.h>
+# else
+# include <machine/console.h>
+# endif
+#else
+# include <machine/console.h>
+#endif
#ifndef GCCUSESGAS
#define GCCUSESGAS
#endif