diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-12-26 03:24:38 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-12-26 03:24:38 +0000 |
| commit | 681877fb30fc1ac2bc9002c8bf56ee0f93e913f6 (patch) | |
| tree | ccc74d19a93cf806244c6e7f61cde11ea4218edc /x11-servers/XttXF86srv-common/files/patch-q | |
| parent | Modify installation directory and install catalog. (diff) | |
Merge the patches that were added to x11/XFree86 in these several
months. This should fix the build on 5-CURRENT and help some video
chips. See x11/XFree86's history for details.
Approved by: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> (MAINTAINER)
Notes
Notes:
svn path=/head/; revision=36356
Diffstat (limited to 'x11-servers/XttXF86srv-common/files/patch-q')
| -rw-r--r-- | x11-servers/XttXF86srv-common/files/patch-q | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/x11-servers/XttXF86srv-common/files/patch-q b/x11-servers/XttXF86srv-common/files/patch-q new file mode 100644 index 000000000000..66937ce3de9a --- /dev/null +++ b/x11-servers/XttXF86srv-common/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 |