summaryrefslogtreecommitdiff
path: root/x11/XFree86/files/patch-s
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2000-12-05 15:57:00 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2000-12-05 15:57:00 +0000
commit88f9a9e1d6a0494f3d215a7cf6439d0718ac5d83 (patch)
tree52c5abbb9044d4a438d7a3a8b482b50796a942d9 /x11/XFree86/files/patch-s
parentIncrement PORTVERSION (diff)
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>)
Diffstat (limited to 'x11/XFree86/files/patch-s')
-rw-r--r--x11/XFree86/files/patch-s21
1 files changed, 21 insertions, 0 deletions
diff --git a/x11/XFree86/files/patch-s b/x11/XFree86/files/patch-s
new file mode 100644
index 000000000000..3697f7b18ac3
--- /dev/null
+++ b/x11/XFree86/files/patch-s
@@ -0,0 +1,21 @@
+--- programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c.ORIG Mon Nov 27 14:29 :12 2000
++++ programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c Mon Nov 27 14:37:03 2000
+@@ -83,7 +83,17 @@
+ # endif
+ # ifdef SYSCONS_SUPPORT
+ /* both, Free and NetBSD have syscons */
+-# 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
+ # endif
+ # else
+ # ifdef CODRV_SUPPORT