From owner-FreeBSD-users-jp@jp.freebsd.org  Tue Dec  5 22:59:34 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA26615;
	Tue, 5 Dec 2000 22:59:34 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from nanase.comm.eng.osaka-u.ac.jp (nanase.comm.eng.osaka-u.ac.jp [133.1.44.16])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA26610
	for <FreeBSD-users-jp@jp.freebsd.org>; Tue, 5 Dec 2000 22:59:33 +0900 (JST)
	(envelope-from teramoto@comm.eng.osaka-u.ac.jp)
Received: from malchut (localhost [127.0.0.1])
	by nanase.comm.eng.osaka-u.ac.jp (8.8.8+Sun/3.7W) with SMTP id WAA21738;
	Tue, 5 Dec 2000 22:58:57 +0900 (JST)
Date: Tue, 5 Dec 2000 22:59:32 +0900
From: TERAMOTO Masahiro <teramoto@comm.eng.osaka-u.ac.jp>
To: FreeBSD-users-jp@jp.freebsd.org
Message-Id: <20001205225932.4d53e860.teramoto@comm.eng.osaka-u.ac.jp>
X-Mailer: Sylpheed version 0.4.7 (GTK+ 1.2.8; FreeBSD 4.2-RELEASE; i386)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: FreeBSD-users-jp 57320
Subject: [FreeBSD-users-jp 57320] XttXF86-common
 =?ISO-2022-JP?B?GyRCQj4bKEI=?= 
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: teramoto@comm.eng.osaka-u.ac.jp


$B$O$8$a$^$7$F!";{K\$G$9!#(B

11/20 $B$G(B <machine/{mouse,console}.h> $B$,(B <sys/mouse.h> $B$H(B
<sys/{kb,cons,fb}.h> $B$K0\$C$?$?$a$K(B X 3.3.6 $B$N%S%k%I$,(B current
$B$K$*$$$F<:GT$9$k$h$&$K$J$C$F$^$9!#(B

3.3.6 $B$r;H$C$?$[$&$,4r$7$$?M$,$$$k$+$b$H;W$C$F%Q%C%A$r:n$j$^$7$?!#(B
$B$3$l$G(B XttXF86srv-Mach64 $B$,$&$^$/%S%k%I$G$-$F$^$9!#(B

--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig	Tue Dec  5 21:47:52 2000
+++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	Tue Dec  5 21:49:51 2000
@@ -369,7 +369,8 @@
 #   ifdef SYSCONS_SUPPORT
 #    define COMPAT_SYSCONS
 #    if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#     include <machine/console.h>
+#     include <sys/consio.h>
+#     include <sys/kbio.h>
 #    else
 #     include <sys/console.h>
 #    endif /* __FreeBSD__ || __NetBSD__ || defined(__OpenBSD__) */
@@ -392,7 +393,7 @@
 #   endif /* PCVT_SUPPORT */
 #   if defined(__FreeBSD__)
 #    undef MOUSE_GETINFO
-#    include <machine/mouse.h>
+#    include <sys/mouse.h>
 #   endif
     /* Include these definitions in case ioctl_pc.h didn't get included */
 #   ifndef CONSOLE_X_MODE_ON

--- programs/Xserver/hw/xfree86/etc/scanpci.c.orig	Tue Dec  5 22:05:59 2000
+++ programs/Xserver/hw/xfree86/etc/scanpci.c	Tue Dec  5 22:06:23 2000
@@ -101,7 +101,8 @@
 #endif
 #if defined(__FreeBSD__) || defined(__386BSD__)
 #include <sys/file.h>
-#include <machine/console.h>
+#include <sys/consio.h>
+#include <sys/kbio.h>
 #ifndef GCCUSESGAS
 #define GCCUSESGAS
 #endif

--- programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c.orig	Tue Dec  5 22:07:10 2000
+++ programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c	Tue Dec  5 22:07:40 2000
@@ -78,7 +78,8 @@
 #  endif
 #  ifdef SYSCONS_SUPPORT
     /* both, Free and NetBSD have syscons */
-#   include <machine/console.h>
+#   include <sys/consio.h>
+#   include <sys/kbio.h>
 #  endif
 # else
 #  ifdef CODRV_SUPPORT


-- 
$B;{K\(B $B>;90(B(TERAMOTO Masahiro)
         teramoto@comm.eng.osaka-u.ac.jp
     http://tiphreth.comm.eng.osaka-u.ac.jp/~markun/
