diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-05 15:57:00 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-05 15:57:00 +0000 |
| commit | 88f9a9e1d6a0494f3d215a7cf6439d0718ac5d83 (patch) | |
| tree | 52c5abbb9044d4a438d7a3a8b482b50796a942d9 /x11/XFree86/files/patch-q | |
| parent | Increment 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-q')
| -rw-r--r-- | x11/XFree86/files/patch-q | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/x11/XFree86/files/patch-q b/x11/XFree86/files/patch-q new file mode 100644 index 000000000000..66937ce3de9a --- /dev/null +++ b/x11/XFree86/files/patch-q @@ -0,0 +1,21 @@ +--- 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 |