Module Name: xsrc
Committed By: riz
Date: Mon Jun 11 20:53:14 UTC 2012
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-6]:
compiler.h
Log Message:
Pull up following revision(s) (requested by abs in ticket #300):
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:
revision 1.33
x11/Xserver/Xserver/Makefile: revision 1.19
x11/Xserver/Makefile.common: revision 1.36
external/mit/xorg/server/xorg-server/Makefile.common: revision 1.25
distrib/sets/lists/xserver/md.vax: revision 1.8
external/mit/xorg/server/drivers/Makefile: revision 1.62
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:
revision 1.9
Add vax to the list of non inb() users
Enable wsfb X server on vax. Likely to be keyboard and mouse issues, but
with three additional lines of an ioctl() case in the kernel 'startx' will
display the traditional three xterms
Missed defining XSERVER_XVAX
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8.2.1
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 Tue Aug 2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Mon Jun 11 20:53:14 2012
@@ -1370,7 +1370,7 @@ static __inline__ void stl_u(unsigned lo
# else /* ix86 */
# if !defined(__SUNPRO_C)
-# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__vax__)
# ifdef GCCUSESGAS
/*
@@ -1479,7 +1479,7 @@ inl(unsigned short port)
# endif /* GCCUSESGAS */
-# else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
+# else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__vax__) */
static __inline__ void
outb(unsigned short port, unsigned char val)
