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-r | |
| parent | 2deb6bffbf89879c563de2c9491db3b446a4e55d (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)
Diffstat (limited to 'x11-servers/XttXF86srv-common/files/patch-r')
| -rw-r--r-- | x11-servers/XttXF86srv-common/files/patch-r | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/x11-servers/XttXF86srv-common/files/patch-r b/x11-servers/XttXF86srv-common/files/patch-r new file mode 100644 index 000000000000..ef144a258fcc --- /dev/null +++ b/x11-servers/XttXF86srv-common/files/patch-r @@ -0,0 +1,43 @@ +--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.ORIG Mon Nov 27 13:29 :06 2000 ++++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Mon Nov 27 14:26:21 2000 +@@ -461,11 +461,21 @@ + # endif + # ifdef SYSCONS_SUPPORT + # define COMPAT_SYSCONS +-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++# if defined(__NetBSD__) || defined(__OpenBSD__) + # include <machine/console.h> + # else +-# include <sys/console.h> +-# endif /* __FreeBSD__ || __NetBSD__ || defined(__OpenBSD__) */ ++# if defined(__FreeBSD__) ++# include <osreldate.h> ++# if __FreeBSD_version >= 410000 ++# include <sys/consio.h> ++# include <sys/kbio.h> ++# else ++# include <machine/console.h> ++# endif /* FreeBSD 4.1 RELEASE or lator */ ++# else ++# include <sys/console.h> ++# endif ++# endif + # endif /* SYSCONS_SUPPORT */ + # if defined(PCVT_SUPPORT) + # if !defined(SYSCONS_SUPPORT) +@@ -496,8 +506,13 @@ + # include <dev/wscons/wsconsio.h> + # endif /* WSCONS_SUPPORT */ + # if defined(__FreeBSD__) +-# undef MOUSE_GETINFO +-# include <machine/mouse.h> ++# include <osreldate.h> ++# if __FreeBSD_version >= 500013 ++# include <sys/mouse.h> ++# else ++# undef MOUSE_GETINFO ++# include <machine/mouse.h> ++# endif + # endif + /* Include these definitions in case ioctl_pc.h didn't get included */ + # ifndef CONSOLE_X_MODE_ON |