diff -c xc/Imakefile:1.1.1.1 xc/Imakefile:3.1
*** xc/Imakefile:1.1.1.1	Mon Jan 30 17:28:53 1995
--- xc/Imakefile	Mon Jan 30 17:28:53 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.125 94/04/08 19:57:43 rws Exp $
+ XCOMM $XFree86: xc/Imakefile,v 3.1 1994/10/20 05:57:10 dawes Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
  
***************
*** 7,19 ****
  #define OSName Unknown Operating System!
  #endif
  
  #if BuildFonts
          FONTSDIR = fonts
  #endif
! #ifndef Win32Architecture
          WIPDIR = workInProgress
          DOCSDIR = doc
  #endif
  
          SUBDIRS = config include lib nls programs $(WIPDIR) $(FONTSDIR) $(DOCSDIR)
    LNINSTALLDIRS = lib
--- 8,22 ----
  #define OSName Unknown Operating System!
  #endif
  
+ #if !BuildServersOnly
  #if BuildFonts
          FONTSDIR = fonts
  #endif
! #if !defined(Win32Architecture) && !defined(OS2Architecture)
          WIPDIR = workInProgress
          DOCSDIR = doc
  #endif
+ #endif
  
          SUBDIRS = config include lib nls programs $(WIPDIR) $(FONTSDIR) $(DOCSDIR)
    LNINSTALLDIRS = lib
***************
*** 27,32 ****
--- 30,36 ----
  DependSubdirs($(SUBDIRS))
  
  #ifndef Win32Architecture
+ #ifndef OS2Architecture
  VerifyOS::
  	@echo ""
  	@echo Building on OSName.
***************
*** 91,97 ****
  	find . -type l -exec rm {} \;
  	find . \( \! \( -type d -o -name Makefile \) \) -print
  
! #else
  VerifyOS::
  	@echo :
  	@echo Building on OSName.
--- 95,170 ----
  	find . -type l -exec rm {} \;
  	find . \( \! \( -type d -o -name Makefile \) \) -print
  
! #else /* OS2Architecture */
! VerifyOS::
! 	@echo :
! 	@echo Building on OSName.
! 	@echo :
! 
! includes::
! 	MakeDir($(subst /,\,$(BUILDINCDIR)))
! 
! XCOMM
! XCOMM Watch out!!!  Make sure you do make includes after removing X11....
! XCOMM
! clean::
! 	$(RM) -r $(BUILDINCDIR)
! 	$(RM) -r $(BUILDLIBDIR)
! 
! XCOMM do not name your log file make.log when you run this ...
! World::
! 	@echo :
! 	@echo Building $(RELEASE) of the X Window System on OS/2
! 	@echo :
! 	@echo :
! 	\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini clean.os2 
! 	\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe
! 	if exist Makefile.bak del Makefile.bak
! 	if exist MAkefile ren Makefile Makefile.bak
! 	$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
! 	$(MAKE) $(MFLAGS) SHELL= VerifyOS
! 	$(MAKE) $(MFLAGS) SHELL= Makefiles
! 	$(MAKE) $(MFLAGS) SHELL= clean
! 	$(MAKE) $(MFLAGS) SHELL= includes
! 	$(MAKE) $(MFLAGS) SHELL= depend
! 	$(MAKE) $(MFLAGS)
! 	@echo :
! 	@echo :
! 	@echo Full build of $(RELEASE) of the X Window System complete.
! 	@echo :
! 
! Everything::
! 	@echo :
! 	@echo Building $(RELEASE) of the X Window System on OS/2
! 	@echo :
! 	@echo :
! 	\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe
! 	if exist Makefile.bak del Makefile.bak
! 	if exist MAkefile ren Makefile Makefile.bak
! 	$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
! 	$(MAKE) $(MFLAGS) SHELL= VerifyOS
! 	$(MAKE) $(MFLAGS) SHELL= Makefiles
! 	$(MAKE) $(MFLAGS) SHELL= clean
! 	$(MAKE) $(MFLAGS) SHELL= includes
! 	$(MAKE) $(MFLAGS) SHELL= depend
! 	$(MAKE) $(MFLAGS)
! 	@echo :
! 	@echo :
! 	@echo Full build of $(RELEASE) of the X Window System complete.
! 	@echo :
! 
! #ifdef ProjectRoot
! install::
! 	MakeDir($(subst /,\,$(PROJECTROOT)))
! #endif
! 
! install::
! 	MakeDir($(subst /,\,$(INCROOT)))
! 	MakeDir($(subst /,\,$(USRLIBDIR)))
! 	MakeDir($(subst /,\,$(LIBDIR)))
! 
! #endif
! #else /* Win32Architecture */
  VerifyOS::
  	@echo :
  	@echo Building on OSName.
diff -c xc/Makefile.ini:1.1.1.1 xc/Makefile.ini:3.0
*** xc/Makefile.ini:1.1.1.1	Mon Jan 30 17:28:55 1995
--- xc/Makefile.ini	Mon Jan 30 17:28:55 1995
***************
*** 1,4 ****
--- 1,5 ----
  # $XConsortium: Makefile.ini,v 1.22 94/04/08 19:57:17 rws Exp $
+ # $XFree86: xc/Makefile.ini,v 3.0 1994/10/20 05:57:12 dawes Exp $
  
  RELEASE = "Release 6"
  SHELL = /bin/sh
***************
*** 75,80 ****
--- 76,102 ----
  	$(NMAKE) $(MFLAGS) includes
  	$(NMAKE) $(MFLAGS) depend
  	$(NMAKE) $(MFLAGS) $(WIN32WORLDOPTS)
+ 	@echo :
+ 	@echo :
+ 	@echo Full build of $(RELEASE) of the X Window System complete.
+ 	@echo :
+ 
+ World.OS2:
+ 	@echo :
+ 	@echo Building $(RELEASE) of the X Window System on OS/2.
+ 	@echo :
+ 	@echo :
+ 	\indir $(IMAKESRC) $(MAKE) SHELL= -f Makefile.ini clean.os2
+ 	\indir $(IMAKESRC) $(MAKE) SHELL= CC=gcc -f Makefile.ini imake.os2
+ 	-if exist Makefile.bak del Makefile.bak
+ 	-if exist Makefile ren Makefile Makefile.bak
+ 	$(subst /,\,$(IMAKE)) -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+ 	$(MAKE) $(MFLAGS) VerifyOS
+ 	$(MAKE) $(MFLAGS) Makefiles
+ 	$(MAKE) $(MFLAGS) clean
+ 	$(MAKE) $(MFLAGS) includes
+ 	$(MAKE) $(MFLAGS) depend
+ 	$(MAKE) $(MFLAGS)  
  	@echo :
  	@echo :
  	@echo Full build of $(RELEASE) of the X Window System complete.
diff -c xc/config/cf/Amoeba.cf:1.1.1.2 xc/config/cf/Amoeba.cf:3.6
*** xc/config/cf/Amoeba.cf:1.1.1.2	Mon Jan 30 17:29:06 1995
--- xc/config/cf/Amoeba.cf	Mon Jan 30 17:29:06 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM platform:  $XConsortium: Amoeba.cf,v 1.7 95/01/05 19:38:42 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/Amoeba.cf,v 3.6 1995/01/28 15:40:08 dawes Exp $
  
  /*  The presence of this configuration file in the X distribution
   *  does not imply full support for the system it describes.
***************
*** 298,303 ****
--- 299,310 ----
  	@echo '** TODO: Install man page ' file.man
  #endif /* InstallManPageLong */
  
+ #ifndef InstallGenManPageLong
+ #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ install.man:: file.man							@@\
+ 	@echo '** TODO: Install man page ' file.man
+ #endif /* InstallGenManPageLong */
+ 
  #ifndef InstallManPageAliases
  #define	InstallManPageAliases(file,destdir,aliases)			@@\
  install.man::								@@\
***************
*** 309,314 ****
--- 316,333 ----
  	done; \								@@\
  	$(RM) $${TMP})
  #endif /* InstallManPageAliases */
+ 
+ #ifndef InstallGenManPageAliases
+ #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ install.man::								@@\
+ 	@(TMP=/tmp/tmp.$$$$; \						@@\
+ 	$(RM) $${TMP}; \						@@\
+ 	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
+ 	for i in aliases; do (set -x; \					@@\
+ 	$(TOB) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ 		@@\
+ 	done; \								@@\
+ 	$(RM) $${TMP})
+ #endif /* InstallGenManPageAliases */
  
  #ifndef InstallNamedNonExec
  #define	InstallNamedNonExec(srcname,dstname,dest)			@@\
diff -c xc/config/cf/FreeBSD.cf:1.1.1.2 xc/config/cf/FreeBSD.cf:3.24
*** xc/config/cf/FreeBSD.cf:1.1.1.2	Mon Jan 30 17:29:07 1995
--- xc/config/cf/FreeBSD.cf	Mon Jan 30 17:29:07 1995
***************
*** 1,62 ****
  XCOMM platform:  $XConsortium: FreeBSD.cf,v 1.4 95/01/05 19:39:23 kaleb Exp $
  
! #define OSName            FreeBSD 1.1
  #define OSVendor          /**/
  XCOMM operating system:  OSName
! #define OSMajorVersion    1
! #define OSMinorVersion    1
  #define OSTeenyVersion    0
  
! #define HasPutenv       YES
! #define HasBSD44Sockets YES
! 
! #define CppCmd          /usr/libexec/cpp -traditional
! #define PreProcessCmd   /usr/libexec/cpp -traditional
! #undef  InstallCmd
! #define InstallCmd /usr/bin/install
  
! #define UseGas		YES
! #ifndef GccUsesGas
! # define GccUsesGas	YES
  #endif
  
! #ifndef AsmDefines
! #  define AsmDefines -DUSE_GAS
  #endif
  
  #if GccUsesGas
! # define GccGasOption -DGCCUSESGAS
  #else
  # define GccGasOption /**/
  #endif
  
! #ifndef HasGcc2
! # define HasGcc2 YES
! #endif
  
! #define CcCmd gcc
! #define DefaultCCOptions /**/
  
  #ifdef i386Architecture
! #define OptimizedCDebugFlags -m486 -O2
  #else
! #define OptimizedCDebugFlags -O2
  #endif
- #define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
- #define ServerExtraDefines GccGasOption
  
! #define StandardDefines	-DCSRG_BASED
! #define XawI18nDefines  -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
  #define TroffCmd        groff -Tps
  #define SetTtyGroup     YES
! #define HasNdbm         YES
! #define HasShm          YES
! #define HasWChar32      YES
  
! #define HasLibCrypt	YES
  
! #define AvoidNullMakeCommand YES
  
  #include <bsdLib.rules>
  
--- 1,170 ----
  XCOMM platform:  $XConsortium: FreeBSD.cf,v 1.4 95/01/05 19:39:23 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.24 1995/01/28 15:40:13 dawes Exp $
  
! #define OSName            FreeBSD 2.0
  #define OSVendor          /**/
  XCOMM operating system:  OSName
! #define OSMajorVersion    2
! #define OSMinorVersion    0
  #define OSTeenyVersion    0
  
! #define HasGcc			YES
! #define HasGcc2			YES
! #define HasCplusplus		YES
! #define HasGcc2ForCplusplus	YES
! #define GccUsesGas		YES
! #define UseGas			YES
! #define GnuCpp			YES
! #define HasNdbm         	YES
! #define HasPutenv       	YES
! #define HasBSD44Sockets 	YES
! #ifndef HasLibCrypt
! # define HasLibCrypt		YES
! #endif
! #ifndef HasShm
! # define HasShm          	YES
! #endif
! #define HasWChar32		YES
  
! #define AvoidNullMakeCommand	YES
! #define StripInstalledPrograms	YES
! #define CompressAllFonts	YES
! #define Malloc0ReturnsNull	YES
! #define NeedConstPrototypes	YES
! #define NeedFunctionPrototypes	YES
! #define NeedNestedPrototypes	YES
! #define NeedVarargsPrototypes	YES
! #define NeedWidePrototypes	NO
! 
! #define CcCmd			cc
! #define CppCmd			/usr/libexec/cpp
! #define PreProcessCmd		CppCmd
! #define StandardCppDefines	-traditional
! #if UseInstalled
! #define DefaultCCOptions	/**/
! #else
! #define DefaultCCOptions	-ansi -pedantic -Dasm=__asm
! #endif
! #ifndef ExtraLibraries
! #if OSMajorVersion == 1
! #define ExtraLibraries		/* -lmalloc */
! #else
! #define ExtraLibraries		/* -lgnumalloc */
! #endif
  #endif
  
! #ifdef InstallCmd
! #undef  InstallCmd
  #endif
+ #define InstallCmd		/usr/bin/install
  
  #if GccUsesGas
! # define GccGasOption 		-DGCCUSESGAS
! # define AsmDefines		-DUSE_GAS
  #else
  # define GccGasOption /**/
  #endif
  
! #define ServerExtraDefines GccGasOption XFree86ServerDefines
  
! #define StandardDefines	-DCSRG_BASED
! #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
  #ifdef i386Architecture
! # define OptimizedCDebugFlags -m486 -O2
! # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  #else
! # define OptimizedCDebugFlags -O2
! # define ServerOSDefines /**/
  #endif
  
! #ifndef PreIncDir
! # define PreIncDir	/usr/include
! #endif
  
  #define TroffCmd        groff -Tps
  #define SetTtyGroup     YES
! 
! #ifndef ExtraFilesToClean
! # define ExtraFilesToClean *.core
! #endif
! 
! #define DefaultUserPath		/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin
! #define DefaultSystemPath	/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
  
! #define InstKmemFlags	-g kmem -m 2755
  
! /*
!  * Compress manual pages
!  */
! #ifndef CompressManPages
! # define CompressManPages        YES
! #endif
! 
! #if CompressManPages
! 
! #ifndef CompressManCmd
! # define CompressManCmd		gzip -9n
! #endif
!    COMPRESSMANCMD = CompressManCmd
! 
! #ifndef InstallManPageLong
! #define InstallManPageLong(file,destdir,dest)                           @@\
! install.man:: file.man                                                  @@\
! 	MakeDir($(DESTDIR)destdir)                                      @@\
! 	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*                      @@\
! 	$(INSTALL) -c $(INSTMANFLAGS) file.man \                        @@\
!           $(DESTDIR)destdir/dest.$(MANSUFFIX)                           @@\
! 	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
! #endif
! 
! #ifndef InstallGenManPageLong
! #define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
! install.man:: file.man                                                  @@\
! 	MakeDir($(DESTDIR)destdir)                                      @@\
! 	$(RM) $(DESTDIR)destdir/dest.suffix*                            @@\
! 	$(INSTALL) -c $(INSTMANFLAGS) file.man \                        @@\
!           $(DESTDIR)destdir/dest.suffix                                 @@\
! 	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
! #endif
! 
! #ifndef InstallMultipleMan
! #define InstallMultipleMan(list,dest)                                   @@\
! install.man:: list                                                      @@\
! 	MakeDir($(DESTDIR)dest)						@@\
! 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
! 	for i in list; do \                                             @@\
! 	        (set -x; \                                              @@\
! 	        MNAME=`echo $$i | cut -f1 -d.`; \			@@\
! 	        $(RM) $(DESTDIR)dest/$${MNAME}*; \                      @@\
! 	        $(INSTALL) -c $(INSTMANFLAGS) $$i \                     @@\
! 		  $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \              @@\
! 	        $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \  @@\
! 	done
! #endif
! 
! /*
!  * InstallManPageAliases - install soft links for aliases.
!  */
! #ifndef InstallManPageAliases
! #define InstallManPageAliases(file,destdir,aliases)                     @@\
! install.man::                                                           @@\
! 	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
! 	for i in aliases; do (set -x; \                                 @@\
! 	$(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
! 	(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
! 	$$i.$${SUFFIX})); \                                             @@\
! 	done)
! #endif
! 
! /*
!  * InstallGenManPageAliases - install soft links for aliases.
!  */
! #ifndef InstallGenManPageAliases
! #define InstallGenManPageAliases(file,destdir,suffix,aliases)              @@\
! 	InstallManPageAliases(file,destdir,aliases)
! #endif
! #endif
  
  #include <bsdLib.rules>
  
diff -c xc/config/cf/Imake.cf:1.1.1.2 xc/config/cf/Imake.cf:3.13
*** xc/config/cf/Imake.cf:1.1.1.2	Mon Jan 30 17:29:08 1995
--- xc/config/cf/Imake.cf	Mon Jan 30 17:29:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.13 1995/01/28 15:40:15 dawes Exp $
  /*
   * To add support for another platform:
   * 
***************
*** 299,310 ****
  
  #ifdef SYSV
  # ifdef i386
! #  define MacroIncludeFile <x386.cf>
! #  define MacroFile x386.cf
! #  define i386SVR3Architecture
! # endif
  #endif /* SYSV */
  
  #ifdef SYSV386
  # ifdef SVR4
  #  define i386Architecture
--- 300,350 ----
  
  #ifdef SYSV
  # ifdef i386
! #  ifdef SCO
! #   define i386Architecture
! #   define i386SVR3Architecture
! #   define MacroIncludeFile <sco.cf>
! #   define MacroFile sco.cf
! #   define i386ScoArchitecture
! #   ifdef SCO324
! #    define i386Sco324Architecture
! #    undef SCO324
! #   endif
! #   undef SCO
! #  endif /* SCO */
! #  ifdef ISC
! #   define i386Architecture	
! #   define i386SVR3Architecture	
! #   define MacroIncludeFile <isc.cf>
! #   define MacroFile isc.cf
! #   define i386IscArchitecture
! #   undef ISC
! #   ifdef ISC202
! #    define IscVersion 202
! #    undef ISC202
! #   else
! #    ifdef ISC30
! #     define IscVersion 300
! #     undef ISC30
! #    else
! #     ifdef ISC40
! #      define IscVersion 400
! #      undef ISC40
! #     else
! #      define IscVersion 221
! #     endif /* ISC40 */
! #    endif /* ISC30 */
! #   endif /* ISC202 */
! #  endif /* ISC */
! #  ifndef MacroFile
! #   define i386SVR3Architecture
! #   define MacroIncludeFile <x386.cf>
! #   define MacroFile x386.cf
! #  endif /* MacroFile */
! # endif /* i386 */
  #endif /* SYSV */
  
+ /* SYSV386 is here for backward compatibility only */
  #ifdef SYSV386
  # ifdef SVR4
  #  define i386Architecture
***************
*** 313,323 ****
  #  define MacroIncludeFile <svr4.cf>
  #  define MacroFile svr4.cf
  #  undef SVR4
! # else
! #  define MacroIncludeFile <x386.cf>
! #  define MacroFile x386.cf
! #  define i386SVR3Architecture
! # endif
  #endif /* SYSV386 */
  
  #ifdef DGUX
--- 353,401 ----
  #  define MacroIncludeFile <svr4.cf>
  #  define MacroFile svr4.cf
  #  undef SVR4
! # else /* ! SVR4 */
! #  ifdef SCO
! #   define i386Architecture
! #   define i386SVR3Architecture
! #   define MacroIncludeFile <sco.cf>
! #   define MacroFile sco.cf
! #   define i386ScoArchitecture
! #   ifdef SCO324
! #    define i386Sco324Architecture
! #    undef SCO324
! #   endif
! #   undef SCO
! #  endif /* SCO */
! #  ifdef ISC
! #   define i386Architecture	
! #   define i386SVR3Architecture	
! #   define MacroIncludeFile <isc.cf>
! #   define MacroFile isc.cf
! #   define i386IscArchitecture
! #   undef ISC
! #   ifdef ISC202
! #    define IscVersion 202
! #    undef ISC202
! #   else
! #    ifdef ISC30
! #     define IscVersion 300
! #     undef ISC30
! #    else
! #     ifdef ISC40
! #      define IscVersion 400
! #      undef ISC40
! #     else
! #      define IscVersion 221
! #     endif /* ISC40 */
! #    endif /* ISC30 */
! #   endif /* ISC202 */
! #  endif /* ISC */
! #  ifndef MacroFile
! #   define i386SVR3Architecture
! #   define MacroIncludeFile <x386.cf>
! #   define MacroFile x386.cf
! #  endif /* MacroFile */
! # endif /* ! SVR4 */
  #endif /* SYSV386 */
  
  #ifdef DGUX
***************
*** 411,416 ****
--- 489,520 ----
  #define MacroFile nec.cf
  #define NecArchitecture
  #endif
+ 
+ #ifdef minix 
+ #define MacroIncludeFile <minix.cf>
+ #define MacroFile minix.cf
+ #undef minix
+ #define MinixArchitecture
+ #define i386Architecture
+ #endif /* minix */
+ 
+ #ifdef MACH
+ #define MacroIncludeFile <mach.cf>
+ #define MacroFile mach.cf
+ #undef MACH
+ #ifdef	i386
+ #define i386MachArchitecture
+ #define i386Architecture
+ #endif	/* i386 */
+ #undef i386
+ #endif /* MACH */
+ 
+ #ifdef emxos2
+ #define MacroIncludeFile <os2.cf>
+ #define MacroFile os2.cf
+ #define OS2Architecture
+ #define i386Architecture
+ #endif /* emxos2 */
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
diff -c xc/config/cf/Imake.rules:1.1.1.3 xc/config/cf/Imake.rules:3.11
*** xc/config/cf/Imake.rules:1.1.1.3	Mon Jan 30 17:29:09 1995
--- xc/config/cf/Imake.rules	Mon Jan 30 17:29:10 1995
***************
*** 1,6 ****
--- 1,7 ----
  XCOMM -----------------------------------------------------------------------
  XCOMM Imake rules for building libraries, programs, scripts, and data files
  XCOMM rules:  $XConsortium: Imake.rules,v 1.197 94/12/05 19:30:41 gildea Exp $
+ XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.11 1995/01/14 10:39:25 dawes Exp $
  
  /*
   *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
***************
*** 569,574 ****
--- 570,589 ----
  InstallManPage(program,$(MANDIR))
  #endif /* ProgramTargetHelper */
  
+ #ifndef ProgramTargetHelperNoMan
+ #define	ProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib) @@\
+ ProgramTargetName(program): $(objs) $(deplib)				@@\
+ 	RemoveTargetProgram($@)						@@\
+ 	LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)	@@\
+ 									@@\
+ CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib)		@@\
+ SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+ PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+ ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+ 									@@\
+ InstallProgram(program,$(BINDIR))
+ #endif /* ProgramTargetHelperNoMan */
+ 
  #ifndef CplusplusProgramTargetHelper
  #define	CplusplusProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\
  ProgramTargetName(program): $(objs) $(deplib)				@@\
***************
*** 605,610 ****
--- 620,646 ----
  	RemoveFile(ProgramTargetName(program))
  #endif /* ComplexProgramTarget */
  
+ /*
+  * ComplexProgramTargetNoMan - generate rules for compiling and linking
+  * the program specified by $(OBJS) and $(SRCS), installing the program 
+  * and generating dependencies.  It should only be used in Imakefiles
+  * that describe a single program.
+  */
+ #ifndef ComplexProgramTargetNoMan
+ #define	ComplexProgramTargetNoMan(program)				@@\
+         PROGRAM = program						@@\
+ 									@@\
+ AllTarget(program)							@@\
+ 									@@\
+ ProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
+ 									@@\
+ DependTarget()								@@\
+ LintTarget()								@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(ProgramTargetName(program))
+ #endif /* ComplexProgramTargetNoMan */
+ 
  #ifndef ComplexCplusplusProgramTarget
  #define	ComplexCplusplusProgramTarget(program)				@@\
          PROGRAM = program						@@\
***************
*** 707,713 ****
   */
  #ifndef ServerTargetWithFlags
  #define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
! AllTarget(server)							@@\
  ProgramTargetName(server): subdirs objects libs				@@\
  	MoveToBakFile($@)						@@\
  	LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
--- 743,749 ----
   */
  #ifndef ServerTargetWithFlags
  #define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
! AllTarget(ProgramTargetName(server))					@@\
  ProgramTargetName(server): subdirs objects libs				@@\
  	MoveToBakFile($@)						@@\
  	LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
***************
*** 869,874 ****
--- 905,947 ----
  
  
  /*
+  * InstallGenManPageLong - More general rules for installing manual pages --
+  * doesn't assume MANSUFFIX.
+  */
+ #ifndef InstallGenManPageLong
+ #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ install.man:: file.man							@@\
+ 	MakeDir($(DESTDIR)destdir)					@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix
+ #endif /* InstallGenManPageLong */
+ 
+ 
+ /*
+  * InstallGenManPage - general equivalent of InstallManPage
+  */
+ #ifndef InstallGenManPage
+ #define	InstallGenManPage(file,destdir,suffix)				@@\
+ InstallGenManPageLong(file,destdir,file,suffix)
+ #endif /* InstallGenManPage */
+ 
+ 
+ /*
+  * InstallGenManPageAliases - general equivalent of InstallManPageAliases
+  */
+ #ifndef InstallGenManPageAliases
+ #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ install.man::								@@\
+ 	@(TMP=/tmp/tmp.$$$$; \						@@\
+ 	RemoveFile($${TMP}); \						@@\
+ 	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
+ 	for i in aliases; do (set -x; \					@@\
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
+ 	done; \								@@\
+ 	RemoveFile($${TMP}))
+ #endif /* InstallGenManPageAliases */
+ 
+ 
+ /*
   * InstallNamedNonExec - generate rules to install a data file
   */
  #ifndef InstallNamedNonExec
***************
*** 1905,1910 ****
--- 1978,1989 ----
  			     toptmp="/`basename $$curtmp`$$toptmp"; \	@@\
  			     curtmp="`dirname $$curtmp`"; \		@@\
  			     itmp="`echo $$itmp | sed 's;../;;'`"; \	@@\
+ 			  done \					@@\
+ 		    ;; \						@@\
+ 		    ./?*) \						@@\
+ 			while echo "$$itmp" | grep '^./' > /dev/null;\	@@\
+ 			  do \						@@\
+ 			    itmp="`echo $$itmp | sed 's;./;;'`"; \	@@\
  			  done \					@@\
  		    ;; \						@@\
  		esac; \							@@\
diff -c xc/config/cf/Imake.tmpl:1.1.1.4 xc/config/cf/Imake.tmpl:3.8
*** xc/config/cf/Imake.tmpl:1.1.1.4	Mon Jan 30 17:29:12 1995
--- xc/config/cf/Imake.tmpl	Mon Jan 30 17:29:12 1995
***************
*** 1,6 ****
--- 1,7 ----
  XCOMM ----------------------------------------------------------------------
  XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
  XCOMM $XConsortium: Imake.tmpl,v 1.224 94/12/27 03:57:50 gildea Exp $
+ XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.8 1995/01/25 10:42:43 dawes Exp $
  XCOMM
  
  /*
***************
*** 233,238 ****
--- 234,242 ----
  #ifndef UseCCMakeDepend			/* use slow cc -E script */
  #define UseCCMakeDepend NO
  #endif
+ #ifndef UseGccMakeDepend		/* use slowish but correct gcc -M */
+ #define UseGccMakeDepend NO
+ #endif
  
  /* DefaultUsrBin is independent of ProjectRoot.
     This is a directory where programs will be found even if PATH
***************
*** 314,320 ****
  #define ConfigSrc $(TOP)/config
  #endif
  #ifndef DependDir
! #if UseCCMakeDepend
  #define DependDir $(CONFIGSRC)/util
  #else
  #define DependDir $(CONFIGSRC)/makedepend
--- 318,324 ----
  #define ConfigSrc $(TOP)/config
  #endif
  #ifndef DependDir
! #if UseCCMakeDepend || UseGccMakeDepend
  #define DependDir $(CONFIGSRC)/util
  #else
  #define DependDir $(CONFIGSRC)/makedepend
***************
*** 654,659 ****
--- 658,670 ----
  #endif
  #endif
  #ifndef DependCmd
+ #if UseGccMakeDepend
+ #ifdef UseInstalled		/* assume BINDIR in path */
+ #define DependCmd gccmakedep
+ #else
+ #define DependCmd $(DEPENDSRC)/gccmakedep
+ #endif
+ #else
  #ifdef UseInstalled		/* assume BINDIR in path */
  #define DependCmd makedepend
  #else
***************
*** 660,665 ****
--- 671,677 ----
  #define DependCmd $(DEPENDSRC)/makedepend
  #endif
  #endif
+ #endif
  #ifndef DependFlags
  #define DependFlags /**/
  #endif
***************
*** 763,768 ****
--- 775,783 ----
  #ifndef SiteIConfigFiles
  #define SiteIConfigFiles /**/
  #endif
+ #ifndef OtherIConfigFiles
+ #define OtherIConfigFiles /**/
+ #endif
  #ifndef ExtraFilesToClean
  #define ExtraFilesToClean /**/
  #endif
***************
*** 1015,1021 ****
  #endif
       ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \
  			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
! 			SiteIConfigFiles $(EXTRA_ICONFIGFILES)
  
  #ifndef LocalRulesFile
  /* need this to make ANSI-style preprocessors happy */
--- 1030,1036 ----
  #endif
       ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \
  			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
! 			OtherIConfigFiles SiteIConfigFiles $(EXTRA_ICONFIGFILES)
  
  #ifndef LocalRulesFile
  /* need this to make ANSI-style preprocessors happy */
diff -c xc/config/cf/Imakefile:1.1.1.1 xc/config/cf/Imakefile:3.4
*** xc/config/cf/Imakefile:1.1.1.1	Mon Jan 30 17:29:13 1995
--- xc/config/cf/Imakefile	Mon Jan 30 17:29:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.32 94/04/09 21:46:51 rws Exp $
+ XCOMM $XFree86: xc/config/cf/Imakefile,v 3.4 1995/01/04 04:35:57 dawes Exp $
  
  #ifdef LocalConfigFiles
  LOCALFILES = LocalConfigFiles
***************
*** 5,10 ****
--- 6,13 ----
  #endif
  
  DEFFILES = \
+ xf86site.def \
+ host.def \
  site.def
  
  RULEFILES = \
***************
*** 14,19 ****
--- 17,23 ----
  bsdLib.rules \
  ibmLib.rules \
  lnxLib.rules \
+ lnxdoc.rules \
  necLib.rules \
  noop.rules \
  oldlib.rules \
***************
*** 21,26 ****
--- 25,31 ----
  sgiLib.rules \
  sunLib.rules \
  sv4Lib.rules \
+ sv3Lib.rules \
  xf86.rules
  
  TMPLFILES = \
***************
*** 29,34 ****
--- 34,40 ----
  Ixx.tmpl \
  bsdLib.tmpl \
  lnxLib.tmpl \
+ lnxdoc.tmpl \
  Library.tmpl \
  Project.tmpl \
  Server.tmpl \
***************
*** 39,45 ****
  necLib.tmpl \
  osfLib.tmpl \
  sunLib.tmpl \
! sv4Lib.tmpl
  
  CFFILES = \
  Imake.cf \
--- 45,53 ----
  necLib.tmpl \
  osfLib.tmpl \
  sunLib.tmpl \
! sv4Lib.tmpl \
! sv3Lib.tmpl \
! xf86.tmpl
  
  CFFILES = \
  Imake.cf \
***************
*** 59,67 ****
--- 67,78 ----
  generic.cf \
  hp.cf \
  ibm.cf \
+ isc.cf \
  linux.cf \
  luna.cf \
  macII.cf \
+ mach.cf \
+ minix.cf \
  moto.cf \
  ncr.cf \
  nec.cf \
***************
*** 73,78 ****
--- 84,91 ----
  sony.cf \
  sun.cf \
  svr4.cf \
+ svr3.cf \
+ sco.cf \
  ultrix.cf \
  usl.cf \
  x386.cf \
diff -c xc/config/cf/NetBSD.cf:1.1.1.2 xc/config/cf/NetBSD.cf:3.15
*** xc/config/cf/NetBSD.cf:1.1.1.2	Mon Jan 30 17:29:14 1995
--- xc/config/cf/NetBSD.cf	Mon Jan 30 17:29:15 1995
***************
*** 1,78 ****
  XCOMM platform:  $XConsortium: NetBSD.cf,v 1.4 95/01/05 19:39:34 kaleb Exp $
  
! #define OSName		NetBSD
  #define	OSVendor	/**/
  XCOMM operating system:  OSName
! #define OSMajorVersion    0
! #define OSMinorVersion    9
! 
! #define HasPutenv       YES
! #define HasBSD44Sockets YES
! 
! #define CppCmd          /usr/libexec/cpp -traditional
! #define PreProcessCmd   /usr/libexec/cpp -traditional
! #undef  InstallCmd
! #define InstallCmd /usr/bin/install
! #undef	TblCmd
! #define	TblCmd /usr/bin/tbl
! #undef	EqnCmd
! #define	EqnCmd /usr/bin/eqn -Tascii
!           COL = /usr/bin/col
!          NEQN = /usr/bin/neqn
!         NROFF = /usr/bin/nroff
! 
! #define UseGas		YES
! #ifndef GccUsesGas
! # define GccUsesGas	YES
  #endif
  
! #ifndef AsmDefines
! # define AsmDefines -DUSE_GAS
! #endif
  
! #if GccUsesGas
! # define GccGasOption -DGCCUSESGAS
  #else
! # define GccGasOption /**/
  #endif
  
! #ifndef HasGcc2
! # define HasGcc2 YES
! #endif
  
- #define CcCmd gcc
- #if UseInstalled
- #define DefaultCCOptions	/**/
- #else
- #define DefaultCCOptions	-ansi -Dasm=__asm
- #endif
  
  #ifdef i386Architecture
! #define OptimizedCDebugFlags	-m486 -O2
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
  #else
! #define OptimizedCDebugFlags	-O2
! # ifdef SparcArchitecture
! #  define ServerOSDefines	-DDDXOSINIT
  # else
! #  define ServerOSDefines	/**/
  # endif
  #endif
  #define ServerExtraDefines GccGasOption XFree86ServerDefines
  
  #define StandardDefines	-DCSRG_BASED
  #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
! #define TroffCmd        groff -Tps
! #define SetTtyGroup     YES
! #define DBMLibrary	/**/
! #define HasNdbm         YES
! #define HasShm          YES
! #define HasWChar32      YES
  
! #define HasLibCrypt	YES
  
! #define AvoidNullMakeCommand YES
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
--- 1,136 ----
  XCOMM platform:  $XConsortium: NetBSD.cf,v 1.4 95/01/05 19:39:34 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.15 1995/01/28 15:40:17 dawes Exp $
  
! #define OSName		NetBSD 1.0
  #define	OSVendor	/**/
  XCOMM operating system:  OSName
! #define OSMajorVersion    1
! #define OSMinorVersion    0
! /* 1 = A, 2 = B, 3 = C */
! #define OSTeenyVersion	  0
! 
! /*
!  * C library features
!  */
! 
! #define HasNdbm         	YES
! #define HasPutenv       	YES
! #define HasBSD44Sockets 	YES
! #define Malloc0ReturnsNull	NO
! #define SetTtyGroup     	YES
! #define DBMLibrary		/**/
! #ifndef HasLibCrypt
! # define HasLibCrypt		YES
! #endif
! #ifndef HasShm
! # if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2
! /*
!  * Shm memory was removed in 0.9B because it was encumbered.
!  * A free version was added in 0.9C
!  */
! #  define HasShm          	NO
! # else
! #  define HasShm          	YES
! # endif
  #endif
+ #define HasWChar32		YES
  
! /*
!  * Compiler Features
!  */
! #undef HasGcc
! #define HasGcc			YES
! #define HasGcc2			YES
! #ifndef HasGcc2ForCplusplus
! #define HasGcc2ForCplusplus	YES
! #endif
! #define GccUsesGas		YES
! #define UseGas			YES
! #define GnuCpp			YES
! 
! #define NeedConstPrototypes	YES
! #define NeedFunctionPrototypes	YES
! #define NeedNestedPrototypes	YES
! #define NeedVarargsPrototypes	YES
! #define NeedWidePrototypes	NO
! 
! #define CppCmd          	/usr/libexec/cpp
! #define StandardCppDefines	-traditional
! #define PreProcessCmd   	CppCmd
  
! #undef CcCmd
! #define CcCmd 			gcc
! #if UseInstalled
! #define DefaultCCOptions 	/**/
  #else
! #define DefaultCCOptions 	-ansi -Dasm=__asm
  #endif
  
! #define GccGasOption 		-DGCCUSESGAS
! #define AsmDefines 		-DUSE_GAS
  
  
  #ifdef i386Architecture
! # define OptimizedCDebugFlags 	-m486 -O2
! # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  #else
! # define OptimizedCDebugFlags 	-O2
! # if defined(SparcArchitecture)
! #  define ServerOSDefines 	-DDDXOSINIT
  # else
! #  define ServerOSDefines 	/**/
  # endif
  #endif
+ #ifdef i386Architecture
  #define ServerExtraDefines GccGasOption XFree86ServerDefines
+ #else
+ #define ServerExtraDefines GccGasOption
+ #endif
  
  #define StandardDefines	-DCSRG_BASED
  #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  
! #define ExtraLibraries		-lgnumalloc
! 
! /*
!  * Make & install Features
!  */
! 
! #define AvoidNullMakeCommand 	YES
! #define StripInstalledPrograms	YES
! #define CompressAllFonts	YES
! #define DefaultUserPath		.:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
! #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
! 
! #ifdef  InstallCmd
! # undef  InstallCmd
! # define InstallCmd 		/usr/bin/install
! #endif
! 
! #ifndef ExtraFilesToClean
! # define ExtraFilesToClean 	*.core
! #endif
  
! /*
!  * Documentation formatting
!  */
! #undef	TblCmd
! #define	TblCmd 			/usr/bin/tbl
! #undef	EqnCmd
! #define	EqnCmd 			/usr/bin/eqn -Tascii
!           COL = /usr/bin/col
!          NEQN = /usr/bin/neqn
!         NROFF = /usr/bin/nroff
! #define TroffCmd        	groff -Tps
  
! /*
!  * To use the NetBSD Aperture driver
!  */
! #if defined(i386Architecture)
! #ifndef HasNetBSDApertureDrv
! #define HasNetBSDApertureDrv	NO
! #endif
! #endif
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
***************
*** 101,106 ****
--- 159,167 ----
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+ 
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
***************
*** 120,134 ****
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  				@@\
! 		$(LN) destdir/file.0 $(DESTDIR)destdir/$$i.0;\  @@\
  		); \							@@\
  	done
  
! #define NetBSDArchitecture
  
  #include <bsdLib.rules>
  
  #ifdef SparcArchitecture
  #ifndef Xsun24Server
  #define Xsun24Server	NO
--- 181,199 ----
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
! 		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
  		); \							@@\
  	done
  
! #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
! 	InstallManPageAliases(file,destdir,aliases)
  
  #include <bsdLib.rules>
  
+ /*
+  * Definitions for the SUN server on NetBSD/sparc
+  */
  #ifdef SparcArchitecture
  #ifndef Xsun24Server
  #define Xsun24Server	NO
***************
*** 139,146 ****
  #ifndef XsunMonoServer
  #define XsunMonoServer	YES
  #endif
! #ifndef UseRGBTxt
! #define UseRGBTxt	YES
  #endif
  #endif
  
--- 204,211 ----
  #ifndef XsunMonoServer
  #define XsunMonoServer	YES
  #endif
! #ifndef UseRgbTxt
! #define UseRgbTxt	YES
  #endif
  #endif
  
***************
*** 147,149 ****
--- 212,215 ----
  #ifdef i386Architecture
  # include <xfree86.cf>
  #endif
+ 
diff -c xc/config/cf/Project.tmpl:1.1.1.3 xc/config/cf/Project.tmpl:3.12
*** xc/config/cf/Project.tmpl:1.1.1.3	Mon Jan 30 17:29:16 1995
--- xc/config/cf/Project.tmpl	Mon Jan 30 17:29:16 1995
***************
*** 1,6 ****
--- 1,7 ----
  XCOMM ----------------------------------------------------------------------
  XCOMM X Window System Build Parameters and Rules
  XCOMM $XConsortium: Project.tmpl,v 1.248 95/01/06 19:12:51 gildea Exp $
+ XCOMM $XFree86: xc/config/cf/Project.tmpl,v 3.12 1995/01/25 10:42:48 dawes Exp $
  
  /***************************************************************************
   *                                                                         *
***************
*** 40,45 ****
--- 41,49 ----
  #ifndef BuildServer
  #define BuildServer		HasXServer
  #endif
+ #ifndef BuildServersOnly
+ #define BuildServersOnly	NO
+ #endif
  #ifndef XServerThreaded
  #define XServerThreaded		NO	/* turn on threads in merged server */
  #endif
***************
*** 70,75 ****
--- 74,85 ----
  #ifndef BuildXKBlib
  #define BuildXKBlib		NO	/* not yet a standard part of Xlib */
  #endif
+ #ifndef BuildLBX
+ #define BuildLBX		NO
+ #endif
+ #ifndef BuildLBXCompatible
+ #define BuildLBXCompatible	NO
+ #endif
  #ifndef BuildFresco
  #if HasCplusplus 
  #define BuildFresco		YES
***************
*** 77,82 ****
--- 87,95 ----
  #define BuildFresco		NO
  #endif
  #endif
+ #ifndef BuildScreenSaverExt
+ #define BuildScreenSaverExt	NO
+ #endif
  #ifndef InstallLibManPages
  #define InstallLibManPages	YES
  #endif
***************
*** 102,107 ****
--- 115,123 ----
  #ifndef InstallAppDefFiles
  #define InstallAppDefFiles	YES	/* install application defaults */
  #endif
+ #ifndef CompressAllFonts
+ #define CompressAllFonts	NO
+ #endif
  #ifndef ThreadedX
  #if HasPosixThreads || HasCThreads
  #define ThreadedX		YES	/* multi-threaded libraries */
***************
*** 217,222 ****
--- 233,245 ----
  #define BigReqDefines /**/	/* LBX doesn't work with BIG-REQUESTS yet */
  #endif
  #endif
+ #ifndef ScreenSaverExtensionDefines
+ #if BuildScreenSaverExt
+ #define ScreenSaverExtensionDefines -DSCREENSAVER
+ #else
+ #define ScreenSaverExtensionDefines /**/
+ #endif
+ #endif
  #ifndef SitePervasiveExtensionDefines
  #define SitePervasiveExtensionDefines /**/
  #endif
***************
*** 227,233 ****
  #define SiteExtensionDefines /**/
  #endif
  #ifndef BaseExtensionDefines
! #define BaseExtensionDefines -DMULTIBUFFER -DMITMISC -DXTEST -DXSYNC -DXCMISC PexDefines ShmDefines XieDefines BigReqDefines SiteExtensionDefines
  #endif
  #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
  #endif
--- 250,256 ----
  #define SiteExtensionDefines /**/
  #endif
  #ifndef BaseExtensionDefines
! #define BaseExtensionDefines -DMULTIBUFFER -DMITMISC -DXTEST -DXSYNC -DXCMISC PexDefines ShmDefines XieDefines BigReqDefines SiteExtensionDefines ScreenSaverExtensionDefines
  #endif
  #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
  #endif
***************
*** 397,402 ****
--- 420,434 ----
  #define ForceNormalLib (HasGcc && !HasGcc2)
  #endif
  
+ #ifndef BuildExtraExtensionLibrary
+ /* Add to the conditional other extra extensions if required */
+ #if BuildScreenSaverExt
+ #define BuildExtraExtensionLibrary YES
+ #else
+ #define BuildExtraExtensionLibrary NO
+ #endif
+ #endif
+ 
  XCOMM -----------------------------------------------------------------------
  XCOMM X Window System make variables; these need to be coordinated with rules
  
***************
*** 495,500 ****
--- 527,547 ----
  #endif
           XLIBONLY = $(XONLYLIB)
  
+ #if BuildExtraExtensionLibrary
+ #ifndef SharedLibXExExt
+ #define SharedLibXExExt	NO
+ #endif
+ #ifndef NormalLibXExExt
+ #define NormalLibXExExt  YES
+ #endif
+ #ifndef DebugLibXExExt
+ #define DebugLibXExExt	NO
+ #endif
+ #ifndef ProfileLibXExExt
+ #define ProfileLibXExExt	NO
+ #endif
+ #endif
+ 
  #ifndef SharedLibXext
  #define SharedLibXext HasSharedLibraries
  #endif
***************
*** 508,522 ****
  #define ProfileLibXext		NO	/* profiled Xext library */
  #endif
        XEXTLIBSRC = $(LIBSRC)/Xext
  #if SharedLibXext
  #ifndef SharedXextRev
  #define SharedXextRev 6.0
  #endif
! SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
  #else
! UnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC))
  #endif
! LINTEXTENSIONLIB = $(LINTEXTENSION)
            DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
               XLIB = $(EXTENSIONLIB) $(XONLYLIB)
           LINTXLIB = $(LINTXONLYLIB)
--- 555,591 ----
  #define ProfileLibXext		NO	/* profiled Xext library */
  #endif
        XEXTLIBSRC = $(LIBSRC)/Xext
+    LBXXEXTLIBSRC = $(TOP)/workInProgress/lbx/lib/Xext
+ #if BuildExtraExtensionLibrary
+     XEXEXTLIBSRC = $(LIBSRC)/XExExt
+ #endif
  #if SharedLibXext
  #ifndef SharedXextRev
  #define SharedXextRev 6.0
  #endif
! SharedLibReferences(XEXT,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
! SharedLibReferences(LBXXEXT,lbxXext,$(LBXXEXTLIBSRC),SOXEXTREV,SharedXextRev)
! #else
! UnsharedLibReferences(XEXT,Xext,$(XEXTLIBSRC))
! UnsharedLibReferences(LBXXEXT,lbxXext,$(LBXXEXTLIBSRC))
! #endif
! 
! #if BuildExtraExtensionLibrary
! #if SharedLibXExExt
! #ifndef SharedXExExtRev
! #define SharedXExExtRev 6.0
! #endif
! SharedLibReferences(XEXEXT,XExExt,$(XEXEXTLIBSRC),SOXEXEXTREV,SharedXExExtRev)
  #else
! UnsharedLibReferences(XEXEXT,XExExt,$(XEXEXTLIBSRC))
! #endif
  #endif
! 
!      EXTENSIONLIB = $(XEXEXTLIB) $(XEXTLIB)
!   DEPEXTENSIONLIB = $(DEPXEXEXTLIB) $(DEPXEXTLIB)
!     LINTEXTENSION = $(LINTXEXEXT) $(LINTXEXT)
! 
!  LINTEXTENSIONLIB = $(LINTEXTENSION)
            DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
               XLIB = $(EXTENSIONLIB) $(XONLYLIB)
           LINTXLIB = $(LINTXONLYLIB)
***************
*** 1025,1031 ****
  	$(FONTC) $(FONTCFLAGS) $? | $(COMPRESS) > $@
  #endif /* CompressedFontTarget */
  
! #ifdef CompressAllFonts
  #define FontTarget(basename) CompressedFontTarget(basename)
  #define FontObj(basename) FontBaseObj(basename).Z
  #else
--- 1094,1101 ----
  	$(FONTC) $(FONTCFLAGS) $? | $(COMPRESS) > $@
  #endif /* CompressedFontTarget */
  
! #if !defined(FontTarget) && !defined(FontObj)
! #if CompressAllFonts
  #define FontTarget(basename) CompressedFontTarget(basename)
  #define FontObj(basename) FontBaseObj(basename).Z
  #else
***************
*** 1032,1037 ****
--- 1102,1108 ----
  #define FontTarget(basename) UncompressedFontTarget(basename)
  #define FontObj(basename) FontBaseObj(basename)
  #endif /* CompressAllFonts */
+ #endif
  
  #ifndef MakeSimpleDoc
  #define MakeSimpleDoc(file,srcs)					@@\
diff -c xc/config/cf/Server.tmpl:1.1.1.1 xc/config/cf/Server.tmpl:3.0
*** xc/config/cf/Server.tmpl:1.1.1.1	Mon Jan 30 17:29:17 1995
--- xc/config/cf/Server.tmpl	Mon Jan 30 17:29:17 1995
***************
*** 4,9 ****
--- 4,10 ----
   */
  
  XCOMM $XConsortium: Server.tmpl,v 1.13 94/04/08 16:59:46 rws Exp $
+ XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.0 1994/12/25 12:12:21 dawes Exp $
  
  #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)"
  
***************
*** 47,49 ****
--- 48,53 ----
  CDEBUGFLAGS = ServerCDebugFlags
  EXT_DEFINES = ExtensionDefines
  
+ #ifdef XFree86Version
+ #include <xf86.tmpl>
+ #endif
diff -c xc/config/cf/bsdLib.tmpl:1.1.1.2 xc/config/cf/bsdLib.tmpl:3.1
*** xc/config/cf/bsdLib.tmpl:1.1.1.2	Mon Jan 30 17:29:18 1995
--- xc/config/cf/bsdLib.tmpl	Mon Jan 30 17:29:18 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: bsdLib.tmpl,v 1.2 95/01/23 19:07:12 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.1 1995/01/28 15:40:19 dawes Exp $
  
  /*
   * NetBSD/FreeBSD shared library template
diff -c xc/config/cf/bsdi.cf:1.1.1.2 xc/config/cf/bsdi.cf:3.15
*** xc/config/cf/bsdi.cf:1.1.1.2	Mon Jan 30 17:29:18 1995
--- xc/config/cf/bsdi.cf	Mon Jan 30 17:29:18 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM platform:  $XConsortium: bsdi.cf,v 1.14 95/01/11 18:27:52 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.15 1995/01/28 15:40:20 dawes Exp $
  
  #define OSName            BSD/386 1.1
  #define OSVendor          BSDI
***************
*** 8,17 ****
  
  #define HasPutenv	YES
  #define HasBSD44Sockets	YES
  #if OSMinorVersion >= 1
! #define HasGcc2		YES
! #define HasGcc2ForCplusplus YES
! #define CcCmd		gcc2
  #endif
  #define CppCmd		/usr/bin/cpp
  #define TroffCmd	groff -Tps
--- 9,39 ----
  
  #define HasPutenv	YES
  #define HasBSD44Sockets	YES
+ 
+ XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2 and gcc 1.42 installed
+ XCOMM as cc and gcc.
+ XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler.
+ XCOMM The default is to use gcc2 on BSD/386 1.1 and gcc1 on BSD/386 1.0
+ XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in
+ XCOMM xf86site.def
+ 
+ #ifndef HasGcc
+ # define HasGcc			YES
+ #endif
  #if OSMinorVersion >= 1
! # ifndef HasGcc2
! #  define HasGcc2		YES
! # endif
! #endif
! #if HasGcc2
! # ifndef HasGcc2ForCplusplus
! #  define HasGcc2ForCplusplus	YES
! # endif
! # define CcCmd			gcc2
! # define OptimizedCDebugFlags	-O2 -m486
! #else
! # define CcCmd			cc
! # define OptimizedCDebugFlags	-O
  #endif
  #define CppCmd		/usr/bin/cpp
  #define TroffCmd	groff -Tps
***************
*** 23,28 ****
--- 45,57 ----
  # ifndef GccUsesGas
  #  define GccUsesGas    YES
  # endif
+ #if HasGcc
+ #if UseInstalled
+ #define DefaultCCOptions	/**/
+ #else
+ #define DefaultCCOptions	-ansi
+ #endif
+ #endif
  
  #if GccUsesGas
  # define GccGasOption -DGCCUSESGAS
***************
*** 47,53 ****
           NEQN = /usr/bin/eqn -Tascii
          NROFF = /usr/bin/nroff
  
! #define OptimizedCDebugFlags	-O2 -m486
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
--- 76,83 ----
           NEQN = /usr/bin/eqn -Tascii
          NROFF = /usr/bin/nroff
  
! #define DefaultUserPath		:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
! #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
  
  XCOMM Man pages need to be formatted when installed, so override the default
  XCOMM imake rules.
***************
*** 75,80 ****
--- 105,113 ----
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
  	fi
  
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+ 
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
***************
*** 94,103 ****
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  				@@\
! 		$(LN) destdir/file.0 $(DESTDIR)destdir/$$i.0;\  @@\
  		); \							@@\
  	done
  
  /*
   * These seem redundant, but leave them in for now.
--- 127,139 ----
  	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
! 		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
! 		(cd $(DESTDIR)destdir; $(LN) file.0 $$i.0);\  		@@\
  		); \							@@\
  	done
+ 
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ 	InstallManPageAliases(file,destdir,aliases)
  
  /*
   * These seem redundant, but leave them in for now.
diff -c /dev/null xc/config/cf/isc.cf:3.2
*** /dev/null	Mon Jan 30 17:29:19 1995
--- xc/config/cf/isc.cf	Mon Jan 30 17:29:19 1995
***************
*** 0 ****
--- 1,100 ----
+ XCOMM platform:  $XFree86: xc/config/cf/isc.cf,v 3.2 1995/01/11 03:42:47 dawes Exp $
+ 
+ #ifndef HasGcc2
+ #define HasGcc2			YES
+ #endif
+ 
+ /* INTERACTIVE UNIX Version 3.x 4.x */
+ 
+ #if IscVersion == 400
+ # define ISCVerDef -DISC40 -DISC30
+ # define OSVendor		(ISC Version 4.0)
+ #else
+ # if IscVersion == 300
+ #  define ISCVerDef -DISC30
+ #  define OSVendor		(ISC Version 3.0)
+ # else
+ #  if IscVersion == 202
+ #   define OSVendor		(ISC Version 2.0.2)
+ #   define ISCVerDef -DISC202
+ #  else
+ #   define OSVendor		(ISC Version 2.2.1)
+ #   define ISCVerDef -DISC22
+ #  endif
+ # endif
+ #endif
+ 
+ 
+ #define OSDefines		-DISC ISCVerDef
+ 
+ #define OSName			Unix System V/386 Release 3.2
+ #define OSMajorVersion		3
+ #define OSMinorVersion		2
+ 
+ /* Note, cpp already does -Di386 */
+ #define BootstrapCFlags		OSDefines -DSYSV
+ 
+ #if IscVersion > 202
+ # define LocalLibraries	-lpt
+ # define PosixLibraries	-lcposix
+ #else
+ # define LocalLibraries        -lmalloc -lpt
+ # define PosixLibraries
+ #endif
+ 
+ #define SocketLibraries		-linet
+ 
+ #ifndef ExtraLibraries
+ #define ExtraLibraries SocketLibraries LocalLibraries -lc_s PosixLibraries
+ #endif
+ 
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ 
+ #define ServerExtraSysLibs	$(CBRT)
+ 
+ #define ServerExtraDefines	SVR3mmapFlags XFree86ServerDefines
+ 
+ #if IscVersion > 300
+ # ifndef HasSymLinks
+ #  define HasSymLinks             YES
+ # endif
+ #endif
+ 
+ #define HasShm			YES
+ 
+ #ifndef HasLibCrypt
+ #define HasLibCrypt            YES
+ #define SpecialLibCrypt        -lcrypt
+ #endif
+ 
+ #ifndef DefaultCDebugFlags
+ # if HasGcc2
+ #  define DefaultCDebugFlags -O2
+ # else
+ #  define DefaultCDebugFlags -O
+ # endif
+ #endif
+ 
+ #if HasGcc2
+ # define CcCmd gcc 
+ #endif
+ 
+ #ifndef DefaultCplusplusOptions
+ #define DefaultCplusplusOptions	-fno-implicit-templates
+ #endif
+ 
+ #ifndef ConnectionFlags
+ #define ConnectionFlags -DLOCALCONN -DTCPCONN 
+ /* -DSTREAMSCONN -DUNIXCONN -- does not work on ISC SVR3 */
+ #endif
+ 
+ #define CompressManCmd $(COMPRESS) -v
+ 
+ #define XmanSearchPath /usr/catman
+ 
+ #ifndef RemoveDSDENroffMacros
+ #define RemoveDSDENroffMacros   YES
+ #endif
+ 
+ #include <svr3.cf>
+ 
diff -c xc/config/cf/linux.cf:1.1.1.2 xc/config/cf/linux.cf:3.22
*** xc/config/cf/linux.cf:1.1.1.2	Mon Jan 30 17:29:20 1995
--- xc/config/cf/linux.cf	Mon Jan 30 17:29:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM platform:  $XConsortium: linux.cf,v 1.11 95/01/23 18:32:03 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.22 1995/01/28 15:40:22 dawes Exp $
  
  #define OSName			Linux
  #define OSVendor		/**/
***************
*** 11,17 ****
  #endif
  #define HasGcc			YES
  #define HasGcc2			YES
! #define HasGcc2ForCplusplus	YES
  #define GccUsesGas		YES
  #define UseGas			YES
  #define GnuCpp			YES
--- 12,20 ----
  #endif
  #define HasGcc			YES
  #define HasGcc2			YES
! #ifndef HasGcc2ForCplusplus
! # define HasGcc2ForCplusplus	YES
! #endif
  #define GccUsesGas		YES
  #define UseGas			YES
  #define GnuCpp			YES
***************
*** 58,68 ****
  #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #define HasWChar32		YES
  #define StandardCppDefines	-traditional StandardDefines
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
! #define ExtensionOSDefines	-DXTESTEXT1
  #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #define ConnectionFlags		-DUNIXCONN -DTCPCONN
- #define InstUidFlags		-s -m 4755
  
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
--- 61,70 ----
  #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #define HasWChar32		YES
  #define StandardCppDefines	-traditional StandardDefines
! #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
  #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #define ServerExtraSysLibs	$(CBRT) -lm
  #define ConnectionFlags		-DUNIXCONN -DTCPCONN
  
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
diff -c xc/config/cf/lnxLib.rules:1.1.1.2 xc/config/cf/lnxLib.rules:3.11
*** xc/config/cf/lnxLib.rules:1.1.1.2	Mon Jan 30 17:29:20 1995
--- xc/config/cf/lnxLib.rules	Mon Jan 30 17:29:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: lnxLib.rules,v 1.8 95/01/16 21:11:00 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.11 1995/01/28 15:40:25 dawes Exp $
  
  /*
   * Linux shared library rules (DLL & ELF versions)
***************
*** 109,115 ****
  #define SharedLibraryLoadFlags /**/
  #endif
  #ifndef PositionIndependentCFlags
! #define PositionIndependentCFlags -B/usr/dll/jump/
  #endif
  
  /*
--- 110,116 ----
  #define SharedLibraryLoadFlags /**/
  #endif
  #ifndef PositionIndependentCFlags
! #define PositionIndependentCFlags -B/usr/bin/jump
  #endif
  
  /*
***************
*** 136,142 ****
   *  JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs	<see DLL docs>
   *  JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore	<see DLL docs>
   *  JUMP_EXPORT_Xfoo = $(JUMP_DIR_Xfoo)/jump.vars	<exported symbols>
!  *  JUMP_IMPORT_Xfoo = $(JUMP_DIR_Xbar)			<imported symbols>
   *  JUMP_ADDRESS_Xfoo = 0xXXXXXXXX			<fill in with address>
   *  JUMP_JUMPTABLESIZE_Xfoo = 0x4000			<adjust if necessary>
   *  JUMP_GOTSIZE_Xfoo = 4096				<adjust if necessary>
--- 137,143 ----
   *  JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs	<see DLL docs>
   *  JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore	<see DLL docs>
   *  JUMP_EXPORT_Xfoo = $(JUMP_DIR_Xfoo)/jump.vars	<exported symbols>
!  *  JUMP_IMPORT_Xfoo = $(JUMP_EXPORT_Xbar)		<imported symbols>
   *  JUMP_ADDRESS_Xfoo = 0xXXXXXXXX			<fill in with address>
   *  JUMP_JUMPTABLESIZE_Xfoo = 0x4000			<adjust if necessary>
   *  JUMP_GOTSIZE_Xfoo = 4096				<adjust if necessary>
diff -c xc/config/cf/lnxLib.tmpl:1.1.1.2 xc/config/cf/lnxLib.tmpl:3.6
*** xc/config/cf/lnxLib.tmpl:1.1.1.2	Mon Jan 30 17:29:21 1995
--- xc/config/cf/lnxLib.tmpl	Mon Jan 30 17:29:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.6 1995/01/28 15:40:27 dawes Exp $
  
  /*
   * Linux shared library template
diff -c /dev/null xc/config/cf/lnxdoc.rules:3.3
*** /dev/null	Mon Jan 30 17:29:21 1995
--- xc/config/cf/lnxdoc.rules	Mon Jan 30 17:29:22 1995
***************
*** 0 ****
--- 1,83 ----
+ XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.3 1994/12/25 12:12:22 dawes Exp $
+ XCOMM
+ XCOMM Rules for formatting Linuxdoc-SGML documentation
+ XCOMM
+ 
+ #include <lnxdoc.tmpl>
+ 
+ #if BuildLinuxDocPS
+ #define LinuxDocSgmlToPs(sgmlfile,base) 				@@\
+ AllTarget(base.ps)							@@\
+ 									@@\
+ base.ps: sgmlfile							@@\
+ 	RemoveFile(base.dvi)						@@\
+ 	$(LINUXDOCFORMAT) -T latex sgmlfile | \				@@\
+ 	    $(LINUXDOCLATEX) -d > base.dvi				@@\
+ 	RemoveFile(base.ps)						@@\
+ 	$(DVIPS) $(DVIPSOPTIONS) -o base.ps base.dvi			@@\
+ 	RemoveFile(base.dvi)						@@\
+ 									@@\
+ InstallNonExecFile(base.ps,$(XFREE86PSDOCDIR))
+ #else
+ #define LinuxDocSgmlToPs(sgmlfile,base) /**/
+ #endif
+ 
+ #if BuildLinuxDocText
+ #define LinuxDocSgmlToText(sgmlfile,textfile)				@@\
+ AllTarget(textfile)							@@\
+ 									@@\
+ textfile: sgmlfile							@@\
+ 	RemoveFile(textfile)						@@\
+ 	$(LINUXDOCFORMAT) -T nroff sgmlfile | \				@@\
+ 	    $(LINUXDOCROFF) | $(XFREE86IDENTFIX) > textfile		@@\
+ 									@@\
+ InstallNonExecFile(textfile,$(XFREE86DOCDIR))				@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(textfile)
+ #else
+ #define LinuxDocSgmlToText(sgmlfile,textfile) /**/
+ #endif
+ 
+ /*
+  * The 'echo' stuff here is a bit of a hack, but 'set -x' doesn't show
+  * what is going on.
+  */
+ #if BuildLinuxDocHtml
+ #define LinuxDocSgmlToHtml(sgmlfile,base)				@@\
+ AllTarget(base.html)							@@\
+ 									@@\
+ base.html: sgmlfile							@@\
+ 	@(TMP=/tmp/tmp.$$$$; \						@@\
+ 	  RemoveFile($${TMP}); \					@@\
+ 	  echo RemoveFiles(base*.html); \				@@\
+ 	  RemoveFiles(base*.html); \					@@\
+ 	  echo "$(LINUXDOCFORMAT) -T html sgmlfile |" \			@@\
+ 	    "$(LINUXDOCPREHTML) | $(LINUXDOCFIXREF) > $${TMP}"; \	@@\
+ 	  $(LINUXDOCFORMAT) -T html sgmlfile | \			@@\
+ 	    $(LINUXDOCPREHTML) | $(LINUXDOCFIXREF) > $${TMP};	 \	@@\
+ 	  echo "$(LINUXDOCFORMAT) -T html sgmlfile |" \			@@\
+ 	    "$(LINUXDOCPREHTML) >> $${TMP}"; \				@@\
+ 	  $(LINUXDOCFORMAT) -T html sgmlfile | \			@@\
+ 	    $(LINUXDOCPREHTML) >> $${TMP}; \				@@\
+ 	  echo "$(LINUXDOCHTML) base < $${TMP} > base.html"; \		@@\
+ 	  $(LINUXDOCHTML) base < $${TMP} > base.html; \			@@\
+ 	  RemoveFile($${TMP}))						@@\
+ 									@@\
+ InstallMultipleDest(install,base*.html,$(XFREE86HTMLDOCDIR))
+ #else
+ #define LinuxDocSgmlToHtml(sgmlfile,base) /**/
+ #endif
+ 
+ 
+ #define LinuxDocTargetLong(sgmlfile,textfile,base)			@@\
+ LinuxDocSgmlToText(sgmlfile,textfile)					@@\
+ LinuxDocSgmlToHtml(sgmlfile,base)					@@\
+ LinuxDocSgmlToPs(sgmlfile,base)
+ 
+ #define LinuxDocReadmeTarget(base)					@@\
+ LinuxDocTargetLong(base.sgml,README.base,base)
+ 
+ #define LinuxDocTarget(base)						@@\
+ LinuxDocTargetLong(base.sgml,base,base)
+ 
diff -c /dev/null xc/config/cf/lnxdoc.tmpl:3.3
*** /dev/null	Mon Jan 30 17:29:22 1995
--- xc/config/cf/lnxdoc.tmpl	Mon Jan 30 17:29:22 1995
***************
*** 0 ****
--- 1,92 ----
+ XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.3 1994/12/25 12:12:24 dawes Exp $
+ XCOMM
+ 
+ #ifndef HasLinuxDoc
+ #define HasLinuxDoc		NO
+ #endif
+ 
+ #ifndef LinuxDocDir
+ #define LinuxDocDir		/usr/local/linuxdoc-sgml
+ #endif
+ 
+ #ifndef LinuxDocBinDir
+ #define LinuxDocBinDir		$(LINUXDOCPATH)/bin
+ #endif
+ 
+ #ifndef LinuxDocFormatCmd
+ #define LinuxDocFormatCmd	$(LINUXDOCBIN)/ldformat
+ #endif
+ 
+ #ifndef LinuxDocRoffCmd
+ #define LinuxDocRoffCmd		$(LINUXDOCBIN)/qroff
+ #endif
+ 
+ #ifndef XFree86IdentFix
+ #define XFree86IdentFix		sed '/\$$\XFree86:/s/\$$/Generated from /'
+ #endif
+ 
+ #ifndef LinuxDocFixrefCmd
+ #define LinuxDocFixrefCmd	$(LINUXDOCBIN)/fixref
+ #endif
+ 
+ #ifndef LinuxDocPreHtmlCmd
+ #define LinuxDocPreHtmlCmd	$(LINUXDOCBIN)/prehtml
+ #endif
+ 
+ #ifndef LinuxDocHtmlCmd
+ #define LinuxDocHtmlCmd		$(LINUXDOCBIN)/html2html
+ #endif
+ 
+ #ifndef HasLatex
+ #define HasLatex		NO
+ #endif
+ 
+ #ifndef LinuxDocLatexCmd
+ #define LinuxDocLatexCmd	$(LINUXDOCBIN)/qtex
+ #endif
+ 
+ #ifndef HasDvips
+ #define HasDvips		NO
+ #endif
+ 
+ #ifndef DvipsOptions
+ #define DvipsOptions		/**/
+ #endif
+ 
+ #ifndef DvipsCmd
+ #define DvipsCmd		dvips
+ #endif
+ 
+ #ifndef BuildLinuxDocText
+ #define BuildLinuxDocText	HasLinuxDoc
+ #endif
+ 
+ #ifndef BuildLinuxDocHtml
+ #define BuildLinuxDocHtml	NO
+ #endif
+ 
+ #ifndef BuildLinuxDocPS
+ #define BuildLinuxDocPS		HasLatex && HasDvips
+ #endif
+ 
+ 
+      LINUXDOCPATH = LinuxDocDir
+       LINUXDOCENV = LINUXDOC=$(LINUXDOCPATH)
+       LINUXDOCBIN = LinuxDocBinDir
+    LINUXDOCFORMAT = $(LINUXDOCENV) LinuxDocFormatCmd
+      LINUXDOCROFF = $(LINUXDOCENV) LinuxDocRoffCmd
+     LINUXDOCLATEX = $(LINUXDOCENV) LinuxDocLatexCmd
+    LINUXDOCFIXREF = $(LINUXDOCENV) LinuxDocFixrefCmd
+   LINUXDOCPREHTML = $(LINUXDOCENV) LinuxDocPreHtmlCmd
+      LINUXDOCHTML = $(LINUXDOCENV) LinuxDocHtmlCmd
+   XFREE86IDENTFIX = XFree86IdentFix
+             DVIPS = DvipsCmd
+      DVIPSOPTIONS = DvipsOptions
+ 
+ XCOMM Some extra things to clean
+ 
+ #ifdef ExtraFilesToClean
+ #undef ExtraFilesToClean
+ #endif
+ #define ExtraFilesToClean *.aux *.dvi *.log *.tex *.toc *.html *.ps
+ 
diff -c /dev/null xc/config/cf/mach.cf:3.4
*** /dev/null	Mon Jan 30 17:29:22 1995
--- xc/config/cf/mach.cf	Mon Jan 30 17:29:22 1995
***************
*** 0 ****
--- 1,71 ----
+ XCOMM platform:  $XFree86: xc/config/cf/mach.cf,v 3.4 1994/11/19 07:32:25 dawes Exp $
+ 
+ #define OSName           Mach 2.5/3.0
+ #define OSVendor          /**/
+ XCOMM operating system:  OSName
+ #define OSMajorVersion  	1
+ #define OSMinorVersion    	1
+ 
+ #define HasGcc 			YES
+ #define HasGcc2			YES
+ #define GccUsesGas		YES
+ #define UseGas			YES
+ #define GnuCpp			YES
+ #define UseGccMakeDepend	YES
+ #ifndef HasGcc2ForCplusplus
+ #define HasGcc2ForCplusplus	YES
+ #endif
+ 
+ #define CcCmd			gcc
+ #define CppCmd			/usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
+ #define PreProcessCmd		/usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
+ #define DefaultCCOptions	/**/
+ #define GccGasOption 		-DGCCUSESGAS
+ #define OptimizedCDebugFlags	-m486 -O2
+ 
+ #define AsmDefines		-DUSE_GAS
+ #define BootstrapCFlags		-DNOSTDHDRS
+ #define ExtensionOSDefines	/* -DXTESTEXT1 */
+ #define ServerExtraSysLibs	/usr/lib/libmach.a
+ #ifdef i386Architecture
+ #define ServerExtraDefines	GccGasOption XFree86ServerDefines
+ #else
+ #define ServerExtraDefines	GccGasOption
+ #endif
+ #define StandardCppDefines	-traditional
+ #define StandardDefines		-DNOSTDHDRS -DMACH386
+ #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
+ 
+ #define AvoidNullMakeCommand	YES
+ #define CompressAllFonts	YES
+ #define DirFailPrefix -
+ #define HasNdbm         	YES
+ #define HasPutenv       	YES
+ #define Malloc0ReturnsNull	YES
+ #define NeedConstPrototypes	YES
+ #define NeedFunctionPrototypes	YES
+ #define NeedNestedPrototypes	YES
+ #define NeedVarargsPrototypes	YES
+ #define NeedWidePrototypes	NO
+ #define StripInstalledPrograms	YES
+ 
+ /*#define ExtraLibraries	-lgnumalloc */
+ 
+ #ifdef InstallCmd
+ #undef  InstallCmd
+ #endif
+ #define InstallCmd		/usr/bin/install
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
+ #endif
+ 
+ #define TroffCmd        groff -Tps
+ 
+ #ifndef ExtraFilesToClean
+ # define ExtraFilesToClean *.core
+ #endif
+ 
+ #ifdef i386Architecture
+ # include <xfree86.cf>
+ #endif
diff -c /dev/null xc/config/cf/minix.cf:3.3
*** /dev/null	Mon Jan 30 17:29:23 1995
--- xc/config/cf/minix.cf	Mon Jan 30 17:29:23 1995
***************
*** 0 ****
--- 1,60 ----
+ XCOMM platform:  $XFree86: xc/config/cf/minix.cf,v 3.3 1994/06/28 12:15:02 dawes Exp $
+ 
+ 
+ /*
+  * If you want to change any of these, do it in the BeforeVendorCF part
+  * of site.def
+  */
+ #define OSName			Minix-386vm
+ #define OSVendor		/* philip@cs.vu.nl */
+ #define OSMajorVersion		1
+ #define OSMinorVersion		6
+ #define OSTeenyVersion		25.1.0
+ 
+ #define AcdGcc
+ 
+ #ifdef AcdGcc
+ #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+ #define AsmDefines 		-DUSE_GAS
+ #define GccGasOption		-DGCCUSESGAS /* For SuperProbe */
+ #endif
+ 
+ /* Defaults for Minix */
+ 
+ #define ConnectionFlags		-DMNX_TCPCONN
+ #define StandardDefines		-D_MINIX -DMINIX -D_POSIX_SOURCE
+ #define StandardIncludes	
+ 
+ #define DoRanlibCmd		NO
+ #define AvoidNullMakeCommand	YES
+ #define HasSockets		NO
+ #define HasStreams		NO
+ #define HasVFork		NO
+ #define HasNdbm			YES
+ #define	ExtraLibraries		-lnbio
+ #define NeedConstPrototypes	YES
+ #define NeedVarargsPrototypes	YES
+ #define NeedNestedPrototypes	YES
+ /* #define UseCCMakeDepend		YES */
+ #define	DefaultCCOptions	-wo -fsoft
+ #define ArCmd			CcCmd -c.a -o
+ #define ArAddCmd		ArCmd
+ #define CcCmd			acd -descr gcc -name cc
+ #define AsCmd			CcCmd -c
+ #define CppCmd			/usr/lib/cpp
+ #define LdCmd			CcCmd
+ #define LdCombineFlags		-r
+ #define LexLib			/* */
+ 
+ #define	SetTtyGroup		YES	/* for xterm */
+ #define HasPutenv		YES	/* for xsm */
+ 
+ #ifndef AssembleObject
+ #define AssembleObject(flags) $(RM) $@                                    @@\
+ 	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.s | \           @@\
+ 	    grep -v '^\#' > $*.i.s                                        @@\
+ 	$(AS) -o $*.o $*.i.s                                              @@\
+ 	$(RM) $*.i.s
+ #endif
+ 
+ #include <xfree86.cf>
diff -c xc/config/cf/ncr.cf:1.1.1.3 xc/config/cf/ncr.cf:3.10
*** xc/config/cf/ncr.cf:1.1.1.3	Mon Jan 30 17:29:24 1995
--- xc/config/cf/ncr.cf	Mon Jan 30 17:29:24 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM platform:  $XConsortium: ncr.cf,v 1.19 95/01/25 16:28:38 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/ncr.cf,v 3.10 1995/01/28 15:40:29 dawes Exp $
  #define OSName			Unix System V Release 4/MP-RAS
  #define OSVendor		NCR
  XCOMM operating system:  OSName
***************
*** 82,87 ****
--- 83,91 ----
  	$(INSTALL) -c $(INSTMANFLAGS) file.z $(DESTDIR)destdir/dest.z; \@@\
  	fi
  
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+ 
  #define InstallMultipleManSuffix(list,dest,suff)                        @@\
  install.man:: 								@@\
  	MakeDir($(DESTDIR)dest)						@@\
***************
*** 106,110 ****
--- 110,117 ----
  		(cd $(DESTDIR)destdir; $(LN) file.z $$i.z);\		@@\
  		); \							@@\
  	done
+ 
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ 	InstallManPageAliases(file,destdir,aliases)
  
  #include <svr4.cf>
diff -c /dev/null xc/config/cf/os2.cf:3.2
*** /dev/null	Mon Jan 30 17:29:24 1995
--- xc/config/cf/os2.cf	Mon Jan 30 17:29:24 1995
***************
*** 0 ****
--- 1,224 ----
+ XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.2 1994/12/17 09:32:44 dawes Exp $
+ 
+ #define OSName           OS/2
+ #define OSVendor	 IBM
+ #define OSMajorVersion    2
+ #define OSMinorVersion    1
+ 
+ /*
+  * C library features
+  */
+ #ifdef __EMX__
+ 
+ #define BootstrapCFlags   -DNOSTDHDRS -DBSD43
+ #define StandardDefines   -DNOSTDHDRS
+ #define XawI18nDefines     -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ 
+ /* Set the following to the path where the emx *.lib files are! 
+  * The following is a correct path:
+  * EMXLIBPATH = q:\foo\bar
+  */
+   EMXLIBPATH = d:\emx\lib
+ 
+ /* This will redirect everything to /XFree86
+  * Care will be taken that programs that need a file from this tree
+  * will add the environment variable X11ROOT to the search path
+  * so you can redirect the stuff to a different drive
+  */
+ #define ProjectRoot /XFree86
+ 
+ /* more directories */
+ #define XAppLoadDir	$(LIBDIR)/app_defs
+ 
+ 
+ /* A set of standard defines: */
+ #define OSDefines		-D__EMX__ -D__i386__ -Demxos2 -D_POSIX_SOURCE \
+ 				-D_BSD_SOURCE -D_GNU_SOURCE
+ 
+ #define BuildPexExt	NO
+ #define BuildXInputExt	NO
+ #define BuildXIE	NO
+ #define BuildXKB	NO
+ /* OS/2 bash implementation (or even OS/2 itself) has a bug preventing
+  * proper make clean/include/depend/all in deeper Xfree86 dirs. The following
+  * prevents diving into XFree86 dirs, unless explicitly requested.
+  */
+ #define OS2DepthBug	YES
+ 
+ #define HasNdbm         	YES
+ #define HasPutenv       	YES
+ #define HasSockets		YES
+ #define HasBsearch		NO
+ #define HasLargeTmp		NO
+ #define HasPoll			NO
+ #define HasBSD44Sockets 	NO
+ #define HasSecureRPC		NO
+ #define	HasSymLinks		NO
+ #define HasVFork		NO
+ #define Malloc0ReturnsNull	NO
+ #define SetTtyGroup     	NO
+ #ifndef HasLibCrypt
+ # define HasLibCrypt		NO
+ #endif
+ #ifndef HasShm
+ # define HasShm          	NO
+ #endif
+ #define ConnectionFlags		-DTCPCONN
+ 
+ /*
+  * Compiler Features
+  */
+ #define HasGcc			YES
+ #define HasGcc2			YES
+ #define HasCplusplus		YES
+ #define HasGcc2ForCplusplus	YES
+ #define GccUsesGas		YES
+ #define UseGas			YES
+ #define GnuCpp			YES
+ #define DoRanlibCmd		YES
+ #define NeedConstPrototypes	YES
+ #define NeedFunctionPrototypes	YES
+ #define NeedNestedPrototypes	YES
+ #define NeedVarargsPrototypes	YES
+ #define NeedWidePrototypes	NO
+ 
+ #define CppCmd	cpp
+ #define StandardCppDefines	-traditional
+ #define PreProcessCmd	CppCmd
+ 
+ /*
+  * ATTENTION: This is defined, but due to a bug in make/gcc (?) the defines are
+  * hard coded into config/makedepend/main.c.
+  * You must change them there!
+  */
+ #define PreIncDir	/emx/include
+ 
+ #define CcCmd	gcc
+ #define DefaultCCOptions	-Zmtd
+ #define LibraryCCOptions	-Zmtd
+ #define ServerCCOptions		-Zmtd 
+ 
+ #define AsCmd	gcc -S
+ #define GccGasOption	-DGCCUSESGAS
+ #define AsmDefines	-DUSE_GAS
+ 
+ #define InstallCmd	install
+ 
+ #define LdCmd	ld
+ #define ExtraLoadFlags	/**/
+ #define ExtraLibraries	/emx/lib/binmode.Osuf -lnet -lbsd
+ 
+ /* quite a number of programs you need, most of them the same as
+  * with Unix, but listed here for completeness
+  */
+ #define CplusplusCmd	g++
+ #define ArCmd	ar cr
+ #define RanlibCmd	ar s
+ #define BourneShell	/**/
+ #define LexCmd	flex -l
+ #define LexLib	-lfl
+ #define YaccCmd	yacc
+ #define LintCmd	/**/
+ #define MvCmd	mv
+ #define CompressCmd	compress
+ #define LnCmd cp
+ #define CpCmd cp
+ #define RmCmd	ImakeHelper 4 
+ 
+ #ifndef UseInstalled
+ #define ImakeCmd \imake
+ #define MkdirHierCmd \mkdirhier
+ #define DependCmd \makedepend
+ #endif
+ 
+ #define InstPgmFlags /**/
+ #define InstBinFlags /**/
+ #define InstUidFlags /**/
+ #define InstLibFlags /**/
+ #define InstIncFlags /**/
+ #define InstManFlags /**/
+ #define InstDatFlags /**/
+ #define InstallFlags /**/
+ 
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags 	-m486 -O2
+ # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+ #else
+ # define OptimizedCDebugFlags 	-O2
+ # define ServerOSDefines 	/**/
+ #endif
+ #ifdef i386Architecture
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines
+ #else
+ #define ServerExtraDefines GccGasOption
+ #endif
+ 
+ 
+ /*
+  * Make & install Features
+  */
+ 
+ #define AvoidNullMakeCommand 	NO
+ _NULLCMD_ = @ rem
+ /* _NULLCMD_ = @ echo ÿ*/		/*WARNING: ALT-255 IN LINE!*/
+ #define StripInstalledPrograms	NO
+ #define CompressAllFonts	YES
+ #define DefaultUserPath		.:/os2:/emx/bin:/tcpip/bin:$(BINDIR)
+ #define DefaultSystemPath	/os2:/emx/bin:$(BINDIR)
+ 
+ #ifndef ExtraFilesToClean
+ # define ExtraFilesToClean 	*.~* *.exe *.dll *.obj *.lib
+ #endif
+ 
+ #define ProgramTargetName(target)target.exe
+ 
+ /* we don't name libraries lib*.a */
+ #define LibraryTargetName(libname) libname.a
+ #define LibraryTargetNameSuffix(libname,suffix)Concat(libname,suffix.a)
+ 
+ /* ... and we even don't do it in rules that should have used the above
+  * LibraryTargetName macro
+  */
+ #ifndef UnSharedLibReferences
+ #define UnsharedLibReferences(varname,libname,libsource)		@@\
+ Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,$(BUILDLIBDIR)/,libname.a)	@@\
+ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+ LintLibReferences(varname,libname,libsource)
+ #endif
+ 
+ #ifndef SharedLibReferences
+ #define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+ Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
+ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+ LintLibReferences(varname,libname,libsource)
+ #endif
+ 
+ /*
+  * Documentation formatting
+  */
+ #undef	TblCmd
+ #define	TblCmd 			/emx/bin/tbl
+ #undef	EqnCmd
+ #define	EqnCmd 			/emx/bin/eqn -Tascii
+           COL = /usr/bin/col
+          NEQN = /usr/bin/neqn
+         NROFF = /usr/bin/nroff
+ #define TroffCmd        	groff -Tps
+ 
+ 
+ XCOMM Man pages need to be formatted when installed, so override the default
+ XCOMM imake rules.
+ 
+ #define ManSuffix		1
+ #define ManSourcePath		$(MANPATH)
+ 
+ #include <os2.rules>
+ #include <os2Lib.rules>
+ 
+ #ifdef i386Architecture
+ # include <xfree86.cf>
+ #endif
+ 
+ #else
+ #error You must edit os2.cf for your (non-EMX) OS/2 dev system
+ #endif
diff -c /dev/null xc/config/cf/os2.rules:3.1
*** /dev/null	Mon Jan 30 17:29:24 1995
--- xc/config/cf/os2.rules	Mon Jan 30 17:29:25 1995
***************
*** 0 ****
--- 1,254 ----
+ XCOMM platform:  $XFree86: xc/config/cf/os2.rules,v 3.1 1994/12/17 09:32:46 dawes Exp $
+ 
+ .SUFFIXES: .Osuf .c .CCsuf
+ 
+ .c.Osuf:
+ 	$(CC) $(CFLAGS) -c $*.c
+ 
+ #if HasCplusplus
+ .CCsuf.Osuf:
+ 	$(CXX) $(CFLAGS) -c $*.CCsuf
+ #endif
+ 
+ #ifndef UseInstalled
+ #define ImakeHelper \imakesvc
+ #define IMmode n
+ #define ImakeIndir \indir
+ #define ImakeSubCmdHelper \imake -I$(IRULESRC) $(IMAKE_DEFINES)
+ #define IOPLFix \ioplfix
+ #define Fontc \bdftopcf
+ #define MkFontDir \mkfontdir
+ #else
+ #define ImakeHelper imakesvc
+ #define IMmode u
+ #define ImakeIndir indir
+ #define ImakeSubCmdHelper $(IMAKE_CMD)
+ #define IOPLFix ioplfix
+ #define Fontc bdftopcf
+ #define MkFontDir mkfontdir
+ #endif
+ 
+ #define echo ImakeHelper 8 
+ #define RunProgram(progvar,options) $(subst /,\,$(progvar)) options
+ #define RemoveFile(file) $(RM) file
+ #define RemoveFiles(files) $(RM) files
+ 
+ #define LibObjCompile(dir,options) RemoveFiles($@ dir\$@)		@@\
+ 	$(CC) $(CCOPTIONS) $(ALLDEFINES) options -c  $*.c		@@\
+ 	$(MV) $@ dir\$@
+ 
+ #define MakeDir(dir) if not exist dir $(MKDIRHIER) dir
+ 
+ #define BuildIncludesTop(srclist)					@@\
+ includes::								@@\
+ 	MakeDir($(BUILDINCDIR))						@@\
+ 	@for %i in (srclist) do ImakeHelper 2 $(BUILDINCDIR) $(BUILDINCTOP) $(CURRENT_DIR) %i
+ 
+ #define	ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib)	@@\
+ ProgramTargetName(program): $(objs) $(deplib)				@@\
+ 	RemoveTargetProgram($@)						@@\
+ 	LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)	@@\
+ 									@@\
+ InstallProgram(program,$(BINDIR))					@@\
+ InstallManPage(program,$(MANDIR))
+ 
+ #define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
+ includes::								@@\
+ 	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
+ 	@for %i in (srclist) do ImakeHelper 3 $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR) $(BUILDINCDIR)/dstsubdir %i
+ 
+ #define LinkFileList(step,list,dir,sub)					@@\
+ step::  list								@@\
+ 	@for %i in (list) do ImakeHelper 3 sub dir %i
+ 
+ #define ComplexProgramTarget(program)					@@\
+ PROGRAM = ProgramTargetName(program)					@@\
+ 									@@\
+ AllTarget(ProgramTargetName(program))					@@\
+ 									@@\
+ ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
+ 									@@\
+ DependTarget()								@@\
+ LintTarget()								@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile($(PROGRAM))
+ 
+ #define ComplexProgramTarget_1(program,locallib,syslib)			@@\
+ OBJS = $(OBJS1) $(OBJS2) $(OBJS3)					@@\
+ SRCS = $(SRCS1) $(SRCS2) $(SRCS3)					@@\
+ PROGRAM1 = ProgramTargetName(program)					@@\
+ 									@@\
+ AllTarget($(PROGRAM1) $(PROGRAM2) $(PROGRAM3))				@@\
+ 									@@\
+ ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)	@@\
+ 									@@\
+ DependTarget()								@@\
+ LintTarget()								@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFiles($(PROGRAMS))
+ 
+ #define ComplexProgramTarget_2(program,locallib,syslib)			@@\
+ PROGRAM2 = ProgramTargetName(program)					@@\
+ 									@@\
+ ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
+ 
+ #define ComplexProgramTarget_3(program,locallib,syslib)			@@\
+ PROGRAM3 = ProgramTargetName(program)					@@\
+ 									@@\
+ ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
+ 
+ #define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs)	@@\
+ ProgramTargetName(program): objects deplibs				@@\
+ 	RemoveTargetProgram($@)						@@\
+ 	LinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS) syslibs)	@@\
+ 									@@\
+ InstallProgram(program,$(BINDIR))					@@\
+ InstallManPage(program,$(MANDIR))
+ 
+ #define MoveToBakFile(file) ImakeHelper 5 file
+ 
+ #define RMoveToBakFile(file) ImakeHelper 6 file
+ 
+ #define InstallMultipleDestFlags(step,list,dest,flags)			@@\
+ step:: list								@@\
+ 	MakeDir($(DESTDIR)/dest)					@@\
+ 	$(INSTALL) $(INSTALLFLAGS) flags $** $(subst /,\,$(DESTDIR))\dest
+ 
+ #define	CleanTarget()							@@\
+ clean::									@@\
+ 	RemoveFiles(FilesToClean ExtraFilesToClean)
+ 
+ #define LinkSourceFile(src,dir)						@@\
+ src:									@@\
+ 	ImakeHelper 3 dir . src						@@\
+ 									@@\
+ includes:: src								@@\
+ 									@@\
+ depends:: src								@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(src)
+ 
+ #define LinkFile(tofile,fromfile)					@@\
+ tofile:: fromfile							@@\
+ 	ImakeHelper 7 fromfile tofile					@@\
+ 									@@\
+ includes:: tofile							@@\
+ 									@@\
+ depend:: tofile								@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(tofile)
+ 
+ #ifndef UseInstalled
+ #define ImakeDependency(target)						@@\
+ target:: ProgramTargetName($(IMAKE))					@@\
+ 									@@\
+ ProgramTargetName($(IMAKE)):						@@\
+ 	@\indir $(IMAKESRC) if exist Makefile $(MAKE) SHELL= all	@@\
+ 	@\indir $(IMAKESRC) if not exist Makefile $(MAKE) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
+ #endif
+ 
+ #ifndef UseInstalled
+ #define DependDependency() 						@@\
+ depend:: ProgramTargetName($(DEPEND))					@@\
+ 									@@\
+ ProgramTargetName($(DEPEND)):						@@\
+ 	@\indir $(DEPENDSRC) $(MAKE) SHELL= 
+ #endif
+ 
+ #define	DependTarget()							@@\
+ DependDependency()							@@\
+ 									@@\
+ depend::								@@\
+ 	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
+ 
+ #define	DependTarget3(srcs1,srcs2,srcs3)				@@\
+ DependDependency()							@@\
+ 
+ /* Currently this stuff doesn't work correctly for libX11
+ depend::								@@\
+ 	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1 @@\
+ 	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2 @@\
+ 	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3
+ */
+ 
+ #define ForceSubdirs(dirs)						@@\
+ dirs: DONE								@@\
+ 									@@\
+ DONE:									@@\
+ 	@for %i in (dirs) do \indir %i $(MAKE) SHELL= $(MFLAGS) PassCDebugFlags all @@\
+ 	touch DONE							@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(DONE)
+ 
+ #define MakeMakeSubdirs(dirs,target)					@@\
+ MMSDIRS = dirs								@@\
+ target::								@@\
+ 	@for %i in ($(subst /,\,$(MMSDIRS))) do ImakeHelper 1 IMmode %i ../$(IRULESRC) ../$(TOP) $(CURRENT_DIR)
+ 
+ #define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
+ Concat(SUBST,name) = dirs						@@\
+ name::									@@\
+ 	@for %i in ($(subst /,\,$(Concat(SUBST,name)))) do \indir %i $(MAKE) SHELL= $(MFLAGS) flags subname
+ 
+ #define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
+ step:: srcname								@@\
+ 	MakeDir($(DESTDIR)/dest)					@@\
+ 	$(INSTALL) $(INSTALLFLAGS) flags srcname $(subst /,\,$(DESTDIR))\dest\dstname
+ 
+ #define	BuildMakefileTarget(notused,imakeflags)				@@\
+ ImakeDependency(Makefile)						@@\
+ 									@@\
+ Makefile:: 								@@\
+ 	RMoveToBakFile(Makefile)					@@\
+ 	ImakeSubCmdHelper -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags
+ 
+ #define AssembleObject(flags) $(RM) $@                                  @@\
+ 	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.s | \         @@\
+ 	    grep -v '^\#' > _tmp_.s                                     @@\
+ 	$(CC) $(CFLAGS) -o $*.Osuf -c _tmp_.s                           @@\
+ 	$(RM) _tmp_.s
+ 
+ #define NormalAsmObjectRule()                                           @@\
+ .s.Osuf:                                                                @@\
+ 	AssembleObject($(_NOOP_))
+ 
+ #define FontBaseObj(basename)basename.pcf
+ #define FontCompressObj(basename)basename.pcz
+ /*
+  * UncompressedFontTarget
+  */
+ #define UncompressedFontTarget(basename)				@@\
+ FontBaseObj(basename):  FontSrc(basename)				@@\
+ 	Fontc $(FONTCFLAGS) $? -o $@
+ 
+ /*
+  * CompressedFontTarget
+  */
+ #define CompressedFontTarget(basename)					@@\
+ FontCompressObj(basename):  FontSrc(basename)				@@\
+ 	Fontc $(FONTCFLAGS) $? | $(COMPRESS) > $@
+ 
+ /*
+  * MakeFontsDir - generate rules to build fonts.dir database.
+  */
+ #define MakeFontsDir(deplist)						@@\
+ all:: fonts.dir								@@\
+ 									@@\
+ fonts.dir:  deplist							@@\
+ 	MkFontDir .							@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(fonts.dir)
+ 
+ #if CompressAllFonts
+ #define FontTarget(basename) CompressedFontTarget(basename)
+ #define FontObj(basename) FontCompressObj(basename)
+ #else
+ #define FontTarget(basename) UncompressedFontTarget(basename)
+ #define FontObj(basename) FontBaseObj(basename)
+ #endif /* CompressAllFonts */
diff -c /dev/null xc/config/cf/os2Lib.rules:3.0
*** /dev/null	Mon Jan 30 17:29:25 1995
--- xc/config/cf/os2Lib.rules	Mon Jan 30 17:29:25 1995
***************
*** 0 ****
--- 1,165 ----
+ XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.0 1994/10/20 06:00:12 dawes Exp $
+ 
+ /*
+  * OS2/EMX shared library rules (DLL version)
+  */
+ #ifndef __EMX__
+ #error You must edit os2Lib.rules for your (non-EMX) OS/2 dev system
+ #endif
+ 
+ #ifndef HasSharedLibraries
+ #define HasSharedLibraries YES
+ #endif
+ #ifndef ForceNormalLib
+ #define ForceNormalLib NO
+ #endif
+ 
+ #define SharedOldX NO
+ 
+ #ifndef SharedDataSeparation
+ #define SharedDataSeparation NO
+ #endif
+ #ifndef SharedCodeDef
+ #define SharedCodeDef /**/
+ #endif
+ #ifndef SharedLibraryDef
+ #define SharedLibraryDef /**/
+ #endif
+ #ifndef ShLibIncludeFile
+ #define ShLibIncludeFile <os2Lib.tmpl>
+ #endif
+ #ifndef SharedLibraryLoadFlags
+ #define SharedLibraryLoadFlags /**/
+ #endif
+ #ifndef PositionIndependentCFlags
+ #define PositionIndependentCFlags -Zdll -Zomf -Zmtd
+ #endif
+ 
+ /*
+  * NormalSharedLibObjCompile - compile fragment for shared object when
+  * a normal library is not being built
+  */
+ #ifndef NormalSharedLibObjCompile
+ #define NormalSharedLibObjCompile(options) $(RM) $@                        @@\
+ 	$(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c @@\
+ 	touch $*.o
+ #endif
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
+  */
+ #ifndef InstallSharedLibrary
+ #ifdef BuildImplibs
+ #define InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: libname.dll libname.a	libname.lib				@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) libname.dll $(DESTDIR)dest 	@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) libname.a $(DESTDIR)dest 		@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) libname.lib $(DESTDIR)dest
+ #else
+ #define InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: libname.dll libname.a						@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) libname.a $(DESTDIR)dest		@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) libname.dll $(DESTDIR)dest
+ #endif
+ #endif /* InstallSharedLibrary */
+ 
+ #ifdef UseInstalled
+ #define LinkBuildLibrary(lib) $(_NULLCMD_)
+ #else
+ #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
+ 	RemoveFile($(BUILDLIBDIR)/lib)					@@\
+ 	ImakeIndir $(BUILDLIBDIR) $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .
+ #endif
+ 
+         EMXIMP = emximp
+         EMXOMF = emxomf
+           SHLD = gcc -Zomf -Zdll -Zmtd
+      SHADDLIBS = -lbsd -lnet -lcdll
+ #ifndef BuildDllSupportLibs
+ #ifdef UseInstalled
+ #define BuildDllSupportLibs(slib) $(_NULLCMD_)
+ #else
+ #define BuildDllSupportLibs(slib)					@@\
+ 	$(EMXIMP) -o slib.imp slib.def					@@\
+ 	$(EMXIMP) -o slib.a slib.imp					@@\
+ 	$(EMXOMF) -s -l slib.a 						@@\
+ 	LinkBuildLibrary(slib.a)					@@\
+ 	LinkBuildLibrary(slib.lib)
+ #endif
+ #endif
+ 
+ #ifndef BuildDllSupportLibs2
+ #ifdef UseInstalled
+ #define BuildDllSupportLibs2(slib) $(_NULLCMD_)
+ #else
+ #define BuildDllSupportLibs2(slib)					@@\
+ 	$(EMXIMP) -o slib.imp Concat3(slib,os2,.def)			@@\
+ 	$(EMXIMP) -o slib.a slib.imp					@@\
+ 	$(EMXOMF) -s -l slib.a 						@@\
+ 	LinkBuildLibrary(slib.a)					@@\
+ 	LinkBuildLibrary(slib.lib)
+ #endif
+ #endif
+ 
+ #ifndef BuildLibSupportLibs
+ #ifdef UseInstalled
+ #define BuildLibSupportLibs(slib) $(_NULLCMD_)
+ #else
+ #define BuildLibSupportLibs(slib)					@@\
+ 	$(EMXOMF) -s -l slib.a 						@@\
+ 	LinkBuildLibrary(slib.a)					@@\
+ 	LinkBuildLibrary(slib.lib)
+ #endif
+ #endif
+ 
+ 
+ /*
+  * NormalSharedLibraryTarget - generate rules to create a shared library
+  * Stuff with making it under a different name removed
+  */
+ #ifndef SharedLibraryTarget
+ #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+ AllTarget(libname.dll)							@@\
+ .SUFFIXES: .obj .rsp .def						@@\
+ 									@@\
+ link.rsp: Concat3(libname,os2,.rsp)					@@\
+ 	@echo $(EMXLIBPATH)"\\dll0.obj+" >link.rsp			@@\
+ 	@cat Concat3(libname,os2,.rsp) >>link.rsp			@@\
+ 	@echo $(EMXLIBPATH)\\ $(REQUIREDLIBS) net bsd cdll os2 emx2 >>link.rsp	@@\
+ 	@echo Concat3(libname,os2,.def) >>link.rsp			@@\
+ 									@@\
+ libname.dll:  $(OBJS) link.rsp						@@\
+ 	link386 @link.rsp >nul						@@\
+ 	BuildDllSupportLibs2(libname)					@@\
+ 	LinkBuildLibrary(libname.dll)					@@\
+ 									@@\
+ clean::									@@\
+ 	$(RM) libname.lib libname.imp *.obj link.rsp
+ #endif /* SharedLibraryTarget */
+ 
+ /*
+  * NormalLibraryTarget - generate rules to create a library.
+  */
+ #ifndef NormalLibraryTarget
+ #define	NormalLibraryTarget(libname,objlist)				@@\
+ AllTarget(LibraryTargetName(libname))					@@\
+ 									@@\
+ LibraryTargetName(libname): objlist					@@\
+ 	RemoveFile($@)							@@\
+ 	MakeLibrary($@,objlist)						@@\
+ 	RanLibrary($@)							@@\
+ 	BuildLibSupportLibs($*)
+ #endif /* NormalLibraryTarget */
+ 
+ /*
+  * SharedLibraryDataTarget - generate rules to create shlib data file;
+  */
+ #ifndef SharedLibraryDataTarget
+ #define SharedLibraryDataTarget(libname,rev,salist)
+ #endif /* SharedLibraryDataTarget */
+ 
+ #ifndef InstallSharedLibraryData
+ #define InstallSharedLibraryData(libname,rev,dest)
+ #endif /* InstallSharedLibraryData */
diff -c /dev/null xc/config/cf/os2Lib.tmpl:3.0
*** /dev/null	Mon Jan 30 17:29:25 1995
--- xc/config/cf/os2Lib.tmpl	Mon Jan 30 17:29:26 1995
***************
*** 0 ****
--- 1,77 ----
+ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.0 1994/10/20 06:00:14 dawes Exp $
+ 
+ /*
+  * OS2/EMX shared library template
+  */
+ #ifndef __EMX__
+ #error You must edit os2Lib.tmpl for your (non-EMX) OS/2 dev system
+ #endif
+ 
+ /* note these are special because of linking with link386 */
+ #ifdef NOT_EMX
+ #define SharedXtReqs $(LDPRELIB) $(XLIBONLY)
+ #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+ #define SharedSMReqs $(LDPRELIB) $(ICELIB)
+ #define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+ #define SharedXiReqs $(LDPRELIB) $(XLIB)
+ #define SharedXieReqs $(LDPRELIB) $(XLIB)
+ #define SharedXtstReqs $(LDPRELIB) $(XLIB)
+ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
+ #define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+ #else
+ #define SharedXtReqs ..\\..\\usrlib\\ ICE SM X11
+ #define SharedXawReqs ..\\..\\usrlib\\ Xmu Xt X11 XexExt Xext
+ #define SharedXmuReqs ..\\..\\usrlib\\ Xt X11 XexExt Xext
+ #define SharedSMReqs ..\\..\\usrlib\\ ICE
+ #define SharedXextReqs ..\\..\\usrlib\\ X11 XexExt Xext
+ #define SharedXiReqs ..\\..\\usrlib\\ X11 XexExt Xext
+ #define SharedXieReqs ..\\..\\usrlib\\ X11 XexExt Xext
+ #define SharedXtstReqs ..\\..\\usrlib\\ X11 XexExt Xext
+ #define SharedOldXReqs ..\\..\\usrlib\\ X11 XexExt Xext
+ #define SharedPexReqs ..\\..\\usrlib\\ X11 m
+ #endif
+ 
+ /*
+  * and now a little bit of magic for using imake without source tree; if we
+  * are using shared libraries, we really do not need to depend on anything
+  */
+ #if SharedLibXext
+  DEPEXTENSIONLIB = 
+     EXTENSIONLIB = _Use(-lXext,-L$(EXTENSIONSRC)/lib -lXext)
+ #endif
+ #if SharedLibX11
+          DEPXLIB = 
+             XLIB = $(EXTENSIONLIB) _Use(-lX11,-L$(XLIBSRC) -lX11)
+ #endif
+ #if SharedLibXmu
+        DEPXMULIB = 
+           XMULIB = _Use(-lXmu,-L$(XMUSRC) -lXmu) $(XLIB)
+ #ifndef XawClientLibs
+ #define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+ #endif
+ #endif
+ #if SharedOldX
+       DEPOLDXLIB = 
+          OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX)
+ #endif
+ #if SharedLibXt
+      DEPXTOOLLIB = 
+         XTOOLLIB = _Use(-lXt,-L$(TOOLKITSRC) -lXt)
+ #endif
+ #if SharedLibXaw
+        DEPXAWLIB = 
+           XAWLIB = _Use(-lXaw,-L$(AWIDGETSRC) -lXaw)
+ #endif
+ #if SharedLibXi
+         DEPXILIB = 
+            XILIB = _Use(-lXi,-L$(XILIBSRC) -lXi)
+ #endif
+ #if SharedLibXTest
+     DEPXTESTLIB = 
+        XTESTLIB = _Use(-lXtst,-L$(EXTENSIONSRC)/lib/xtest -lXtst)
+ #endif
+ #if SharedLibPex
+       DEPPEXLIB = 
+          PEXLIB = _Use(-lPEX5,-L$(PEXLIBSRC) -lPEX5)
+ #endif
diff -c /dev/null xc/config/cf/sco.cf:3.6
*** /dev/null	Mon Jan 30 17:29:26 1995
--- xc/config/cf/sco.cf	Mon Jan 30 17:29:26 1995
***************
*** 0 ****
--- 1,102 ----
+ XCOMM platform:  $XFree86: xc/config/cf/sco.cf,v 3.6 1994/12/17 09:32:47 dawes Exp $
+ 
+ /*****************************************************************************
+  *	            Defaults for SCO-specfic parameters                          *
+  *****************************************************************************/
+ 
+ #ifndef ScoOsMouse
+ # define ScoOsMouse		YES
+ #endif
+ 
+ /* You must manually compute BootstrapCFlags for initial build */
+ 
+ #ifdef i386Sco324Architecture
+ # define BootstrapCFlags	-DSYSV -Di386 -DSCO -DSCO324
+ #else
+ # define BootstrapCFlags	-DSYSV -Di386 -DSCO
+ #endif
+ 
+ #define	OSMinorVersion	2
+ 
+ #ifdef i386Sco324Architecture
+ /*
+  * if your gcc is compiled with STDC_VALUE=0 then change the 1 to 0
+  */
+ # define GCC_STDC_VALUE		1
+ # if !GCC_STDC_VALUE
+ #  define OSDefines		-DSCO -DSCO324 -DBROKEN_FTOL -D_NO_PROTOTYPE -D_SVID \
+ 		-D__STDC__=1
+ #  undef StandardCppDefines
+ #  define StandardCppDefines	-DUNIXCPP=1 StandardDefines
+ # else
+ #  define OSDefines		-DSCO -DSCO324 -DBROKEN_FTOL -D_NO_PROTOTYPE -D_SVID
+ # endif
+ # define OSVendor		(SCO Version 3.2.4)
+ # ifndef HasSymLinks
+ #   define HasSymLinks YES
+ # endif
+ # define	OSTeenyVersion	4
+ # define CompressManCmd $(COMPRESS) -v
+ #else /* ! i386Sco324Architecture */
+ # define OSDefines		-DSCO -DBROKEN_FTOL -DNO_PROTOTYPE -D_SVID
+ # define OSVendor		(SCO Version 3.2.2)
+ # ifndef HasSymLinks
+ #   define HasSymLinks NO
+ # endif
+ # define	OSTeenyVersion	2
+ # define CompressManCmd pack
+ #endif /* ! i386Sco324Architecture */
+ 
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ 
+ /*
+  *	XBSDLIB is included with the Socket libraries, because SCO
+  *	needs Xbsd as its bcopy routine doesn't handle overlapping
+  *	regions. If HasSockets is false the XINETLIB does it for
+  *	us anyway.
+  */
+ #define SocketLibraries	$(XBSDLIB) -lsocket 
+ 
+ #define PosixLibraries		/**/
+ #define ManSourcePath		$(MANPATH)/cat.
+ 
+ #if ScoOsMouse
+ # define	ServerExtraDefines	-DUSE_OSMOUSE XFree86ServerDefines
+ # define	LocalLibraries		-lmalloc -lpt -levent
+ #else
+ # define	LocalLibraries		-lmalloc -lpt
+ #endif /* ScoOsMouse */
+ 
+ #define Malloc0ReturnsNull		YES
+ #define RemoveDSDENroffMacros   NO
+ #define CompressManPages        YES
+ #define ServerExtraSysLibs		$(CBRT) -lm
+ 
+ /*
+  *	The user should override this in their
+  *	site.def if they have the real crypt library,
+  *	we default to the international crypt library
+  *	here as anyone may obtain that
+  */
+ 
+ #ifndef HasLibCrypt
+ #define	HasLibCrypt				YES
+ #define	SpecialLibCrypt			-lcrypt_i
+ #endif
+ 
+ /*
+  * due to the extra '.' chars in the SCO man pages file name we have
+  * to provide our own version of this macro.
+  */
+ 
+ #define InstallManPageAliases(file,destdir,aliases)                     @@\
+ install.man::                                                           @@\
+         @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \     @@\
+         for i in aliases; do (set -x; \                                 @@\
+         $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
+         (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
+         $$i.$${SUFFIX})); \                                             @@\
+         done)
+ 
+ #include <svr3.cf>
+ 
diff -c xc/config/cf/site.def:1.1.1.1 xc/config/cf/site.def:3.7
*** xc/config/cf/site.def:1.1.1.1	Mon Jan 30 17:29:26 1995
--- xc/config/cf/site.def	Mon Jan 30 17:29:27 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM site:  $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $
+ XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.7 1995/01/04 04:36:01 dawes Exp $
  
  /*****************************************************************************
   *                                                                           *
***************
*** 34,41 ****
  #ifdef BeforeVendorCF
  
  /*
  #include <host.def>
- */
  
  /*
  #ifndef HasGcc2
--- 35,48 ----
  #ifdef BeforeVendorCF
  
  /*
+  * Include this for easy XFree86 customisations
+  */
+ #ifndef SiteIConfigFiles
+ #define SiteIConfigFiles $(IRULESRC)/xf86site.def $(IRULESRC)/host.def
+ #endif
+ #include <xf86site.def>
+ 
  #include <host.def>
  
  /*
  #ifndef HasGcc2
***************
*** 47,53 ****
--- 54,62 ----
  
  #ifdef AfterVendorCF
  
+ #ifndef ProjectRoot
  #define ProjectRoot /usr/X11R6
+ #endif
  
  /* #define HasXdmAuth YES */
  
***************
*** 58,64 ****
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4
  #define HasTestCenter	YES
  #endif
  #endif
--- 67,73 ----
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4Architecture
  #define HasTestCenter	YES
  #endif
  #endif
***************
*** 71,77 ****
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4)
  #define HasPurify	YES
  #endif
  */
--- 80,86 ----
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture
  #define HasPurify	YES
  #endif
  */
diff -c xc/config/cf/sun.cf:1.1.1.6 xc/config/cf/sun.cf:3.17
*** xc/config/cf/sun.cf:1.1.1.6	Mon Jan 30 17:29:27 1995
--- xc/config/cf/sun.cf	Mon Jan 30 17:29:27 1995
***************
*** 1,11 ****
  XCOMM platform:  $XConsortium: sun.cf,v 1.139 95/01/12 15:30:26 kaleb Exp $
  
  #ifdef SVR4Architecture
  #ifdef i386Architecture
! #define OSName            SunOS 5.1 x86
  XCOMM operating system:  OSName
  #define OSMajorVersion    5
! #define OSMinorVersion    1
  #define OSTeenyVersion    0
  #else
  #define OSName            SunOS 5.3
--- 1,12 ----
  XCOMM platform:  $XConsortium: sun.cf,v 1.139 95/01/12 15:30:26 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.17 1995/01/28 15:40:31 dawes Exp $
  
  #ifdef SVR4Architecture
  #ifdef i386Architecture
! #define OSName            SunOS 5.4 x86
  XCOMM operating system:  OSName
  #define OSMajorVersion    5
! #define OSMinorVersion    4
  #define OSTeenyVersion    0
  #else
  #define OSName            SunOS 5.3
***************
*** 62,67 ****
--- 63,75 ----
   *
   */
  
+ #ifndef HasGcc2
+ #define HasGcc2 NO
+ #endif
+ #ifndef HasGcc
+ #define HasGcc HasGcc2
+ #endif
+ 
  #ifndef HasSunC
  #if (HasCenterLineC || HasGcc || HasGcc2 || OSMajorVersion < 5)
  #define HasSunC NO
***************
*** 133,145 ****
  #endif
  
  #ifdef i386Architecture
- #if OSMajorVersion > 4
  #define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines
! #define ServerOSDefines    XFree86ServerOSDefines
! #else
! #define ServerExtraDefines AllocateLocalDefines
! #define ServerOSDefines   -DDDXOSINIT
! #endif
  #else
  #define ServerExtraDefines AllocateLocalDefines
  #define ServerOSDefines   -DDDXOSINIT
--- 141,148 ----
  #endif
  
  #ifdef i386Architecture
  #define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines
! #define ServerOSDefines   XFree86ServerOSDefines
  #else
  #define ServerExtraDefines AllocateLocalDefines
  #define ServerOSDefines   -DDDXOSINIT
***************
*** 153,159 ****
  #ifdef i386Architecture
  #define StandardDefines	  -Dsun -Di386 -DSVR4 -D__i386
  #else
! #define StandardDefines	  -Dsun -DSVR4
  #endif
  #define ExtraLibraries    -lsocket -lnsl
  #if OSMinorVersion > 1
--- 156,162 ----
  #ifdef i386Architecture
  #define StandardDefines	  -Dsun -Di386 -DSVR4 -D__i386
  #else
! #define StandardDefines	  -Dsun -Dsparc -DSVR4
  #endif
  #define ExtraLibraries    -lsocket -lnsl
  #if OSMinorVersion > 1
***************
*** 162,175 ****
--- 165,182 ----
  #define ThreadsCompileFlags -mt
  #else
  #define SystemMTDefines -D_REENTRANT
+ #ifndef i386Architecture
  #define ThreadsLibraries -lthread
  #endif
+ #endif
  #if HasSunCplusplus && CplusplusCompilerMajorVersion > 3
  #define ThreadsCplusplusCompileFlags -mt
  #else
  #define CplusplusSystemMTDefines -D_REENTRANT
+ #ifndef i386Architecture
  #define ThreadsCplusplusLibraries -lthread
  #endif
+ #endif
  #endif 		/* OSMinorVersion > 1 */
  #define HasVFork          NO
  #define InstKmemFlags	  -g sys -m 2755
***************
*** 209,224 ****
  #define BuildPexExt	  (XsunServer || Xsun24Server)
  #endif
  #ifndef BuildXKB
  #define	BuildXKB	  YES
  #endif
  
  #if HasGcc
  #if OSMajorVersion > 4 && defined(i386Architecture)
  #ifndef DefaultCCOptions
! #if OSMinorVersion == 1
  #define DefaultCCOptions -DNO_ASM
  #else
! #define DefaultCCOptions -ansi -DNO_ASM
  #endif
  #endif
  #endif
--- 216,243 ----
  #define BuildPexExt	  (XsunServer || Xsun24Server)
  #endif
  #ifndef BuildXKB
+ #if !((OSMajorVersion > 4) && defined(i386Architecture))
  #define	BuildXKB	  YES
  #endif
+ #endif
+ 
+ #if (OSMajorVersion > 4) && defined(i386Architecture)
+ #ifndef HasSolx86ApertureDriver
+ #define HasSolx86ApertureDriver	NO
+ #endif
+ #endif
  
  #if HasGcc
  #if OSMajorVersion > 4 && defined(i386Architecture)
  #ifndef DefaultCCOptions
! #if UseInstalled
  #define DefaultCCOptions -DNO_ASM
  #else
! #if OSMinorVersion > 3
! #define DefaultCCOptions -ansi -pedantic -DNO_ASM
! #else
! #define DefaultCCOptions -DNO_ASM
! #endif
  #endif
  #endif
  #endif
***************
*** 252,257 ****
--- 271,281 ----
  #else	/* OSMajorVersion >= 5*/
  #ifndef DefaultCCOptions
  #define DefaultCCOptions -Xc
+ #endif
+ #ifdef i386Architecture
+ #ifndef ServerCCOptions
+ #define ServerCCOptions -Xt
+ #endif
  #endif
  #endif	
  #endif	
diff -c xc/config/cf/sunLib.tmpl:1.1.1.1 xc/config/cf/sunLib.tmpl:3.1
*** xc/config/cf/sunLib.tmpl:1.1.1.1	Mon Jan 30 17:29:28 1995
--- xc/config/cf/sunLib.tmpl	Mon Jan 30 17:29:28 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: sunLib.tmpl,v 1.36 94/04/08 19:13:50 rws Exp $
+ XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.1 1995/01/08 08:13:57 dawes Exp $
  
  /*
   * SunOS shared library template
***************
*** 38,44 ****
--- 39,47 ----
  #else				/* else it's Solaris */
  
  #if ThreadedX
+ #ifndef i386Architecture
  #define SharedX11Reqs -lthread
+ #endif
  #endif
  #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
  #define FixupLibReferences() /**/
diff -c /dev/null xc/config/cf/sv3Lib.rules:3.0
*** /dev/null	Mon Jan 30 17:29:29 1995
--- xc/config/cf/sv3Lib.rules	Mon Jan 30 17:29:30 1995
***************
*** 0 ****
--- 1,228 ----
+ XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.0 1994/05/21 23:39:31 dawes Exp $
+ /*
+  * SVR3 shared library rules
+  * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
+  * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
+  * Conception derived partially from work of Thomas Roell
+  */
+ 
+ #ifndef HasSharedLibraries
+ #define HasSharedLibraries NO		/* JUST FOR NOW */
+ #endif
+ #ifndef ForceNormalLib
+ #define ForceNormalLib YES
+ #endif
+ 
+ #ifndef SharedLibSM
+ #define SharedLibSM HasSharedLibraries
+ #endif
+ #ifndef SharedLibXau
+ #define SharedLibXau HasSharedLibraries
+ #endif
+ #ifndef SharedLibXdmcp
+ #define SharedLibXdmcp HasSharedLibraries
+ #endif
+ #ifndef SharedLibXi
+ #define SharedLibXi HasSharedLibraries
+ #endif
+ #ifndef SharedLibXie
+ #define SharedLibXie HasSharedLibraries
+ #endif
+ #ifndef SharedLibXtst
+ #define SharedLibXtst HasSharedLibraries
+ #endif
+ #ifndef SharedLibPhigs
+ #define SharedLibPhigs HasSharedLibraries
+ #endif
+ #ifndef SharedLibICE
+ #define SharedLibICE HasSharedLibraries
+ #endif
+ #ifndef SharedLibFS
+ #define SharedLibFS HasSharedLibraries
+ #endif
+ #ifndef SharedLibX11
+ #define SharedLibX11 HasSharedLibraries
+ #endif
+ #ifndef SharedOldX
+ #define SharedOldX NO		/* it's obsolete */
+ #endif
+ #ifndef SharedLibXt
+ #define SharedLibXt HasSharedLibraries
+ #endif
+ #ifndef SharedLibXaw
+ #define SharedLibXaw HasSharedLibraries
+ #endif
+ #ifndef SharedLibXmu
+ #define SharedLibXmu HasSharedLibraries
+ #endif
+ #ifndef SharedLibXext
+ #define SharedLibXext HasSharedLibraries
+ #endif
+ #ifndef SharedLibPex
+ #define SharedLibPex NO
+ #endif
+ 
+ #ifndef SharedDataSeparation
+ #define SharedDataSeparation NO
+ #endif
+ #ifndef SharedCodeDef
+ #define SharedCodeDef /**/
+ #endif
+ #ifndef SharedLibraryDef
+ #define SharedLibraryDef -DSVR3SHLIB
+ #endif
+ #ifndef ShLibIncludeFile
+ #define ShLibIncludeFile <sv3Lib.tmpl>
+ #endif
+ #ifndef SharedLibraryLoadFlags
+ #define SharedLibraryLoadFlags -q
+ #endif
+ 
+ #ifndef PositionIndependentCFlags
+ # if HasGcc2
+ #  define PositionIndependentCFlags -msvr3-shlib  
+ # else
+ #  define PositionIndependentCFlags /**/
+ # endif
+ #endif
+ 
+ #ifndef PositionIndependentCplusplusFlags
+ # if HasGcc2
+ #  define PositionIndependentCplusplusFlags -msvr3-shlib  
+ # else
+ #  define PositionIndependentCplusplusFlags /**/
+ # endif
+ #endif
+ 
+ #if 0
+ /*
+  * LibCleanDir - helper for cleaning library object subdirectories
+  */
+ #ifndef LibCleanDir
+ #define LibCleanDir(dir) -@if [ -d dir ]; then \                           @@\
+                 (set -x; cd dir; $(RM) *.o *.sd); else exit 0; fi
+ #endif
+ 
+ /*
+  * SharedLibObjCompile - compile fragment for shared objects
+  */
+ #ifndef SharedLibObjCompile
+ #define SharedLibObjCompile(options) $(RM) shared/$@ 	                   @@\
+ 	cat import.h $*.c >_$*.c                                           @@\
+         $(CC) -c $(ANSICCOPTIONS) $(CCOPTIONS) $(ALLDEFINES) options \     @@\
+ $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) _$*.c              @@\
+ 	$(MV) _$*.o shared/$@                                              @@\
+ 	$(RM) _$*.c
+ #endif
+ 
+ /*
+  * NormalSharedLibObjCompile - compile fragment for shared object when
+  * a normal library is not being built
+  */
+ #ifndef NormalSharedLibObjCompile
+ #define NormalSharedLibObjCompile(options) $(RM) $@                        @@\
+ 	cat import.h $*.c >_$*.c                                           @@\
+         $(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) _$*.c @@\
+ 	$(MV) _$*.o $@                                                     @@\
+ 	$(RM) _$*.c
+ #endif
+ 
+ 
+ #ifndef LibraryObjectRule
+ #define LibraryObjectRule()                                             @@\
+ all::                                                                   @@\
+         _DebuggedLibMkdir()                                             @@\
+         _ProfiledLibMkdir()                                             @@\
+         _SharedLibMkdir()                                               @@\
+                                                                         @@\
+ includes::                                                              @@\
+         _DebuggedLibMkdir()                                             @@\
+         _ProfiledLibMkdir()                                             @@\
+         _SharedLibMkdir()                                               @@\
+                                                                         @@\
+ .c.o:                                                                   @@\
+         _DebuggedObjCompile($(_NOOP_))                                  @@\
+         _ProfiledObjCompile($(_NOOP_))                                  @@\
+         _SharedObjCompile($(_NOOP_))                                    @@\
+         _NormalObjCompile($(_NOOP_))                                    @@\
+                                                                         @@\
+ .SUFFIXES: .sd                                                          @@\
+ .c.sd:                                                                  @@\
+         _SharedDatCompile(-DSVR3SHDAT)                                  @@\
+                                                                         @@\
+ clean::                                                                 @@\
+         _DebuggedCleanDir()                                             @@\
+         _ProfiledCleanDir()                                             @@\
+         _SharedCleanDir()                                               @@\
+ 
+ #endif /* LibraryObjectRule */
+ 
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
+  */
+ #ifndef InstallSharedLibrary
+ #if StripInstalledPrograms
+ #define	InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: Concat(lib,libname.rev) 					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
+ 	MakeDir($(DESTDIR)$(LIBDIR)/shlib)                              @@\
+         $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \         @@\
+ 	$(DESTDIR)$(LIBDIR)/shlib                                       @@\
+ 	strip Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev)         @@\
+ 	mcs -d Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev)
+ #else
+ #define	InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: Concat(lib,libname.rev) 					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
+ 	MakeDir($(DESTDIR)$(LIBDIR)/shlib)                              @@\
+         $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \         @@\
+ 	$(DESTDIR)$(LIBDIR)/shlib
+ #endif
+ 
+ #endif /* InstallSharedLibrary */
+ 
+ /*
+  * InstallSharedLibraryData - generate rules to install the shared library data
+  */
+ #ifndef InstallSharedLibraryData
+ #define	InstallSharedLibraryData(libname,rev,dest)
+ #endif /* InstallSharedLibraryData */
+ 
+ 
+ /*
+  * SharedLibraryTarget - generate rules to create a shared library;
+  * build it into a different name so that we do not hose people by having
+  * the library gone for long periods.
+  */
+ #ifndef SharedLibraryTarget
+ #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+ AllTarget(Concat(lib,libname.rev))					@@\
+ 									@@\
+ Concat(lib,libname.rev):  solist					@@\
+ 	$(RM) $@ Concat3(lib,libname,_s.a)				@@\
+         $(CPP) -DDOWN=down ConnectionFlags ShlibDefines Concat(lib,libname.def) | \ @@\
+         sed -e '/^#  *[0-9][0-9]*  *.*$$/d; /^$$/d' >spec.cpp           @@\
+         sed -e '1,/#libraries/d; /#externals/,$$d' spec.cpp | \         @@\
+         nawk '{ system("ar x " $$1 " " $$2 )}'                          @@\
+         echo "#target " Concat($(LIBDIR)/shlib/lib,libname.rev) >spec   @@\
+         sed -e '/#libraries/,$$d' spec.cpp >>spec                             @@\
+         mkshlib -s spec -t $@ -h Concat3(lib,libname,_s.a) $(SHLIBLDFLAGS)    @@\
+         ar rulv Concat3(lib,libname,_s.a) `sed -e '1,/#externals/d' spec.cpp` @@\
+         $(RM) spec.cpp spec                                             @@\
+ 									@@\
+ clean::									@@\
+ 	$(RM) Concat(lib,libname.rev) Concat3(lib,libname,_s.a)
+ 
+ #endif /* SharedLibraryTarget */
+ 
+ /*
+  * SharedLibraryDataTarget - generate rules to create shlib data file;
+  */
+ #ifndef SharedLibraryDataTarget
+ #define SharedLibraryDataTarget(libname,rev,salist)
+ #endif /* SharedLibraryTarget */
+ 
+ #endif
diff -c /dev/null xc/config/cf/sv3Lib.tmpl:3.0
*** /dev/null	Mon Jan 30 17:29:30 1995
--- xc/config/cf/sv3Lib.tmpl	Mon Jan 30 17:29:30 1995
***************
*** 0 ****
--- 1,73 ----
+ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.0 1994/05/21 23:39:32 dawes Exp $
+ /*
+  * SVR3 shared library template
+  * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
+  * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
+  * Conception derived partially from work of Thomas Roell
+  */
+ 
+ #ifndef SharedXlibRev
+ #define SharedXlibRev 6.0.0
+ #endif
+ #ifndef SharedOldXRev
+ #define SharedOldXRev 6.0
+ #endif
+ #ifndef SharedXtRev
+ #define SharedXtRev 6.0
+ #endif
+ #ifndef SharedXawRev
+ #define SharedXawRev 6.0
+ #endif
+ #ifndef SharedXmuRev
+ #define SharedXmuRev 6.0
+ #endif
+ #ifndef SharedXextRev
+ #define SharedXextRev 6.0
+ #endif
+ #ifndef SharedXinputRev
+ #define SharedXinputRev 6.0
+ #endif
+ #ifndef SharedPexRev
+ #define SharedPexRev 1.0
+ #endif
+ 
+      SHLIBLDFLAGS = SharedLibraryLoadFlags
+          PICFLAGS = PositionIndependentCFlags
+ 
+ /*
+  * and now a little bit of magic for using imake without source tree; if we
+  * are using shared libraries, we really do not need to depend on anything
+  */
+ #if SharedLibXext
+   DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a)
+      EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB))
+ #endif
+ #if SharedLibX
+           DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a)
+              XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a)
+ #endif
+ #if SharedLibXmu
+         DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a)
+            XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB))
+ #endif
+ #if SharedOldLibX
+        DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a)
+           OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB))
+ #endif
+ #if SharedLibXt
+       DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a)
+          XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB))
+ #endif
+ #if SharedLibXaw
+         DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a)
+            XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB))
+ #endif
+ #if SharedLibXinput
+          DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a)
+             XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB))
+ #endif
+ #if SharedLibPhigs
+       DEPPHIGSLIB = _UseCat($(USRLIBDIR),$(PHIGSLIBSRC),/libphigs_s.a)
+          PHIGSLIB = LoaderLibPrefix _Use(-lphigs_s,$(DEPPHIGSLIB))
+ #endif
+ 
diff -c xc/config/cf/sv4Lib.rules:1.1.1.1 xc/config/cf/sv4Lib.rules:3.0
*** xc/config/cf/sv4Lib.rules:1.1.1.1	Mon Jan 30 17:29:31 1995
--- xc/config/cf/sv4Lib.rules	Mon Jan 30 17:29:31 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: sv4Lib.rules,v 1.14 94/04/09 12:00:10 rws Exp $
+ XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.0 1994/06/05 13:39:10 dawes Exp $
  
  /*
   * SVR4 shared library rules
***************
*** 41,53 ****
   * InstallSharedLibrary - generate rules to install the shared library.
   */
  #ifndef InstallSharedLibrary
  #define	InstallSharedLibrary(libname,rev,dest)				@@\
  install:: Concat(lib,libname.so.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
  	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
! 
  #endif /* InstallSharedLibrary */
  
  /*
--- 42,63 ----
   * InstallSharedLibrary - generate rules to install the shared library.
   */
  #ifndef InstallSharedLibrary
+ #if StripInstalledPrograms
  #define	InstallSharedLibrary(libname,rev,dest)				@@\
  install:: Concat(lib,libname.so.rev) 					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+ 	mcs -d Concat($(DESTDIR)dest/lib,libname.so.rev)		@@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
  	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
! #else
! #define	InstallSharedLibrary(libname,rev,dest)				@@\
! install:: Concat(lib,libname.so.rev) 					@@\
! 	MakeDir($(DESTDIR)dest)						@@\
! 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
! 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
! 	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
! #endif
  #endif /* InstallSharedLibrary */
  
  /*
diff -c /dev/null xc/config/cf/svr3.cf:3.6
*** /dev/null	Mon Jan 30 17:29:31 1995
--- xc/config/cf/svr3.cf	Mon Jan 30 17:29:32 1995
***************
*** 0 ****
--- 1,323 ----
+ XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.6 1994/12/11 10:48:18 dawes Exp $
+ 
+ #ifndef HasGcc
+ #define HasGcc      YES
+ #endif
+ #ifndef HasGcc2
+ #define HasGcc2     YES
+ #endif
+ #ifndef GccUsesGas
+ #define GccUsesGas  NO
+ #endif
+ #ifndef UseGas
+ #define UseGas      NO
+ #endif
+ #ifndef GnuCpp
+ #define GnuCpp      NO
+ #endif
+ 
+ #ifndef Gcc2MOption
+ # if HasGcc2
+ #  define Gcc2MOption -m486
+ # else
+ #  define Gcc2MOption /* */
+ # endif
+ #endif
+ 
+ #ifndef HasShadowPasswd
+ # define HasShadowPasswd	YES
+ #endif
+ 
+ #ifndef HasLibCrypt
+ # define HasLibCrypt		NO
+ #endif
+ 
+ #ifndef HasSVR3mmapDrv
+ # define HasSVR3mmapDrv		NO
+ #endif
+ 
+ #if HasSVR3mmapDrv
+ # define SVR3mmapFlags		-DHAS_SVR3_MMAPDRV
+ #else
+ # define SVR3mmapFlags 		/**/
+ #endif
+ 
+ #ifndef HasSockets
+ # define HasSockets		YES
+ #endif
+ 
+ #ifndef XmanSearchPath
+ #define XmanSearchPath		/usr/man
+ #endif
+ 
+ /*
+  *	Most SVR3 do not have symbolic links, only some of the newer ones
+  */
+ #ifndef HasSymLinks
+ # define HasSymLinks NO
+ #endif
+ 
+ #ifndef StripInstalledPrograms
+ # define StripInstalledPrograms	YES
+ #endif
+ 
+ #ifndef MotifBC
+ # define MotifBC	       	YES
+ #endif
+ 
+ #ifndef CompressAllFonts
+ # define CompressAllFonts	YES
+ #endif
+ 
+ /*
+  * A default OS name
+  */
+ #ifndef OSName
+ #ifdef i386Architecture
+ #define	OSName	UNIX System V/386 Release 3
+ #else
+ #define	OSName	UNIX System V Release 3
+ #endif
+ #endif
+ #ifndef OSVendor
+ #define OSVendor /**/
+ #endif
+ 
+ /*
+  * The default version will be 3.0.0 which should be
+  * the least common denominator of all SVR3
+  */
+ 
+ #ifndef OSMajorVersion
+ #define	OSMajorVersion	3
+ #endif
+ #ifndef OSMinorVersion
+ #define	OSMinorVersion	0
+ #endif
+ #ifndef OSTeenyVersion
+ #define	OSTeenyVersion	0
+ #endif
+ #ifndef BootstrapCFlags
+ #ifdef SYSV386
+ #define BootstrapCFlags         -DSYSV -DSYSV386
+ #else
+ #define BootstrapCFlags         -DSYSV
+ #endif
+ #endif
+ 
+ /* Some stuff that all SYSV's should have */
+ 
+ #define SystemV	YES
+ 
+ #ifndef NeedBerklib
+ #define NeedBerklib	YES
+ #endif
+ #ifndef HasPoll
+ #define HasPoll		YES
+ #endif
+ #ifndef SVR3Architecture
+ #define SVR3Architecture
+ #endif
+ #ifndef PatheticCpp
+ #define PatheticCpp	YES
+ #endif
+ 
+ #ifndef StandardDefines
+ #ifdef i386Architecture
+ #define StandardDefines		-DSYSV OSDefines -Di386
+ #else
+ #define StandardDefines		-DSYSV OSDefines
+ #endif
+ #endif
+ 
+ #ifndef ServerOSDefines
+ # ifdef i386Architecture
+ #  define ServerOSDefines -DDDXTIME XFree86ServerOSDefines -DPART_NET
+ # else
+ #  define ServerOSDefines -DDDXTIME
+ # endif
+ #endif
+ 
+ #ifndef XawI18nDefines
+ # define XawI18nDefines          -DUSE_XWCHAR_STRING
+ #endif
+ 
+ #ifndef DefaultCDebugFlags
+ # if HasGcc2
+ #  define DefaultCDebugFlags -O2
+ # else
+ #  define DefaultCDebugFlags -O
+ # endif
+ #endif
+ 
+ #ifndef LdCombineFlags
+ #define LdCombineFlags	-r
+ #endif
+ 
+ #if HasGcc
+ # if HasGcc2
+ #  define DefaultCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return \
+ 			   -fwritable-strings
+ #  define LibraryCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return
+ #  define OptimizedCDebugFlags -O2
+ # else
+ #  define DefaultCCOptions -DNO_ASM -fpcc-struct-return -fwritable-strings
+ #  define LibraryCCOptions -DNO_ASM -fpcc-struct-return
+ #  define OptimizedCDebugFlags -O -fstrength-reduce
+ # endif
+ # define ShlibDefines -D__GNUC__ $(XDMAUTHDEFS)
+ #else
+ # define ShlibDefines $(XDMAUTHDEFS)
+ #endif
+ 
+ #ifndef Malloc0ReturnsNull
+ #define Malloc0ReturnsNull	YES
+ #endif
+ 
+ #ifndef SocketLibraries
+ # define SocketLibraries /**/
+ #endif
+ #ifndef LocalLibraries
+ # define LocalLibraries /**/
+ #endif
+ #ifndef ExtraLibraries
+ # if HasSockets
+ #  define ExtraLibraries SocketLibraries LocalLibraries
+ # else
+ #  define ExtraLibraries LocalLibraries
+ # endif
+ #endif
+ 
+ #if RemoveDSDENroffMacros
+ # define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d' 
+ #else
+ # define RemoveDSDENroffMacrosCmd cat
+ #endif
+ 
+ #ifndef ConnectionFlags
+ # define ConnectionFlags	-DUNIXCONN -DLOCALCONN -DTCPCONN
+ #endif
+ 
+ #ifndef FormattedManPages
+ # define FormattedManPages	YES
+ #endif
+ 
+ #ifndef ManSuffix
+ # define ManSuffix               1x
+ # define ManDir			$(MANSOURCEPATH)1
+ #endif
+ #ifndef LibManSuffix
+ # define LibManSuffix            3x
+ # define LibmanDir		$(MANSOURCEPATH)3
+ #endif
+ #ifndef FileManSuffix
+ # define FileManSuffix           4
+ #endif
+ 
+ /*
+  * Compress manual pages, default on ISC and SCO
+  */
+ #ifndef CompressManPages
+ # define CompressManPages        YES
+ #endif
+ 
+ /*
+  * The .DS and .DE macros used in some manual pages are obsolete
+  * in the often used ISC's Textprocessing Workbench 2.1.0 and break it,
+  * so it's better to remove these previously
+  */
+ #ifndef RemoveDSDENroffMacros
+ # define RemoveDSDENroffMacros   NO
+ #endif
+ 
+ #if RemoveDSDENroffMacros
+ # define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d' 
+ #else
+ # define RemoveDSDENroffMacrosCmd cat
+ #endif
+ 
+ #ifndef CompressManCmd
+ # define CompressManCmd @true
+ #endif
+ 
+      RMDSDEMACCMD = RemoveDSDENroffMacrosCmd
+    COMPRESSMANCMD = CompressManCmd
+ 
+ #if FormattedManPages
+ 
+ #ifndef InstallManPageLong
+ #define InstallManPageLong(file,destdir,dest)                           @@\
+ install.man:: file.man                                                  @@\
+         MakeDir($(DESTDIR)destdir)                                      @@\
+         $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*                      @@\
+         $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man     @@\
+         $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
+         -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)          @@\
+         $(RM) /tmp/file.man
+ #endif
+ 
+ #ifndef InstallGenManPageLong
+ #define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
+ install.man:: file.man                                                  @@\
+         MakeDir($(DESTDIR)destdir)                                      @@\
+         $(RM) $(DESTDIR)destdir/dest.suffix*                            @@\
+         $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man     @@\
+         $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\
+         -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix                @@\
+         $(RM) /tmp/file.man
+ #endif
+ 
+ #ifndef InstallMultipleMan
+ #define InstallMultipleMan(list,dest)                                   @@\
+ install.man:: list                                                      @@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+         @case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
+         for i in list; do \                                             @@\
+                 (set -x; \                                              @@\
+                 MNAME=`echo $$i | cut -f1 -d.`; \			@@\
+                 $(RM) $(DESTDIR)dest/$${MNAME}*; \                      @@\
+                 $(RMDSDEMACCMD) $$i | neqn | nroff -man >/tmp/$$i; \    @@\
+                 $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \      @@\
+                 $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \  @@\
+                 $(RM) /tmp/$$i); \                                      @@\
+         done
+ #endif
+ 
+ /*
+  * InstallManPageAliases - generate rules to install manual page aliases.
+  * (Make hard links on SVR3.)
+  */
+ #ifndef InstallManPageAliases
+ #define InstallManPageAliases(file,destdir,aliases)                     @@\
+ install.man::                                                           @@\
+         @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \     @@\
+         for i in aliases; do (set -x; \                                 @@\
+         $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
+         (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
+         $$i.$${SUFFIX})); \                                             @@\
+         done)
+ #endif
+ 
+ #ifndef InstallGenManPageAliases
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+ 	InstallManPageAliases(file,destdir,aliases)
+ #endif
+ 
+ #endif /* FormattedManPages */
+ 
+ /* If you have trouble with make bombing out in Xlib, try uncommenting this. */
+ /* You will not get dependencies as a result, but better than nothing. */
+ #ifndef MakeHashTableBug
+ #define MakeHashTableBug        NO
+ #endif
+ 
+ #if MakeHashTableBug
+ #define DependTarget3(srcs1,srcs2,srcs3)
+ #endif
+ 
+ #include <sv3Lib.rules>
+ 
+ #ifdef i386Architecture
+ #include <xfree86.cf>
+ #endif
+ 
diff -c xc/config/cf/svr4.cf:1.1.1.2 xc/config/cf/svr4.cf:3.8
*** xc/config/cf/svr4.cf:1.1.1.2	Mon Jan 30 17:29:32 1995
--- xc/config/cf/svr4.cf	Mon Jan 30 17:29:32 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: svr4.cf,v 1.11 95/01/25 16:32:39 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.8 1995/01/28 15:40:33 dawes Exp $
  /*
   * A default OS name
   */
***************
*** 84,105 ****
  #endif
  #endif
  
  #ifdef i386Architecture
  #ifndef StandardDefines
  #define StandardDefines		-DSVR4 -Di386
  #endif
  #ifndef DefaultCCOptions
! #if HasGcc2
! #if !defined(SunArchitecture)
! #define DefaultCCOptions -ansi
! #endif
! #else
  #define DefaultCCOptions -Xc -Dasm=__asm
  #endif
  #endif
  #ifndef DefaultCDebugFlags
! #if HasGcc2
! #define DefaultCDebugFlags -O2
  #else
  #define DefaultCDebugFlags -O
  #endif
--- 85,109 ----
  #endif
  #endif
  
+ #ifndef HasGcc2
+ #define HasGcc2 NO
+ #endif
+ #ifndef HasGcc
+ #define HasGcc HasGcc2
+ #endif
+ 
  #ifdef i386Architecture
  #ifndef StandardDefines
  #define StandardDefines		-DSVR4 -Di386
  #endif
  #ifndef DefaultCCOptions
! #if !HasGcc
  #define DefaultCCOptions -Xc -Dasm=__asm
  #endif
  #endif
  #ifndef DefaultCDebugFlags
! #if HasGcc
! #define DefaultCDebugFlags -O2 -m486
  #else
  #define DefaultCDebugFlags -O
  #endif
diff -c xc/config/cf/usl.cf:1.1.1.2 xc/config/cf/usl.cf:3.5
*** xc/config/cf/usl.cf:1.1.1.2	Mon Jan 30 17:29:33 1995
--- xc/config/cf/usl.cf	Mon Jan 30 17:29:33 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM platform:  $XConsortium: usl.cf,v 1.35 95/01/12 15:37:24 kaleb Exp $
+ XCOMM platform:  $XFree86: xc/config/cf/usl.cf,v 3.5 1995/01/28 15:40:34 dawes Exp $
  
  #define OSName			UNIX System V/386 Release 4.2 Version 1.1.1
  XCOMM operating system:  OSName
diff -c xc/config/cf/xf86.rules:1.1.1.2 xc/config/cf/xf86.rules:3.7
*** xc/config/cf/xf86.rules:1.1.1.2	Mon Jan 30 17:29:34 1995
--- xc/config/cf/xf86.rules	Mon Jan 30 17:29:34 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: xf86.rules,v 1.7 95/01/25 16:34:39 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.7 1995/01/28 15:40:36 dawes Exp $
  
  /*
   * These rules are needed to build the Xfree86 X Servers
diff -c /dev/null xc/config/cf/xf86.tmpl:3.0
*** /dev/null	Mon Jan 30 17:29:34 1995
--- xc/config/cf/xf86.tmpl	Mon Jan 30 17:29:34 1995
***************
*** 0 ****
--- 1,13 ----
+ XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.0 1994/12/25 12:12:25 dawes Exp $
+ 
+ #if XF86LinkKit
+    IMAKE_DEFINES = -DXF86LinkKit=1
+        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
+ 		   $(IMAKE_DEFINES)
+ 
+ 
+ #undef ImakeSubCmdHelper
+ #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$$imaketop \
+ 			  -I$(IRULESRC) $(IMAKE_DEFINES)
+ 
+ #endif
diff -c /dev/null xc/config/cf/xf86site.def:3.35
*** /dev/null	Mon Jan 30 17:29:34 1995
--- xc/config/cf/xf86site.def	Mon Jan 30 17:29:34 1995
***************
*** 0 ****
--- 1,313 ----
+ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.35 1995/01/25 11:17:10 dawes Exp $
+ /******************************************************************************/
+ /*
+  * This file is to provide a quick method for most people to change the
+  * behaviour of their XFree86 installation without having to fully
+  * understand the workings of site.def and all the various '.cf' files.
+  *
+  * These are the most common settings you would choose for compiling and
+  * installing XFree86 on the systems supported by it.
+  */
+ /******************************************************************************/
+ 
+ /*
+  * If using GCC 2.x on a system where it isn't the default, uncomment
+  * the following
+  *
+ #define HasGcc2		YES
+ #define HasGcc		YES
+  */
+ 
+ /*
+  * If using GCC 2.x with C++ on a system where it isn't the default, uncomment
+  * the following.
+  *
+ #define HasGcc2ForCplusplus		YES
+  */
+ 
+ /*
+  * Which servers do you wish to build, you can save a lot of disk space
+  * by only compiling the server you will be using.  It will also save you
+  * considerable compile time.
+  */
+ 
+ #define XF86SVGAServer          YES
+ #define XF86VGA16Server         YES
+ #define XF86VGA16DualServer	YES
+ #define XF86MonoServer          YES
+ #define XF86MonoDualServer	YES
+ #define XF86S3Server            YES
+ #define XF86I8514Server         YES
+ #define XF86Mach8Server         YES
+ #define XF86Mach32Server        YES
+ #define XF86Mach64Server        YES
+ #define XF86P9000Server		YES
+ #define XF86AGXServer		YES
+ #define XF86W32Server		YES
+ 
+ #define XnestServer             YES
+ 
+ /*
+  * Set the default server (ie the one that gets the sym-link to "X")
+  *
+ #define ServerToInstall		XF86_S3
+  */
+ 
+ 
+ /*
+  * To build Xvfb, uncomment this.
+  *
+ #define XVirtualFramebufferServer	YES
+ */
+ 
+ 
+ /*
+  * Server configuration parameters.  The defaults are shown here:
+  */
+ 
+ /*
+  * SVGA server:
+  *
+ #define XF86SvgaDrivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
+ 				ncr77c22 compaq oak mx al2101 ali cl64xx \
+ 				video7 chips generic
+  */
+ 
+ /*
+  * VGA16 server:
+  *
+ #define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx generic
+  */
+ 
+ /*
+  * VGA2 driver in Mono server:
+  *
+ #define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
+ 				ncr77c22 compaq oak cl64xx generic
+  */
+ 
+ /*
+  * Mono driver in Mono or VGA16 server:
+  *
+ #define XF86MonoDrivers		hgc1280 sigma apollo hercules
+  */
+ 
+ /*
+  * ET4000/W32 server:
+  *
+ #define XF86W32Drivers		et4000w32
+  */
+ 
+ /*
+  * BSD Console driver support (for FreeBSD and NetBSD).
+  * By default support is included for pccons, syscons and pcvt.
+  * To change the list of supported drivers, set the following parameter.
+  * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT,
+  * -DCODRV_SUPPORT.  The following example includes support for syscons and
+  * pcvt only.
+  *
+ #define XFree86ConsoleDefines	-DSYSCONS_SUPPORT -DPCVT_SUPPORT
+  */
+ 
+ /*
+  * To build with LBX, uncomment the BuildLBX line below.  Note, after doing
+  * this, you should do the following to build an X server with lbx:
+  *
+  *   cd programs/Xserver
+  *   make clean
+  *   make Makefile
+  *   make Makefiles
+  *   make includes
+  *   make depend
+  *   make
+  *
+  * To build the lbxproxy, do:
+  *
+  *   cd workInProgress
+  *   make Makefile
+  *   make SUBDIRS=lbx Makefiles
+  *   cd lbx
+  *   make includes
+  *   make depend
+  *   make
+  *
+  * For information about using LBX, refer to the README in workInProgress/lbx/.
+  *
+ #define BuildLBX YES
+  */
+ 
+ /*
+  * To build the required bits to make LBX selectable via the LinkKit
+  * uncomment this.  Note:  BuildLBX should *not* be set when doing this.
+  *
+  */
+ #define BuildLBXCompatible	YES
+ 
+ /*
+  * Build xterm with Internationalisation support by default.
+  * To disable this, uncomment the following.
+  *
+ #define XtermWithI18N	NO 
+  */
+ 
+ /*
+  * Do you want to install the default system config files, this will overwrite
+  * and files that you may be currently using.  This would only be required
+  * on a first time build.
+  *
+  */
+ #define InstallXdmConfig	YES
+ #define InstallXinitConfig	YES
+ 
+ /*
+  * If you only run the X server under xdm the X servers don't need to be
+  * installed SetUID, and you may comment out the lines below.  If you run
+  * the servers by hand (with xinit or startx), then they do need to be
+  * installed SetUID on most OSs.
+  * Consult your system administrator before making the X server setuid.
+  *
+  */
+ #if !defined(i386MachArchitecture)
+ #define InstallXserverSetUID	YES
+ #endif
+ 
+ /*
+  * Do you want to include support for the FontServer
+  *
+  */
+ #define BuildFontServer		YES
+ #define InstallFSConfig		YES	/* install sample fs config */
+ 
+ /*
+  * Do you want to Build Fonts (Usually you only want to build and install
+  * fonts once, if this is a first time install you will want to build the
+  * fonts)
+  *
+ #define BuildFonts		NO
+  */
+ 
+ /*
+  * To build only the servers with a cut-down source tree, uncomment
+  * this.
+  *
+ #define BuildServersOnly      YES
+  */
+ 
+ /*
+  * To disable the ScreenSaver Extension, comment this line.
+  *
+  */
+ #define BuildScreenSaverExt	YES
+ 
+ /*
+  * If you don't want to build PEX, uncomment this.
+  *
+ #define BuildPexExt		NO
+  */
+ 
+ /*
+  * If you don't want to build XIE, uncomment this.
+  *
+ #define BuildXIE		NO
+  */
+ 
+ /*
+  * If you want to build only the DIS (Document Imaging Subset of XIE)
+  * uncomment this line.  This option is only relevant when XIE is built.
+  *
+ #define BuildDIS		YES
+  */
+ 
+ /*
+  * If you want to build Fresco, uncomment this line.  Note: a suitable
+  * C++ compiler is required.  If using GCC, version 2.6.0 or later is
+  * required.  Make sure HasGcc2ForCplusplus is set to YES when using
+  * GCC to build Fresco (see above).
+  *
+ #define BuildFresco		YES
+  */
+ 
+ /*
+  * If you are running Solaris x86, and have the aperture driver installed,
+  * uncomment this.
+  *
+ #define HasSolx86ApertureDriver	YES
+  */
+ 
+ /*
+  * If you are running NetBSD 0.9C or later, and have the aperture driver
+  * installed, uncomment this.
+  *
+ #define HasNetBSDApertureDriver	YES
+  */
+ 
+ /*
+  * If you are running SVR3 and have the mmap driver installed (for linear
+  * framebuffer access) uncomment this.
+  *
+ #define HasSVR3mmapDrv	YES
+  */
+ 
+ /*
+  * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
+  *
+ #define HasXdmAuth		YES
+  */
+ 
+ /*
+  * To forceably build static libraries in addition to shared libraries,
+  * uncomment this.
+  *
+ #define ForceNormalLib		YES
+  */
+ 
+ /*
+  * To use ELF format shared libraries for Linux, uncomment this.
+  * Note: gcc-2.6.0-941008 and gas-941008 (or later) is required for this.
+  * Check linux.cf if you have problems regarding the location of elf-aware
+  * gcc and gas binaries.
+  *
+ #define UseElfFormat		YES
+  */
+ 
+ /*
+  * If you have trouble with make bombing out in Xlib, try uncommenting this.
+  * You will not get dependencies as a result, but better than nothing.
+  *
+ #define MakeHashTableBug        YES
+  */
+ 
+ /*
+  * If you do not want your man pages compress under SVR3 systems that
+  * support it, uncomment this.
+  *
+ #define CompressManPages        NO
+  */
+ 
+ /*
+  * LinuxDoc stuff.  Uncomment those of these you want.  Check in
+  * lnxdoc.tmpl for other things you might need to define/change here.
+  *
+ #define HasLinuxDoc		YES
+ #define HasLatex		YES
+ #define HasDvips		YES
+ #define BuildLinuxDocHtml	YES
+ #define BuildAllDocs		YES
+  */
+ 
+ /*
+  * To install Japanese versions of the documentation uncomment this.
+  * Note: The Japanese documentation consists of a subset of the
+  * XFree86 3.1 docs.
+  *
+ #define InstallJapaneseDocs	YES
+  */
+ 
+ /*
+  * Define to build only those parts of contrib supported by XFree86
+  * NOTE: This should not be defined at all if you want to build all
+  * of contrib.  Defining it to NO won't work.
+  *
+  */
+ #define XF86Contrib
+ 
diff -c xc/config/cf/xfree86.cf:1.1.1.2 xc/config/cf/xfree86.cf:3.48
*** xc/config/cf/xfree86.cf:1.1.1.2	Mon Jan 30 17:29:35 1995
--- xc/config/cf/xfree86.cf	Mon Jan 30 17:29:36 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: xfree86.cf,v 1.9 95/01/25 16:42:40 kaleb Exp $
+ XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.48 1995/01/28 15:40:38 dawes Exp $
  /*
   * This configuration file contains all of the configuration
   * information for the XFree86 based X Servers.
***************
*** 153,169 ****
--- 154,202 ----
  # define XF86W32Drivers		et4000w32
  #endif
  
+ /*
+  * PEX doesn't work for 1-bit and 4-bit servers
+  */
  #ifndef BuildPexExt
  #define BuildPexExt		XF86AccelServer || XF86SVGAServer
  #endif
  
+ /*
+  * XIE doesn't work for our 1-bit and 4-bit servers
+  */
  #ifndef BuildXIE
  #define BuildXIE		XF86AccelServer || XF86SVGAServer
  #endif
  
  /*
+  * Build the ExtraExtension lib even when not including the extra extensions
+  * in the servers
+  */
+ #ifndef BuildExtraExtensionLibrary
+ #define BuildExtraExtensionLibrary	YES
+ #endif
+ 
+ /*
+  * Turn Fresco off by default.  It requires gcc 2.6.0 or later, and this
+  * is unreliable in may ways on i386 platforms.
+  */
+ #ifndef BuildFresco
+ #define BuildFresco	NO
+ #endif
+ 
+ /*
+  * Build xterm with Internationalisation support by default.
+  */
+ #ifndef XtermWithI18N
+ #define XtermWithI18N	YES
+ #endif
+ 
+ /*
   * By default, build all of the fonts.
   */
+ /*
+  * These four don't do anything (yet)
+  */
  #ifndef Build75Dpi
  #define Build75Dpi	YES
  #endif
***************
*** 185,190 ****
--- 218,227 ----
  #define InstallXcmsTxt		YES
  #endif
  
+ #ifndef StripInstalledPrograms
+ #define StripInstalledPrograms	YES
+ #endif
+ 
  #ifndef HasLinuxDoc
  #define HasLinuxDoc		NO
  #endif
***************
*** 289,294 ****
--- 326,335 ----
  XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  
+ /*
+  * Installed location of XFree86 documentation
+  */
+ 
          XFREE86DOCDIR = $(LIBDIR)/doc
        XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
      XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
***************
*** 302,307 ****
--- 343,352 ----
  #define AsmDefines /**/
  #endif
  
+ #ifndef OtherIConfigFiles
+ #define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules
+ #endif
+ 
  #ifndef XFree86Version
  #define XFree86Version	3110
  #endif
***************
*** 318,323 ****
--- 363,371 ----
  #define UseRgbTxt	YES
  #endif
  
+ #ifndef ManSuffix
+ #define ManSuffix	1
+ #endif
  
  /*
   * GNU Compiler stuff
***************
*** 334,343 ****
  
  #if HasGcc
  #ifndef DefaultCCOptions
! #if defined(SunArchitecture) && defined(i386Architecture)
! #define DefaultCCOptions -DNO_ASM
  #else
! #define DefaultCCOptions -ansi  -DNO_ASM
  #endif
  #endif
  #endif
--- 382,396 ----
  
  #if HasGcc
  #ifndef DefaultCCOptions
! #if UseInstalled
! #define DefaultCCOptions -ansi
  #else
! #define DefaultCCOptions -ansi -pedantic
! #endif
! #endif
! #if UseInstalled
! #ifndef UseGccMakeDepend
! #define UseGccMakeDepend YES
  #endif
  #endif
  #endif
diff -c xc/config/imake/Imakefile:1.1.1.1 xc/config/imake/Imakefile:3.1
*** xc/config/imake/Imakefile:1.1.1.1	Mon Jan 30 17:29:37 1995
--- xc/config/imake/Imakefile	Mon Jan 30 17:29:37 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.6 94/03/29 16:21:51 matt Exp $
+ XCOMM $XFree86: xc/config/imake/Imakefile,v 3.1 1994/10/20 06:00:34 dawes Exp $
  
  DEPLIBS = 
  
***************
*** 7,16 ****
  CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
  DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
  
! #if defined(MacIIArchitecture) || defined(SequentArchitecture)
  XBSDLIB = /**/
  #endif
  
  #undef ImakeDependency
  #define ImakeDependency(dummy) @@\
  Makefile::  ProgramTargetName(imake)
--- 8,18 ----
  CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
  DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
  
! #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
  XBSDLIB = /**/
  #endif
  
+ #if !defined(OS2Architecture)
  #undef ImakeDependency
  #define ImakeDependency(dummy) @@\
  Makefile::  ProgramTargetName(imake)
***************
*** 20,25 ****
--- 22,32 ----
  #else
  SimpleProgramTarget(imake)
  #endif
+ #endif
  
  clean::
  	RemoveFile(ProgramTargetName(ccimake))
+ 
+ #ifdef OS2Architecture
+ InstallNamedProg(imakesvc.cmd,imakesvc.cmd,$(BINDIR))
+ #endif
diff -c xc/config/imake/Makefile.ini:1.1.1.1 xc/config/imake/Makefile.ini:3.1
*** xc/config/imake/Makefile.ini:1.1.1.1	Mon Jan 30 17:29:38 1995
--- xc/config/imake/Makefile.ini	Mon Jan 30 17:29:38 1995
***************
*** 1,4 ****
--- 1,5 ----
  # $XConsortium: Makefile.ini,v 1.20 93/09/04 16:08:40 rws Exp $
+ # $XFree86: xc/config/imake/Makefile.ini,v 3.1 1994/12/17 09:33:40 dawes Exp $
  #
  #   WARNING    WARNING    WARNING    WARNING    WARNING    WARNING    WARNING
  #
***************
*** 24,30 ****
  	@echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS)"
  
  imake:: imake.o
! 	$(CC) -o imake imake.o
  
  imake.o: ccimake imake.c
  	$(CC) -c $(CFLAGS) `./ccimake` imake.c
--- 25,31 ----
  	@echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS)"
  
  imake:: imake.o
! 	$(CC) -o imake $(CFLAGS) imake.o
  
  imake.o: ccimake imake.c
  	$(CC) -c $(CFLAGS) `./ccimake` imake.c
***************
*** 54,56 ****
--- 55,64 ----
  clean.Win32:
  	if exist imake.exe del imake.exe
  	if exist imake.obj del imake.obj
+ 
+ clean.os2:
+ 	imakesvc 4 imake imake.exe imake.o /imake.exe
+ 
+ imake.os2: imake.c
+ 	$(CC) -DBSD43 $(CFLAGS) -o imake.exe imake.c
+ 	copy imake.exe \\ 
diff -c xc/config/imake/imake.c:1.1.1.3 xc/config/imake/imake.c:3.8
*** xc/config/imake/imake.c:1.1.1.3	Mon Jan 30 17:29:39 1995
--- xc/config/imake/imake.c	Mon Jan 30 17:29:39 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $ */
+ /* $XFree86: xc/config/imake/imake.c,v 3.8 1995/01/28 15:40:56 dawes Exp $ */
  
  /***************************************************************************
   *                                                                         *
***************
*** 130,135 ****
--- 131,139 ----
  #else
  #include <unistd.h>
  #endif
+ #ifdef ISC
+ #include <unistd.h>
+ #endif
  #if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
  #include <signal.h>
  #else
***************
*** 190,195 ****
--- 194,209 ----
  #endif
  #include "imakemdep.h"
  
+ #ifdef __minix_vmd
+ #define USE_FREOPEN		1
+ #endif
+ 
+ #if !(defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII))
+ #define USE_STRERROR		1
+ #endif
+ #ifdef __EMX__
+ #define USE_STRERROR		1
+ #endif
  
  #define	TRUE		1
  #define	FALSE		0
***************
*** 511,517 ****
  LogFatal(x0,x1)
  	char *x0, *x1;
  {
! #ifndef WIN32
  	extern char	*sys_errlist[];
  #endif
  	static boolean	entered = FALSE;
--- 525,531 ----
  LogFatal(x0,x1)
  	char *x0, *x1;
  {
! #if !defined(WIN32) && !defined(USE_STRERROR)
  	extern char	*sys_errlist[];
  #endif
  	static boolean	entered = FALSE;
***************
*** 522,528 ****
--- 536,546 ----
  
  	fprintf(stderr, "%s: ", program);
  	if (errno)
+ #ifdef USE_STRERROR
+ 		fprintf(stderr, "%s: ", strerror(errno));
+ #else
  		fprintf(stderr, "%s: ", sys_errlist[ errno ]);
+ #endif
  	fprintf(stderr, x0,x1);
  	fprintf(stderr, "  Stop.\n");
  	wrapup();
***************
*** 871,877 ****
  		end = buf + total_red;
  		*end = '\0';
  		fseek(tmpfd, 0, 0);
! #if defined(SYSV) || defined(WIN32)
  		freopen(tmpfname, "w+", tmpfd);
  #else	/* !SYSV */
  		ftruncate(fileno(tmpfd), (off_t) 0);
--- 889,895 ----
  		end = buf + total_red;
  		*end = '\0';
  		fseek(tmpfd, 0, 0);
! #if defined(SYSV) || defined(WIN32) || defined(USE_FREOPEN)
  		freopen(tmpfname, "w+", tmpfd);
  #else	/* !SYSV */
  		ftruncate(fileno(tmpfd), (off_t) 0);
diff -c xc/config/imake/imakemdep.h:1.1.1.2 xc/config/imake/imakemdep.h:3.8
*** xc/config/imake/imakemdep.h:1.1.1.2	Mon Jan 30 17:29:39 1995
--- xc/config/imake/imakemdep.h	Mon Jan 30 17:29:40 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: imakemdep.h,v 1.82 95/01/12 16:27:01 kaleb Exp $ */
+ /* $XFree86: xc/config/imake/imakemdep.h,v 3.8 1995/01/28 15:40:59 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 155,160 ****
--- 156,170 ----
  #define imake_ccflags "-DSVR4"
  #endif
  
+ #ifdef	MACH
+ #define imake_ccflags "-DNOSTDHDRS"
+ #endif
+ 
+ /* this is for OS/2 under EMX. This won't work with DOS */
+ #if defined(__EMX__) 
+ #define imake_ccflags "-DBSD43"
+ #endif
+ 
  #else /* not CCIMAKE */
  #ifndef MAKEDEPEND
  /*
***************
*** 186,191 ****
--- 196,204 ----
  #define INLINE_SYNTAX
  #define MAGIC_MAKE_VARS
  #endif
+ #ifdef __minix_vmd
+ #define FIXUP_CPP_WHITESPACE
+ #endif
  
  /*
   * Step 4:  USE_CC_E, DEFAULT_CC, DEFAULT_CPP
***************
*** 224,229 ****
--- 237,252 ----
  #if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
  #define DEFAULT_CPP "/usr/libexec/cpp"
  #endif
+ #ifdef	MACH
+ #define USE_CC_E
+ #endif
+ #ifdef __minix_vmd
+ #define DEFAULT_CPP "/usr/lib/cpp"
+ #endif
+ #if defined(__EMX__)
+ /* expects cpp in PATH */
+ #define DEFAULT_CPP "cpp"
+ #endif
  
  /*
   * Step 5:  cpp_argv
***************
*** 249,255 ****
  #ifdef unix
  	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
  #endif
! #if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
  # ifdef __i386__
  	"-D__i386__",
  # endif
--- 272,278 ----
  #ifdef unix
  	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
  #endif
! #if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(MACH)
  # ifdef __i386__
  	"-D__i386__",
  # endif
***************
*** 326,336 ****
  # endif
  #endif /* MOTOROLA */
  #ifdef i386
- 	"-Di386",
  # ifdef SVR4
  	"-DSVR4",
  # endif
  # ifdef SYSV
  	"-DSYSV",
  #  ifdef ISC
  	"-DISC",
--- 349,360 ----
  # endif
  #endif /* MOTOROLA */
  #ifdef i386
  # ifdef SVR4
+ 	"-Di386",
  	"-DSVR4",
  # endif
  # ifdef SYSV
+ 	"-Di386",
  	"-DSYSV",
  #  ifdef ISC
  	"-DISC",
***************
*** 354,408 ****
  	"-DSCO324",
  #   endif
  #  endif
! #  ifdef ESIX
  	"-DESIX",
! #  endif
! #  ifdef ATT
  	"-DATT",
! #  endif
! #  ifdef DELL
  	"-DDELL",
- #  endif
  # endif
  #endif
! #ifdef SYSV386		/* System V/386 folks, obsolete */
  	"-Di386",
  # ifdef SVR4
  	"-DSVR4",
  # endif
! # ifdef SYSV
! 	"-DSYSV",
! #  ifdef ISC
  	"-DISC",
! #   ifdef ISC40
  	"-DISC40",       /* ISC 4.0 */
! #   else
! #    ifdef ISC202
  	"-DISC202",      /* ISC 2.0.2 */
! #    else
! #     ifdef ISC30
  	"-DISC30",       /* ISC 3.0 */
! #     else
  	"-DISC22",       /* ISC 2.2.1 */
- #     endif
  #    endif
  #   endif
  #  endif
! #  ifdef SCO
  	"-DSCO",
! #   ifdef SCO324
  	"-DSCO324",
- #   endif
  #  endif
! #  ifdef ESIX
  	"-DESIX",
! #  endif
! #  ifdef ATT
  	"-DATT",
! #  endif
! #  ifdef DELL
  	"-DDELL",
- #  endif
  # endif
  #endif
  #ifdef __osf__
--- 378,432 ----
  	"-DSCO324",
  #   endif
  #  endif
! # endif
! # ifdef ESIX
! 	"-Di386",
  	"-DESIX",
! # endif
! # ifdef ATT
! 	"-Di386",
  	"-DATT",
! # endif
! # ifdef DELL
! 	"-Di386",
  	"-DDELL",
  # endif
  #endif
! #ifdef SYSV386           /* System V/386 folks, obsolete */
  	"-Di386",
  # ifdef SVR4
  	"-DSVR4",
  # endif
! # ifdef ISC
  	"-DISC",
! #  ifdef ISC40
  	"-DISC40",       /* ISC 4.0 */
! #  else
! #   ifdef ISC202
  	"-DISC202",      /* ISC 2.0.2 */
! #   else
! #    ifdef ISC30
  	"-DISC30",       /* ISC 3.0 */
! #    else
  	"-DISC22",       /* ISC 2.2.1 */
  #    endif
  #   endif
  #  endif
! # endif
! # ifdef SCO
  	"-DSCO",
! #  ifdef SCO324
  	"-DSCO324",
  #  endif
! # endif
! # ifdef ESIX
  	"-DESIX",
! # endif
! # ifdef ATT
  	"-DATT",
! # endif
! # ifdef DELL
  	"-DDELL",
  # endif
  #endif
  #ifdef __osf__
***************
*** 455,467 ****
  # ifdef CROSS_COMPILE
  	"-DCROSS_COMPILE",
  #  ifdef CROSS_i80386
! 	"-DCROSS_i80386",
  #  endif
  #  ifdef CROSS_sparc
! 	"-DCROSS_sparc",
  #  endif
  #  ifdef CROSS_mc68000
! 	"-DCROSS_mc68000",
  #  endif
  # else
  #  ifdef i80386
--- 479,491 ----
  # ifdef CROSS_COMPILE
  	"-DCROSS_COMPILE",
  #  ifdef CROSS_i80386
! 	"-Di80386",
  #  endif
  #  ifdef CROSS_sparc
! 	"-Dsparc",
  #  endif
  #  ifdef CROSS_mc68000
! 	"-Dmc68000",
  #  endif
  # else
  #  ifdef i80386
***************
*** 475,480 ****
--- 499,513 ----
  #  endif
  # endif
  #endif
+ #ifdef __minix_vmd
+         "-Dminix",
+ #endif
+ 
+ #if defined(__EMX__)
+ 	"-traditional",
+ 	"-Demxos2",
+ #endif
+ 
  };
  #else /* else MAKEDEPEND */
  /*
***************
*** 673,678 ****
--- 706,714 ----
  #endif
  #ifdef PC_UX
  	{"PC_UX", "1"},
+ #endif
+ #ifdef __EMX__
+ 	{"__EMX__", "1"},
  #endif
  	/* add any additional symbols before this line */
  	{NULL, NULL}
diff -c /dev/null xc/config/imake/imakesvc.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:40 1995
--- xc/config/imake/imakesvc.cmd	Mon Jan 30 17:29:40 1995
***************
*** 0 ****
--- 1,129 ----
+ /* Rexx OS/2
+  * This script serves as a helper cmd file for imake. Install this in
+  * the path just like imake itself.
+  *
+  * $XFree86: xc/config/imake/imakesvc.cmd,v 3.0 1994/12/17 09:33:44 dawes Exp $ */
+  */
+ '@echo off'
+ call RxFuncAdd 'SysFileDelete', 'RexxUtil', 'SysFileDelete'
+ call RxFuncAdd 'SysFileTree', 'RexxUtil', 'SysFileTree'
+ call RxFuncAdd 'SysRmDir', 'RexxUtil', 'SysRmDir'
+ 
+ PARSE ARG all
+ code = WORD(all,1)
+ 
+ SELECT
+    WHEN code=1 THEN DO
+       /* imakesvc 1 u/n dir ruledir top current */
+       instflg = WORD(all,2)
+       imakecmd = '\imake'
+       IF instflg = 'u' THEN imakecmd = 'imake'
+       curdir = DIRECTORY()
+       dir = WORD(all,3)
+       d = DIRECTORY(dir)
+       RC = SysFileDelete('Makefile.bak')
+       IF exists('Makefile')=0 THEN REN Makefile Makefile.bak
+       pfx = levels(TRANSLATE(dir,'/','\'))
+       imakecmd '-I'pfx''WORD(all,4) '-DTOPDIR='pfx''WORD(all,5)' -DCURDIR='pfx''WORD(all,6)'/'dir
+       'make SHELL= Makefiles'
+       d = DIRECTORY(curdir)
+    END
+    WHEN code=2 THEN DO
+       /* imakesvc 2 buildincdir buildinctop currentdir file */
+       bid = WORD(all,3)
+       cid = WORD(all,4)
+       fil = WORD(all,5)
+       curdir = DIRECTORY()
+       d = DIRECTORY(WORD(all,2))
+       rc = SysFileDelete(fil)
+       dir = TRANSLATE(bid'/'cid'/'fil,'\','/')
+       COPY dir .
+       d = DIRECTORY(curdir)
+    END
+    WHEN code=3 THEN DO
+       /* imakesvc 3 subdir updir file */
+       sdi = WORD(all,2)
+       fil = WORD(all,4)
+       curdir = DIRECTORY()
+       d = DIRECTORY(WORD(all,3))
+       rc = SysFileDelete(fil)
+       dir = TRANSLATE(sdi'/'fil,'\','/')
+       COPY dir .
+       d = DIRECTORY(curdir)
+    END
+    WHEN code=4 THEN DO
+       /* imakesvc 4 [-r] files... */
+       rec = WORD(all,2)
+       fp = 2
+       IF rec = '-r' THEN fp = 3 
+       DO i=fp TO WORDS(all)
+ 	 CALL discard rec TRANSLATE(WORD(all,i),'\','/')
+       END	
+    END
+    WHEN code=5 THEN DO
+       /* imakesvc 5 file */
+       file = TRANSLATE(WORD(all,2),'\','/')
+       if exists(file) THEN REN file file.bak
+    END
+    WHEN code=6 THEN DO
+       /* imakesvc 6 file */
+       file = TRANSLATE(WORD(all,2),'\','/')
+       CALL SysFileDelete(file'.bak')
+       if exists(file) THEN REN file file.bak
+    END
+    WHEN code=7 THEN DO
+       /* imakesvc 7 from to */
+       from = TRANSLATE(WORD(all,2),'\','/')
+       to = TRANSLATE(WORD(all,3),'\','/')
+       CALL SysFileDelete(to)
+       COPY from to' 2> nul > nul'
+    END
+    WHEN code=8 THEN DO
+       /* imakesvc 8 arg */
+       SAY SUBWORD(TRANSLATE(all,'  ','222c'x),2)
+    END
+    OTHERWISE NOP
+ END
+ RETURN
+ 
+ levels:
+ oldpos = 1
+ pfx = ''
+ DO FOREVER
+    newpos = POS('/',ARG(1),oldpos)
+    IF newpos = 0 THEN LEAVE
+    newpfx = '../'pfx
+    oldpos = newpos+1
+    pfx = newpfx
+ END
+ RETURN pfx
+ 
+ exists:
+ 'DIR 'arg(1)' > nul 2>nul'
+ RETURN rc
+ 
+ discard: PROCEDURE
+ arg rec files
+ IF rec = '-R' THEN DO
+    old = DIRECTORY()
+    nd = DIRECTORY
+    CALL SysFileTree files, 'deld', 'DO'
+    IF deld.0 > 0 THEN DO
+       DO m=1 TO deld.0
+          CALL DIRECTORY deld.m
+          CALL discard '-R' .
+          CALL DIRECTORY ..
+          CALL SysRmDir deld.m
+       END 
+       CALL SysRmDir files
+    END
+    CALL SysFileTree files, 'delf', 'FO'
+    DO k=1 TO delf.0
+       DEL '"'delf.k'"' '> nul 2> nul'
+    END
+    CALL SysRmDir files
+ END 
+ ELSE DO
+    DEL '"'files'"' '> nul 2> nul'
+ END
+ RETURN
diff -c xc/config/makedepend/Imakefile:1.1.1.1 xc/config/makedepend/Imakefile:3.1
*** xc/config/makedepend/Imakefile:1.1.1.1	Mon Jan 30 17:29:42 1995
--- xc/config/makedepend/Imakefile	Mon Jan 30 17:29:42 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.22 94/03/29 15:54:05 gildea Exp $
+ XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.1 1994/10/20 06:00:46 dawes Exp $
  
      SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
      OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
***************
*** 26,32 ****
  INCLUDES = -I$(IMAKESRC)
   DEPLIBS =
  
! #if defined(MacIIArchitecture) || defined(SequentArchitecture)
   XBSDLIB = /**/
  #endif
  
--- 27,33 ----
  INCLUDES = -I$(IMAKESRC)
   DEPLIBS =
  
! #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
   XBSDLIB = /**/
  #endif
  
***************
*** 43,45 ****
--- 44,51 ----
  SpecialCObjectRule(main,$(ICONFIGFILES),$(MAIN_DEFINES))
  
  InstallManPageLong(mkdepend,$(MANDIR),makedepend)
+ 
+ #ifdef OS2Architecture
+ all::
+ 	$(CP) ProgramTargetName(makedepend) /
+ #endif
diff -c xc/config/makedepend/main.c:1.1.1.2 xc/config/makedepend/main.c:3.3
*** xc/config/makedepend/main.c:1.1.1.2	Mon Jan 30 17:29:44 1995
--- xc/config/makedepend/main.c	Mon Jan 30 17:29:44 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */
+ /* $XFree86: xc/config/makedepend/main.c,v 3.3 1995/01/28 15:41:03 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 49,54 ****
--- 50,59 ----
  #include <stdarg.h>
  #endif
  
+ #ifdef MINIX
+ #define USE_CHMOD	1
+ #endif
+ 
  #ifdef DEBUG
  int	_debugmask;
  #endif
***************
*** 108,114 ****
  	fatalerr ("got signal %d\n", sig);
  }
  
! #if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32)
  #define USGISH
  #endif
  
--- 113,119 ----
  	fatalerr ("got signal %d\n", sig);
  }
  
! #if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__)
  #define USGISH
  #endif
  
***************
*** 555,561 ****
  	return(file);
  }
  
! #if defined(USG) && !defined(CRAY) && !defined(SVR4)
  int rename (from, to)
      char *from, *to;
  {
--- 560,566 ----
  	return(file);
  }
  
! #if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__)
  int rename (from, to)
      char *from, *to;
  {
***************
*** 603,614 ****
  		fatalerr("cannot open \"%s\"\n", makefile);
  	sprintf(backup, "%s.bak", makefile);
  	unlink(backup);
! #ifdef WIN32
  	fclose(fdin);
  #endif
  	if (rename(makefile, backup) < 0)
  		fatalerr("cannot rename %s to %s\n", makefile, backup);
! #ifdef WIN32
  	if ((fdin = fopen(backup, "r")) == NULL)
  		fatalerr("cannot open \"%s\"\n", backup);
  #endif
--- 608,619 ----
  		fatalerr("cannot open \"%s\"\n", makefile);
  	sprintf(backup, "%s.bak", makefile);
  	unlink(backup);
! #if defined(WIN32) || defined(__EMX__)
  	fclose(fdin);
  #endif
  	if (rename(makefile, backup) < 0)
  		fatalerr("cannot rename %s to %s\n", makefile, backup);
! #if defined(WIN32) || defined(__EMX__)
  	if ((fdin = fopen(backup, "r")) == NULL)
  		fatalerr("cannot open \"%s\"\n", backup);
  #endif
***************
*** 631,637 ****
  	    }
  	}
  	fflush(fdout);
! #if defined(USGISH) || defined(_SEQUENT_)
  	chmod(makefile, st.st_mode);
  #else
          fchmod(fileno(fdout), st.st_mode);
--- 636,642 ----
  	    }
  	}
  	fflush(fdout);
! #if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
  	chmod(makefile, st.st_mode);
  #else
          fchmod(fileno(fdout), st.st_mode);
diff -c xc/config/util/Imakefile:1.1.1.1 xc/config/util/Imakefile:3.3
*** xc/config/util/Imakefile:1.1.1.1	Mon Jan 30 17:29:47 1995
--- xc/config/util/Imakefile	Mon Jan 30 17:29:47 1995
***************
*** 1,16 ****
  XCOMM $XConsortium: Imakefile,v 1.8 94/03/29 15:54:11 gildea Exp $
  #if UseCCMakeDepend
  MDEP_PROG = makedepend
  #endif
!          PROGRAMS = xmkmf $(MDEP_PROG) mergelib
            DEPLIBS =
    EXTRA_LIBRARIES =
  
  all:: $(PROGRAMS)
  
  CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
  CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD)"'"',$(ICONFIGFILES))
  CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES))
  
  #if HasSymLinks
  #if CrossCompiling
--- 1,25 ----
  XCOMM $XConsortium: Imakefile,v 1.8 94/03/29 15:54:11 gildea Exp $
+ XCOMM $XFree86: xc/config/util/Imakefile,v 3.3 1994/12/17 09:36:53 dawes Exp $
  #if UseCCMakeDepend
  MDEP_PROG = makedepend
  #endif
! GCCMDEP_PROG = gccmakedep
!          PROGRAMS = xmkmf $(MDEP_PROG) $(GCCMDEP_PROG) mergelib
            DEPLIBS =
    EXTRA_LIBRARIES =
  
  all:: $(PROGRAMS)
  
+ #if HasGcc
+ GCCCMD = $(CC)
+ #else
+ GCCCMD = gcc
+ #endif
+ 
  CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
  CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD)"'"',$(ICONFIGFILES))
  CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES))
+ CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES))
  
  #if HasSymLinks
  #if CrossCompiling
***************
*** 22,28 ****
--- 31,42 ----
  
  InstallNamedProg(xmkmf,xmkmf,$(BINDIR))
  InstallManPage(xmkmf,$(MANDIR))
+ 
+ #if defined(OS2Architecture)
+ InstallNamedProg(mkdirhier.cmd,mkdirhier.cmd,$(BINDIR))
+ #else
  InstallNamedProg(mkdirhier.sh,mkdirhier,$(BINDIR))
+ #endif
  InstallManPage(mkdirhier,$(MANDIR))
  #if UseCCMakeDepend
  InstallNamedProg(makedepend,makedepend,$(BINDIR))
***************
*** 30,33 ****
--- 44,52 ----
  #if SystemV || SystemV4
  InstallNamedProg(bsdinst.sh,bsdinst,$(BINDIR))
  #endif
+ #if defined(OS2Architecture)
+ InstallNamedProg(indir.cmd,indir.cmd,$(BINDIR))
+ InstallNamedProg(os2inst.cmd,os2inst.cmd,$(BINDIR))
+ #endif
  InstallNamedProg(mergelib,mergelib,$(BINDIR))
+ InstallNamedProg(gccmakedep,gccmakedep,$(BINDIR))
diff -c /dev/null xc/config/util/added.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:47 1995
--- xc/config/util/added.cmd	Mon Jan 30 17:29:48 1995
***************
*** 0 ****
--- 1,23 ----
+ /* OS/2 REXX script to create nonexisting directories
+  * run with 'added dirlist_file'
+  * where dirlist_file is a XFree86 added-* file
+  *
+  * $XFree86: xc/config/util/added.cmd,v 3.0 1994/10/20 06:01:00 dawes Exp $
+  */
+ 
+ file = arg(1)
+ linein(file,1,0)
+ curdir = directory()
+ do while lines(file)=1
+   fs = strip(filespec("path",linein(file)),'t','/')
+   newdir = directory(fs)
+   if newdir='' then do
+     say 'create directory='fs
+     call directory(curdir)
+     call 'xc\config\util\mkdirhier.cmd' fs
+   end 
+   else do
+     say 'found directory='newdir
+     call directory(curdir)
+   end
+ end
diff -c xc/config/util/bsdinst.sh:1.1.1.1 xc/config/util/bsdinst.sh:3.1
*** xc/config/util/bsdinst.sh:1.1.1.1	Mon Jan 30 17:29:48 1995
--- xc/config/util/bsdinst.sh	Mon Jan 30 17:29:48 1995
***************
*** 1,5 ****
--- 1,6 ----
  #!/bin/sh
  
+ # $XFree86: xc/config/util/bsdinst.sh,v 3.1 1994/06/05 05:53:32 dawes Exp $
  #
  # This accepts bsd-style install arguments and makes the appropriate calls
  # to the System V install.
***************
*** 10,16 ****
--- 11,19 ----
  src=""
  dostrip=""
  owner=""
+ group=""
  mode=""
+ bargs=$*
  
  while [ x$1 != x ]; do
      case $1 in 
***************
*** 30,35 ****
--- 33,39 ----
  	    continue;;
  
  	-g) flags="$flags $1 $2 "
+ 	    group="$2"
  	    shift
  	    shift
  	    continue;;
***************
*** 49,66 ****
      esac
  done
  
- case "$mode" in
- "")
- 	;;
- *)
- 	case "$owner" in
- 	"")
- 		flags="$flags -u root"
- 		;;
- 	esac
- 	;;
- esac
- 
  if [ x$src = x ] 
  then
  	echo "$0:  no input file specified"
--- 53,58 ----
***************
*** 73,78 ****
--- 65,101 ----
  	exit 1
  fi
  
+ if [ -x /usr/ucb/install ]
+ then
+ 	if [ -d "$dst" ]
+ 	then
+ 		dst=$dst/`basename "$src"`
+ 	fi
+ 	case "$group" in
+ 	"")
+ 		bargs="-g other $bargs"
+ 		;;
+ 	esac
+ 	/usr/ucb/install $bargs
+ 	if [ x$dostrip = xstrip -a -x /usr/bin/mcs ]
+ 	then
+ 		/usr/bin/mcs -d $dst
+ 	fi
+ 	exit 0
+ fi
+ 	
+ case "$mode" in
+ "")
+ 	;;
+ *)
+ 	case "$owner" in
+ 	"")
+ 		flags="$flags -u root"
+ 		;;
+ 	esac
+ 	;;
+ esac
+ 
  
  # set up some variable to be used later
  
***************
*** 128,133 ****
--- 151,165 ----
  if [ x$dostrip = xstrip ]
  then
  	strip $dst/$srcbase
+ 	if [ -x /usr/bin/mcs ]
+ 	then
+ 		/usr/bin/mcs -d $dst/$srcbase
+ 	fi
+ fi
+ 
+ if [ x$mode != x ]
+ then
+ 	chmod $mode $dst/$srcbase
  fi
  
  # and clean up
diff -c /dev/null xc/config/util/buildos2.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:49 1995
--- xc/config/util/buildos2.cmd	Mon Jan 30 17:29:49 1995
***************
*** 0 ****
--- 1,22 ----
+ @echo off
+ rem $XFree86: xc/config/util/buildos2.cmd,v 3.0 1994/12/17 09:36:54 dawes Exp $
+ rem this file is supposed to run from the xc/ dir.
+ rem you must copy it manually to there before using. It is just here
+ rem in order not to be in the root dir.
+ rem
+ rem copy some essential files to a location where we find them again
+ copy config\util\indir.cmd \ > nul
+ copy config\util\mkdirhier.cmd \ > nul
+ copy config\imake\imakesvc.cmd \ > nul
+ rem
+ set GCCOPT=-pipe
+ set EMXLOAD=5
+ emxload make.exe gcc.exe rm.exe mv.exe
+ make SHELL= MFLAGS="CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " -f Makefile.ini World.OS2 | tee buildxc.log
+ rem
+ rem cleanup the mess
+ rem del \indir.cmd
+ rem del \mkdirhier.cmd
+ rem del \imakesvc.cmd
+ rem del \imake.exe
+ rem del \makedepend.exe
diff -c /dev/null xc/config/util/gccmdep.cpp:3.0
*** /dev/null	Mon Jan 30 17:29:49 1995
--- xc/config/util/gccmdep.cpp	Mon Jan 30 17:29:50 1995
***************
*** 0 ****
--- 1,126 ----
+ XCOMM!/bin/sh
+ 
+ XCOMM
+ XCOMM makedepend which uses 'gcc -M'
+ XCOMM
+ XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.0 1994/11/22 02:34:17 dawes Exp $
+ XCOMM
+ XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com>
+ XCOMM
+ 
+ TMP=/tmp/mdep$$
+ CC=CCCMD
+ RM=RMCMD
+ LN=LNCMD
+ MV=MVCMD
+ 
+ trap "$RM ${TMP}*; exit 1" 1 2 15
+ trap "$RM ${TMP}*; exit 0" 1 2 13
+ 
+ files=
+ makefile=
+ endmarker=
+ magic_string='# DO NOT DELETE'
+ append=n
+ args=
+ asmfiles=
+ 
+ while [ $# != 0 ]; do
+     if [ "$endmarker"x != x -a "$endmarker" = "$1" ]; then
+ 	endmarker=
+     else
+ 	case "$1" in
+ 	    -D*|-I*)
+ 		args="$args '$1'"
+ 		;;
+ 	    -g|-o)
+ 		;;
+ 	    *)
+ 		if [ "$endmarker"x = x ]; then
+ 		    case $1 in
+ XCOMM ignore these flags
+ 			-w|-o|-cc)
+ 			    shift
+ 			    ;;
+ 			-v)
+ 			    ;;
+ 			-s)
+ 			    magic_string="$2"
+ 			    shift
+ 			    ;;
+ 			-f)
+ 			    makefile="$2"
+ 			    shift
+ 			    ;;
+ 			--*)
+ 			    endmarker=`echo $1 | sed 's/^\-\-//'`
+ 			    if [ "$endmarker"x = x ]; then
+ 				endmarker="--"
+ 			    fi
+ 			    ;;
+ 			-a)
+ 			    append=y
+ 			    ;;
+ 			-*)
+ 			    echo "Unknown option '$1' ignored" 1>&2
+ 			    ;;
+ 			*)
+ 			    files="$files $1"
+ 			    ;;
+ 		    esac
+ 		fi
+ 		;;
+ 	esac
+     fi
+     shift
+ done
+ 
+ if [ x"$files" = x ]; then
+ XCOMM Nothing to do
+     exit 0
+ fi
+ 
+ case "$makefile" in
+     '')
+ 	if [ -r makefile ]; then
+ 	    makmefile=makefile
+ 	elif [ -r Makefile ]; then
+ 	    makefile=Makefile
+ 	else
+ 	    echo 'no makefile or Makefile found' 1>&2
+ 	    exit 1
+ 	fi
+ 	;;
+ esac
+ 
+ if [ x"$append" = xn ]; then
+     sed -e "/^$magic_string/,\$d" < $makefile > $TMP
+     echo "$magic_string" >> $TMP
+ else
+     cp $makefile $TMP
+ fi
+ 
+ XCOMM need to link .s files to .S
+ for i in $files; do
+     case $i in
+ 	*.s)
+ 	    dir=`dirname $i`
+ 	    base=`basename $i .s`
+ 	    (cd $dir; $RM ${base}.S; $LN ${base}.s ${base}.S)
+ 	    asmfiles="$asmfiles ${base}.S"
+ 	    ;;
+     esac
+ done
+ 
+ CMD="$CC -M $args `echo $files | sed 's,\.s,\.S,g'` | sed 's,\.S,\.s,'"
+ CMD="$CMD >> $TMP"
+ eval $CMD
+ $RM ${makefile}.bak
+ $MV $makefile ${makefile}.bak
+ $MV $TMP $makefile
+ 
+ if [ x"$asmfiles" != x ]; then
+     $RM $asmfiles
+ fi
+ $RM ${TMP}*
+ exit 0
diff -c /dev/null xc/config/util/indir.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:50 1995
--- xc/config/util/indir.cmd	Mon Jan 30 17:29:50 1995
***************
*** 0 ****
--- 1,11 ----
+ /* OS/2 rexx script to emulate the "cd dir; command" mechanism in make
+  * which does not work with stupid CMD.EXE
+  *
+  * $XFree86: xc/config/util/indir.cmd,v 3.0 1994/10/20 06:01:01 dawes Exp $
+  */
+ curdir = directory()
+ line = arg(1)
+ new = directory(word(line,1))
+ subword(line,2)
+ old = directory(curdir)
+ exit
diff -c xc/config/util/lndir.c:1.1.1.2 xc/config/util/lndir.c:3.3
*** xc/config/util/lndir.c:1.1.1.2	Mon Jan 30 17:29:51 1995
--- xc/config/util/lndir.c	Mon Jan 30 17:29:51 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: lndir.c,v 1.14 95/01/09 20:08:20 kaleb Exp $ */
+ /* $XFree86: xc/config/util/lndir.c,v 3.3 1995/01/28 15:41:09 dawes Exp $ */
  /* Create shadow link tree (after X11R4 script of the same name)
     Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
  
***************
*** 47,53 ****
--- 48,56 ----
  #include <X11/Xfuncproto.h>
  #include <stdio.h>
  #include <sys/stat.h>
+ #if !defined(MINIX)
  #include <sys/param.h>
+ #endif
  #include <errno.h>
  
  #ifndef X_NOT_POSIX
diff -c xc/config/util/mdepend.cpp:1.1.1.2 xc/config/util/mdepend.cpp:3.1
*** xc/config/util/mdepend.cpp:1.1.1.2	Mon Jan 30 17:29:52 1995
--- xc/config/util/mdepend.cpp	Mon Jan 30 17:29:52 1995
***************
*** 1,6 ****
--- 1,7 ----
  XCOMM!/bin/sh
  XCOMM
  XCOMM $XConsortium: mdepend.cpp,v 1.12 94/12/09 22:50:34 gildea Exp $
+ XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.1 1995/01/28 15:41:10 dawes Exp $
  XCOMM
  XCOMM	Do the equivalent of the 'makedepend' program, but do it right.
  XCOMM
diff -c /dev/null xc/config/util/mkdirhier.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:52 1995
--- xc/config/util/mkdirhier.cmd	Mon Jan 30 17:29:53 1995
***************
*** 0 ****
--- 1,54 ----
+ /* OS/2 REXX SCRIPT */
+ /* DON'T REMOVE 0x0d (^M) CHARACTERS FROM THIS FILE */
+ /* $XFree86: xc/config/util/mkdirhier.cmd,v 3.0 1994/10/20 06:01:02 dawes Exp $ */
+ 
+ CALL RxFuncAdd 'SysMkDir', 'RexxUtil', 'SysMkDir'
+ 
+ IF ARG() = 0 THEN DO
+ 	SAY "mkdirhier: usage: mkdirhier directory ..."
+ 	EXIT 1
+ END
+ 
+ curdir=DIRECTORY()
+ drive=DELSTR(curdir,3)
+ 
+ status=""
+ PARSE ARG all
+ 
+ DO i=1 TO WORDS(all)
+ 	direc = TRANSLATE(WORD(all,i),'/','\')
+ 	SELECT
+ 	WHEN direc = "" THEN DO
+ 		SAY "mkdirhier: empty directory name"
+ 		status=1
+ 		ITERATE
+ 		END
+ 	WHEN POS('0a'x,direc) > 0 THEN DO
+ 		SAY "mkdirhier: directory name contains a newline: '" direc "'"
+ 		status=1
+ 		ITERATE
+ 		END
+ 	OTHERWISE NOP
+ 	END
+ 	IF POS(":",direc) = 0 THEN direc = INSERT(drive,direc)
+ 
+ 	dirbuf.0 = direc
+ 	DO k=1 TO 1000
+ 		direc1 = STRIP(direc,"t","/")
+ 		dirbuf.k=STRIP(INSERT(drive,FILESPEC("path",direc1)),"t","/")
+ 		IF POS("/",dirbuf.k) = 0 THEN LEAVE k
+ 		direc=dirbuf.k
+ 	END
+ 	DO m=k-1 TO 0 BY -1
+ 		dospath = TRANSLATE(dirbuf.m,'\','/')
+ 		targetdir=DIRECTORY(dospath)
+ 		IF targetdir = dospath THEN
+ 			NOP
+ 		ELSE
+ 			CALL SysMkDir(dospath)
+ 		CALL DIRECTORY curdir
+ 	END
+ END
+ 
+ 
+ EXIT status
diff -c /dev/null xc/config/util/os2inst.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:53 1995
--- xc/config/util/os2inst.cmd	Mon Jan 30 17:29:53 1995
***************
*** 0 ****
--- 1,51 ----
+ /* OS/2 REXX SCRIPT */
+ /* WARNING! DON'T REMOVE 0x0d (^M) CHARACTERS! */
+ 
+ /* $XFree86: xc/config/util/os2inst.cmd,v 3.0 1994/10/20 06:01:03 dawes Exp $
+  *
+  * This is a wrapper for the install command. As any utility, 
+  * install could have been lifted from the BSD sources, but I just wanted
+  * to play with Rexx a bit :-)  (hv)
+  * Note the similarity to the Unix shell scripts
+  */
+ 
+ dst=""
+ src=""
+ 
+ '@ECHO OFF'
+ PARSE ARG all
+ DO i=1 TO WORDS(all)
+ 	w = WORD(all,i)
+ 	SELECT
+ 	WHEN w = "-c" THEN NOP
+ 	WHEN w = "-m" THEN
+ 		i = i + 1
+ 		/* ignore mode */
+ 	WHEN w = "-o" THEN
+ 		i = i + 1
+ 		/* ignore owner */
+ 	WHEN w = "-g" THEN
+ 		i = i + 1
+ 		/* ignore group */
+ 	WHEN w = "-s" THEN NOP
+ 	OTHERWISE
+ 		IF src = "" THEN
+ 			src = w
+ 		ELSE
+ 			dst = w
+ 	END
+ END
+ 
+ IF src = "" THEN DO
+ 	SAY "os2inst:  no input file specified"
+ 	EXIT 1
+ END
+ 
+ IF dst = "" THEN DO
+ 	SAY "os2inst:  no destination specified"
+ 	EXIT 1
+ END
+ 
+ ADDRESS CMD 'copy' src dst '> nul'
+ 
+ EXIT
diff -c /dev/null xc/config/util/remove.cmd:3.0
*** /dev/null	Mon Jan 30 17:29:54 1995
--- xc/config/util/remove.cmd	Mon Jan 30 17:29:54 1995
***************
*** 0 ****
--- 1,14 ----
+ /* OS/2 REXX script to remove cleaned files
+  * run with 'remove dirlist_file'
+  * where dirlist_file is be a XFree86 removed-* file
+  *
+  * $XFree86: xc/config/util/remove.cmd,v 3.0 1994/10/20 06:01:04 dawes Exp $
+  */
+ '@echo off'
+ file = arg(1)
+ linein(file,1,0)
+ curdir = directory()
+ do while lines(file)=1
+   fs = translate(linein(file),'\','/')
+   del fs
+ end
diff -c xc/programs/Imakefile:1.1.1.2 xc/programs/Imakefile:3.5
*** xc/programs/Imakefile:1.1.1.2	Mon Jan 30 17:29:59 1995
--- xc/programs/Imakefile	Mon Jan 30 17:29:59 1995
***************
*** 1,8 ****
  XCOMM $XConsortium: Imakefile,v 1.69 94/07/06 16:26:01 mor Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
  
! #ifndef Win32Architecture
  
  #if HasXServer
  XINIDIR = xinit
--- 1,9 ----
  XCOMM $XConsortium: Imakefile,v 1.69 94/07/06 16:26:01 mor Exp $
+ XCOMM $XFree86: xc/programs/Imakefile,v 3.5 1995/01/27 04:47:48 dawes Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
  
! #if !defined(Win32Architecture) && !defined(OS2Architecture)
  
  #if HasXServer
  XINIDIR = xinit
***************
*** 18,25 ****
  XKBCOMP = xkbcomp
  #endif
  
  SUBDIRS = \
! 	appres bdftopcf bitmap editres fsinfo fslsfonts fstobdf iceauth \
  	mkfontdir oclock $(RGBDIR) rstart smproxy \
  	twm x11perf xauth xclipboard xclock \
  	xcmsdb xconsole xdm xdpyinfo xfd $(XFSDIR) xhost xieperf \
--- 19,35 ----
  XKBCOMP = xkbcomp
  #endif
  
+ #if BuildScreenSaverExt
+ SCRNSAVDIR = beforelight
+ #endif
+ 
+ #if BuildServersOnly
+ SUBDIRS = $(XSDIR)
+ #else
+ #ifndef AmoebaArchitecture
  SUBDIRS = \
! 	appres bdftopcf $(SCRNSAVDIR) \
! 	bitmap editres fsinfo fslsfonts fstobdf iceauth \
  	mkfontdir oclock $(RGBDIR) rstart smproxy \
  	twm x11perf xauth xclipboard xclock \
  	xcmsdb xconsole xdm xdpyinfo xfd $(XFSDIR) xhost xieperf \
***************
*** 27,34 ****
  	xmag xmh xmodmap xprop xrdb xrefresh xset xsetroot xstdcmap xterm \
  	xwd xwininfo xwud $(XSDIR) scripts
  
! #else
  
  SUBDIRS = \
  	appres bdftopcf bitmap editres fsinfo fslsfonts fstobdf iceauth \
  	mkfontdir oclock x11perf xauth xclipboard xclock \
--- 37,55 ----
  	xmag xmh xmodmap xprop xrdb xrefresh xset xsetroot xstdcmap xterm \
  	xwd xwininfo xwud $(XSDIR) scripts
  
! #else /* AmoebaArchitecture */
! SUBDIRS = \
! 	appres bdftopcf $(SCRNSAVDIR) bitmap editres iceauth \
! 	mkfontdir oclock $(RGBDIR) rstart smproxy \
! 	twm x11perf xauth xclipboard xclock \
! 	xcmsdb xconsole xdpyinfo xfd xhost \
! 	xieperf $(XINIDIR) xkill xlogo xlsatoms xlsclients xlsfonts \
! 	xmag xmodmap xprop xrdb xrefresh xset xsetroot xstdcmap xterm \
! 	xwd xwininfo xwud $(XSDIR) scripts
! #endif
! #endif /* BuildServersOnly */
  
+ #else /* Win32Architecture */
  SUBDIRS = \
  	appres bdftopcf bitmap editres fsinfo fslsfonts fstobdf iceauth \
  	mkfontdir oclock x11perf xauth xclipboard xclock \
diff -c xc/programs/Xserver/Imakefile:1.1.1.4 xc/programs/Xserver/Imakefile:3.30
*** xc/programs/Xserver/Imakefile:1.1.1.4	Mon Jan 30 17:30:01 1995
--- xc/programs/Xserver/Imakefile	Mon Jan 30 17:30:01 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.192 95/01/25 20:37:15 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.30 1995/01/28 15:44:31 dawes Exp $
  /*
   * Server Master Makefile
   */
***************
*** 10,15 ****
--- 11,21 ----
  
  #include <Server.tmpl>
  
+ #ifdef XFree86Version
+ /* Don't strip server binaries */
+ INSTPGMFLAGS = 
+ #endif
+ 
  #define PreFbLibs $(DIX) $(OS) $(FONT)
  #define BarePostFbLibs $(MFB) $(MI)
  #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
***************
*** 56,61 ****
--- 62,72 ----
          LBXDIRS = $(TOP)/workInProgress/lbx/programs/Xserver/lbx \
                    $(TOP)/workInProgress/lbx/lib/lbxutil
  #endif
+ #if BuildLBXCompatible
+         LBXDIRS = dixlbx oslbx \
+                   $(TOP)/workInProgress/lbx/programs/Xserver/lbx \
+                   $(TOP)/workInProgress/lbx/lib/lbxutil
+ #endif
  #ifdef SiteExtensionLibs
       SITEEXTS = SiteExtensionLibs
  #endif
***************
*** 88,94 ****
  #else
          SYSLIBS = MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
  #endif
!            CBRT = mi/cbrt.o
          STDDIRS = include dix os mi $(EXTDIRS)
  
  XCOMM
--- 99,105 ----
  #else
          SYSLIBS = MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
  #endif
!            CBRT = mi/libcbrt.a
          STDDIRS = include dix os mi $(EXTDIRS)
  
  XCOMM
diff -c xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile:3.1
*** xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile:1.1.1.2	Mon Jan 30 17:30:07 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile	Mon Jan 30 17:30:07 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.7.1.1 94/11/21 19:42:53 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile,v 3.1 1995/01/28 15:44:36 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile:3.1
*** xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile:1.1.1.2	Mon Jan 30 17:30:10 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile	Mon Jan 30 17:30:10 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:32:10 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile,v 3.1 1995/01/28 15:44:42 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile:3.1
*** xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile:1.1.1.2	Mon Jan 30 17:30:11 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile	Mon Jan 30 17:30:11 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.9 94/11/21 18:32:21 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile,v 3.1 1995/01/28 15:44:45 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile:3.2
*** xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile:1.1.1.2	Mon Jan 30 17:30:13 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile	Mon Jan 30 17:30:13 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:38:15 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile,v 3.2 1995/01/28 15:44:48 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile:3.2
*** xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile:1.1.1.2	Mon Jan 30 17:30:15 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile	Mon Jan 30 17:30:15 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:39:03 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile,v 3.2 1995/01/28 15:44:52 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile:3.1
*** xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile:1.1.1.2	Mon Jan 30 17:30:17 1995
--- xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile	Mon Jan 30 17:30:17 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.8 94/11/21 18:31:20 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile,v 3.1 1995/01/28 15:44:56 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
diff -c xc/programs/Xserver/PEX5/dipex/objects/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/dipex/objects/Imakefile:3.2
*** xc/programs/Xserver/PEX5/dipex/objects/Imakefile:1.1.1.2	Mon Jan 30 17:30:19 1995
--- xc/programs/Xserver/PEX5/dipex/objects/Imakefile	Mon Jan 30 17:30:19 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.8.1.1 94/11/21 19:38:34 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/objects/Imakefile,v 3.2 1995/01/28 15:44:59 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/dipex/swap/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/dipex/swap/Imakefile:3.1
*** xc/programs/Xserver/PEX5/dipex/swap/Imakefile:1.1.1.2	Mon Jan 30 17:30:22 1995
--- xc/programs/Xserver/PEX5/dipex/swap/Imakefile	Mon Jan 30 17:30:22 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.13 94/12/01 16:47:39 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/swap/Imakefile,v 3.1 1995/01/28 15:45:04 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/PEX5/ospex/Imakefile:1.1.1.2 xc/programs/Xserver/PEX5/ospex/Imakefile:3.1
*** xc/programs/Xserver/PEX5/ospex/Imakefile:1.1.1.2	Mon Jan 30 17:30:27 1995
--- xc/programs/Xserver/PEX5/ospex/Imakefile	Mon Jan 30 17:30:27 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:30:58 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/PEX5/ospex/Imakefile,v 3.1 1995/01/28 15:45:08 dawes Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff -c xc/programs/Xserver/XIE/dixie/Imakefile:1.1.1.2 xc/programs/Xserver/XIE/dixie/Imakefile:3.2
*** xc/programs/Xserver/XIE/dixie/Imakefile:1.1.1.2	Mon Jan 30 17:30:29 1995
--- xc/programs/Xserver/XIE/dixie/Imakefile	Mon Jan 30 17:30:29 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:24 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/Imakefile,v 3.2 1995/01/28 15:45:12 dawes Exp $
  XCOMM build dixie archive
  #include <Server.tmpl>
  
diff -c xc/programs/Xserver/XIE/mixie/Imakefile:1.1.1.2 xc/programs/Xserver/XIE/mixie/Imakefile:3.2
*** xc/programs/Xserver/XIE/mixie/Imakefile:1.1.1.2	Mon Jan 30 17:30:37 1995
--- xc/programs/Xserver/XIE/mixie/Imakefile	Mon Jan 30 17:30:37 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:38 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/Imakefile,v 3.2 1995/01/28 15:45:18 dawes Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
diff -c xc/programs/Xserver/Xext/Imakefile:1.1.1.2 xc/programs/Xserver/Xext/Imakefile:3.2
*** xc/programs/Xserver/Xext/Imakefile:1.1.1.2	Mon Jan 30 17:30:50 1995
--- xc/programs/Xserver/Xext/Imakefile	Mon Jan 30 17:30:51 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 5.39 94/11/21 18:30:11 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.2 1995/01/28 15:45:25 dawes Exp $
  #include <Server.tmpl>
  
  #if HasShm
***************
*** 5,16 ****
    SHMSRCS = shm.c
    SHMOBJS = shm.o
  #endif
         SRCS = shape.c $(SHMSRCS) mbuf.c mbufpx.c mbufbf.c	\
                mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c	\
! 	      bigreq.c sync.c xcmisc.c
         OBJS = shape.o $(SHMOBJS) mbuf.o mbufpx.o mbufbf.o	\
                mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o	\
!               bigreq.o sync.o xcmisc.o
     INCLUDES = -I../include -I$(INCLUDESRC) -I$(EXTINCSRC)
     LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
  
--- 6,22 ----
    SHMSRCS = shm.c
    SHMOBJS = shm.o
  #endif
+ 
+ #if BuildScreenSaverExt
+   SCRNSAVSRC = saver.c
+   SCRNSAVOBJ = saver.o
+ #endif
         SRCS = shape.c $(SHMSRCS) mbuf.c mbufpx.c mbufbf.c	\
                mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c	\
! 	      bigreq.c sync.c xcmisc.c $(SCRNSAVSRC)
         OBJS = shape.o $(SHMOBJS) mbuf.o mbufpx.o mbufbf.o	\
                mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o	\
!               bigreq.o sync.o xcmisc.o $(SCRNSAVOBJ)
     INCLUDES = -I../include -I$(INCLUDESRC) -I$(EXTINCSRC)
     LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
  
diff -c xc/programs/Xserver/Xext/mbuf.c:1.1.1.1 xc/programs/Xserver/Xext/mbuf.c:3.0
*** xc/programs/Xserver/Xext/mbuf.c:1.1.1.1	Mon Jan 30 17:30:52 1995
--- xc/programs/Xserver/Xext/mbuf.c	Mon Jan 30 17:30:52 1995
***************
*** 26,31 ****
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: mbuf.c,v 1.24 94/04/17 20:32:52 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.0 1994/05/08 05:17:27 dawes Exp $ */
  #define NEED_REPLIES
  #define NEED_EVENTS
  #include <stdio.h>
***************
*** 45,51 ****
--- 46,54 ----
  #include "regionstr.h"
  #include "gcstruct.h"
  #include "inputstr.h"
+ #ifndef MINIX
  #include <sys/time.h>
+ #endif
  
  /* given an OtherClientPtr obj, get the ClientPtr */
  #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
diff -c xc/programs/Xserver/Xext/mbufbf.c:1.1.1.1 xc/programs/Xserver/Xext/mbufbf.c:3.0
*** xc/programs/Xserver/Xext/mbufbf.c:1.1.1.1	Mon Jan 30 17:30:53 1995
--- xc/programs/Xserver/Xext/mbufbf.c	Mon Jan 30 17:30:53 1995
***************
*** 26,31 ****
--- 26,32 ----
  */
  
  /* $XConsortium: mbufbf.c,v 1.5 94/04/17 20:32:53 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.0 1994/05/08 05:17:30 dawes Exp $ */
  
  #define NEED_REPLIES
  #define NEED_EVENTS
***************
*** 45,51 ****
--- 46,54 ----
  #include "gcstruct.h"
  #include "inputstr.h"
  #include "validate.h"
+ #ifndef MINIX
  #include <sys/time.h>
+ #endif
  
  #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
  #define _MULTIBUF_BUFFER_
diff -c xc/programs/Xserver/Xext/mbufpx.c:1.1.1.1 xc/programs/Xserver/Xext/mbufpx.c:3.0
*** xc/programs/Xserver/Xext/mbufpx.c:1.1.1.1	Mon Jan 30 17:30:54 1995
--- xc/programs/Xserver/Xext/mbufpx.c	Mon Jan 30 17:30:54 1995
***************
*** 26,31 ****
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: mbufpx.c,v 1.5 94/04/17 20:32:54 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.0 1994/05/08 05:17:32 dawes Exp $ */
  #define NEED_REPLIES
  #define NEED_EVENTS
  #include <stdio.h>
***************
*** 43,49 ****
--- 44,52 ----
  #include "regionstr.h"
  #include "gcstruct.h"
  #include "inputstr.h"
+ #ifndef MINIX
  #include <sys/time.h>
+ #endif
  
  #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
  #define _MULTIBUF_PIXMAP_
diff -c /dev/null xc/programs/Xserver/Xext/saver.c:3.0
*** /dev/null	Mon Jan 30 17:30:54 1995
--- xc/programs/Xserver/Xext/saver.c	Mon Jan 30 17:30:54 1995
***************
*** 0 ****
--- 1,1221 ----
+ /*
+  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #define NEED_REPLIES
+ #define NEED_EVENTS
+ #include <stdio.h>
+ #include "X.h"
+ #include "Xproto.h"
+ #include "misc.h"
+ #include "os.h"
+ #include "windowstr.h"
+ #include "scrnintstr.h"
+ #include "pixmapstr.h"
+ #include "extnsionst.h"
+ #include "dixstruct.h"
+ #include "resource.h"
+ #include "opaque.h"
+ #include "saverproto.h"
+ #include "gcstruct.h"
+ #include "cursorstr.h"
+ #include "colormapst.h"
+ 
+ static unsigned char ScreenSaverReqCode = 0;
+ static int ScreenSaverEventBase = 0;
+ 
+ static Bool ScreenSaverHandle ();
+ 
+ static void SScreenSaverNotifyEvent ();
+ 
+ static int  ProcScreenSaverDispatch (), SProcScreenSaverDispatch ();
+ 
+ static void ScreenSaverResetProc ();
+ 
+ extern WindowPtr    *WindowTable;
+ 
+ /*
+  * each screen has a list of clients requesting
+  * ScreenSaverNotify events.  Each client has a resource
+  * for each screen it selects ScreenSaverNotify input for,
+  * this resource is used to delete the ScreenSaverNotifyRec
+  * entry from the per-screen queue.
+  */
+ 
+ static RESTYPE EventType;   /* resource type for event masks */
+ 
+ typedef struct _ScreenSaverEvent *ScreenSaverEventPtr;
+ 
+ typedef struct _ScreenSaverEvent {
+     ScreenSaverEventPtr	next;
+     ClientPtr		client;
+     ScreenPtr		screen;
+     XID			resource;
+     CARD32		mask;
+ } ScreenSaverEventRec;
+ 
+ static int ScreenSaverFreeEvents();
+ 
+ /*
+  * when a client sets the screen saver attributes, a resource is
+  * kept to be freed when the client exits
+  */
+ 
+ static RESTYPE AttrType;    /* resource type for attributes */
+ 
+ typedef struct _ScreenSaverAttr {
+     ScreenPtr	    screen;
+     ClientPtr	    client;
+     XID		    resource;
+     short	    x, y;
+     unsigned short  width, height, borderWidth;
+     unsigned char   class;
+     unsigned char   depth;
+     VisualID	    visual;
+     CursorPtr	    pCursor;
+     PixmapPtr	    pBackgroundPixmap;
+     PixmapPtr	    pBorderPixmap;
+     Colormap	    colormap;
+     unsigned long   mask;		/* no pixmaps or cursors */
+     unsigned long   *values;
+ } ScreenSaverAttrRec, *ScreenSaverAttrPtr;
+ 
+ static int ScreenSaverFreeAttr ();
+ 
+ typedef struct _ScreenSaverScreenPrivate {
+     ScreenSaverEventPtr	    events;
+     ScreenSaverAttrPtr	    attr;
+     Bool		    hasWindow;
+     Colormap		    installedMap;
+ } ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr;
+ 
+ static int ScreenPrivateIndex;
+ 
+ #define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr)
+ #define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v);
+ #define SetupScreen(s)	ScreenSaverScreenPrivatePtr pPriv = GetScreenPrivate(s)
+ 
+ #define New(t)	((t *) xalloc (sizeof (t)))
+ 
+ /****************
+  * ScreenSaverExtensionInit
+  *
+  * Called from InitExtensions in main() or from QueryExtension() if the
+  * extension is dynamically loaded.
+  *
+  ****************/
+ 
+ void
+ ScreenSaverExtensionInit()
+ {
+     ExtensionEntry *extEntry, *AddExtension();
+     int		    i;
+     ScreenPtr	    pScreen;
+ 
+     AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
+     EventType = CreateNewResourceType(ScreenSaverFreeEvents);
+     ScreenPrivateIndex = AllocateScreenPrivateIndex ();
+     for (i = 0; i < screenInfo.numScreens; i++)
+     {
+ 	pScreen = screenInfo.screens[i];
+ 	SetScreenPrivate (pScreen, NULL);
+     }
+     if (AttrType && EventType && ScreenPrivateIndex != -1 &&
+ 	(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
+ 				 ProcScreenSaverDispatch, SProcScreenSaverDispatch,
+ 				 ScreenSaverResetProc, StandardMinorOpcode)))
+     {
+ 	ScreenSaverReqCode = (unsigned char)extEntry->base;
+ 	ScreenSaverEventBase = extEntry->eventBase;
+ 	EventSwapVector[ScreenSaverEventBase] = SScreenSaverNotifyEvent;
+     }
+ }
+ 
+ /*ARGSUSED*/
+ static void
+ ScreenSaverResetProc (extEntry)
+ ExtensionEntry	*extEntry;
+ {
+ }
+ 
+ static void
+ CheckScreenPrivate (pScreen)
+     ScreenPtr	pScreen;
+ {
+     SetupScreen (pScreen);
+ 
+     if (!pPriv)
+ 	return;
+     if (!pPriv->attr && !pPriv->events &&
+ 	!pPriv->hasWindow && pPriv->installedMap == None)
+     {
+ 	xfree (pPriv);
+ 	SetScreenPrivate (pScreen, NULL);
+ 	savedScreenInfo[pScreen->myNum].ExternalScreenSaver = NULL;
+     }
+ }
+ 
+ static ScreenSaverScreenPrivatePtr
+ MakeScreenPrivate (pScreen)
+     ScreenPtr	pScreen;
+ {
+     SetupScreen (pScreen);
+ 
+     if (pPriv)
+ 	return pPriv;
+     pPriv = New (ScreenSaverScreenPrivateRec);
+     if (!pPriv)
+ 	return 0;
+     pPriv->events = 0;
+     pPriv->attr = 0;
+     pPriv->hasWindow = FALSE;
+     pPriv->installedMap = None;
+     SetScreenPrivate (pScreen, pPriv);
+     savedScreenInfo[pScreen->myNum].ExternalScreenSaver = ScreenSaverHandle;
+     return pPriv;
+ }
+ 
+ static unsigned long
+ getEventMask (pScreen, client)
+     ScreenPtr	pScreen;
+     ClientPtr	client;
+ {
+     SetupScreen(pScreen);
+     ScreenSaverEventPtr	pEv;
+ 
+     if (!pPriv)
+ 	return 0;
+     for (pEv = pPriv->events; pEv; pEv = pEv->next)
+ 	if (pEv->client == client)
+ 	    return pEv->mask;
+     return 0;
+ }
+ 
+ static Bool
+ setEventMask (pScreen, client, mask)
+     ScreenPtr	pScreen;
+     ClientPtr	client;
+     unsigned long   mask;
+ {
+     SetupScreen(pScreen);
+     ScreenSaverEventPtr	pEv, *pPrev;
+ 
+     if (getEventMask (pScreen, client) == mask)
+ 	return TRUE;
+     if (!pPriv)
+     {
+ 	pPriv = MakeScreenPrivate (pScreen);
+ 	if (!pPriv)
+ 	    return FALSE;
+     }
+     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+ 	if (pEv->client == client)
+ 	    break;
+     if (mask == 0)
+     {
+ 	FreeResource (pEv->resource, EventType);
+ 	*pPrev = pEv->next;
+ 	xfree (pEv);
+ 	CheckScreenPrivate (pScreen);
+     }
+     else
+     {
+     	if (!pEv) 
+     	{
+ 	    pEv = New (ScreenSaverEventRec);
+ 	    if (!pEv) 
+ 	    {
+ 		CheckScreenPrivate (pScreen);
+ 	    	return FALSE;
+ 	    }
+     	    *pPrev = pEv;
+     	    pEv->next = NULL;
+     	    pEv->client = client;
+     	    pEv->screen = pScreen;
+     	    pEv->resource = FakeClientID (client->index);
+ 	    if (!AddResource (pEv->resource, EventType, (pointer) pEv))
+ 		return FALSE;
+     	}
+ 	pEv->mask = mask;
+     }
+     return TRUE;
+ }
+ 
+ static void
+ FreeAttrs (pAttr)
+     ScreenSaverAttrPtr	pAttr;
+ {
+     unsigned long   imask;
+     PixmapPtr	    pPixmap;
+     CursorPtr	    pCursor;
+ 
+     if (pPixmap = pAttr->pBackgroundPixmap)
+ 	(*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
+     if (pPixmap = pAttr->pBorderPixmap)
+ 	(*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
+     if (pCursor = pAttr->pCursor)
+ 	FreeCursor (pCursor, (Cursor) 0);
+ }
+ 
+ static void
+ FreeScreenAttr (pAttr)
+     ScreenSaverAttrPtr	pAttr;
+ {
+     FreeAttrs (pAttr);
+     xfree (pAttr->values);
+     xfree (pAttr);
+ }
+ 
+ static int
+ ScreenSaverFreeEvents (value, id)
+     pointer value;
+     XID id;
+ {
+     ScreenSaverEventPtr	pOld = (ScreenSaverEventPtr)value;
+     ScreenPtr pScreen = pOld->screen;
+     SetupScreen (pScreen);
+     ScreenSaverEventPtr	pEv, *pPrev;
+ 
+     if (!pPriv)
+ 	return TRUE;
+     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+ 	if (pEv == pOld)
+ 	    break;
+     if (!pEv)
+ 	return TRUE;
+     *pPrev = pEv->next;
+     xfree (pEv);
+     CheckScreenPrivate (pScreen);
+     return TRUE;
+ }
+ 
+ static int
+ ScreenSaverFreeAttr (value, id)
+     pointer value;
+     XID id;
+ {
+     ScreenSaverAttrPtr	pOldAttr = (ScreenSaverAttrPtr)value;
+     ScreenPtr	pScreen = pOldAttr->screen;
+     SetupScreen (pScreen);
+ 
+     if (!pPriv)
+ 	return TRUE;
+     if (pPriv->attr != pOldAttr)
+ 	return TRUE;
+     FreeScreenAttr (pOldAttr);
+     pPriv->attr = NULL;
+     if (pPriv->hasWindow)
+     {
+ 	SaveScreens (SCREEN_SAVER_FORCER, ScreenSaverReset);
+ 	SaveScreens (SCREEN_SAVER_FORCER, ScreenSaverActive);
+     }
+     CheckScreenPrivate (pScreen);
+     return TRUE;
+ }
+ 
+ static void
+ SendScreenSaverNotify (pScreen, state, forced)
+     ScreenPtr			pScreen;
+     int	    state;
+     Bool    forced;
+ {
+     ScreenSaverScreenPrivatePtr	pPriv;
+     ScreenSaverEventPtr		pEv;
+     unsigned long		mask;
+     xScreenSaverNotifyEvent	ev;
+     ClientPtr			client;
+     int				kind;
+     ScreenSaverStuffPtr		pSaver;
+ 
+     UpdateCurrentTimeIf ();
+     mask = ScreenSaverNotifyMask;
+     if (state == ScreenSaverCycle)
+ 	mask = ScreenSaverCycleMask;
+     pScreen = screenInfo.screens[pScreen->myNum];
+     pPriv = GetScreenPrivate(pScreen);
+     if (!pPriv)
+ 	return;
+     pSaver = &savedScreenInfo[pScreen->myNum];
+     if (pPriv->attr)
+ 	kind = ScreenSaverExternal;
+     else if (ScreenSaverBlanking != DontPreferBlanking)
+ 	kind = ScreenSaverBlanked;
+     else
+ 	kind = ScreenSaverInternal;
+     for (pEv = pPriv->events; pEv; pEv = pEv->next)
+     {
+ 	client = pEv->client;
+ 	if (client->clientGone)
+ 	    continue;
+ 	if (!(pEv->mask & mask))
+ 	    continue;
+ 	ev.type = ScreenSaverNotify + ScreenSaverEventBase;
+ 	ev.state = state;
+ 	ev.sequenceNumber = client->sequence;
+ 	ev.timestamp = currentTime.milliseconds;
+ 	ev.root = WindowTable[pScreen->myNum]->drawable.id;
+ 	ev.window = savedScreenInfo[pScreen->myNum].wid;
+ 	ev.kind = kind;
+ 	ev.forced = forced;
+ 	WriteEventsToClient (client, 1, (xEvent *) &ev);
+     }
+ }
+ 
+ static void
+ SScreenSaverNotifyEvent (from, to)
+     xScreenSaverNotifyEvent *from, *to;
+ {
+     to->type = from->type;
+     to->state = from->state;
+     cpswaps (from->sequenceNumber, to->sequenceNumber);
+     cpswapl (from->timestamp, to->timestamp);    
+     cpswapl (from->root, to->root);    
+     cpswapl (from->window, to->window);    
+     to->kind = from->kind;
+     to->forced = from->forced;
+ }
+ 
+ static void
+ UninstallSaverColormap (pScreen)
+     ScreenPtr	pScreen;
+ {
+     SetupScreen(pScreen);
+     ColormapPtr			pCmap;
+ 
+     if (pPriv && pPriv->installedMap != None)
+     {
+ 	pCmap = (ColormapPtr) LookupIDByType (pPriv->installedMap, RT_COLORMAP);
+ 	if (pCmap)
+ 	    (*pCmap->pScreen->UninstallColormap) (pCmap);
+ 	pPriv->installedMap = None;
+ 	CheckScreenPrivate (pScreen);
+     }
+ }
+ 
+ static Bool
+ CreateSaverWindow (pScreen)
+     ScreenPtr	pScreen;
+ {
+     SetupScreen (pScreen);
+     ScreenSaverStuffPtr		pSaver;
+     ScreenSaverAttrPtr		pAttr;
+     WindowPtr			pWin;
+     int				result;
+     unsigned long		mask;
+     extern int			GrabInProgress;
+     Colormap			*installedMaps;
+     int				numInstalled;
+     int				i;
+     Colormap			wantMap;
+     ColormapPtr			pCmap;
+ 
+     pSaver = &savedScreenInfo[pScreen->myNum];
+     if (pSaver->pWindow)
+     {
+ 	pSaver->pWindow = NullWindow;
+ 	FreeResource (pSaver->wid, RT_NONE);
+ 	if (pPriv)
+ 	{
+ 	    UninstallSaverColormap (pScreen);
+ 	    pPriv->hasWindow = FALSE;
+ 	    CheckScreenPrivate (pScreen);
+ 	}
+     }
+ 
+     if (!pPriv || !(pAttr = pPriv->attr))
+ 	return FALSE;
+ 
+     pPriv->installedMap = None;
+ 
+     if (GrabInProgress && GrabInProgress != pAttr->client->index)
+ 	return FALSE;
+ 
+     pWin = CreateWindow (pSaver->wid, WindowTable[pScreen->myNum],
+ 			 pAttr->x, pAttr->y, pAttr->width, pAttr->height,
+ 			 pAttr->borderWidth, pAttr->class, 
+ 			 pAttr->mask, (XID *)pAttr->values, 
+ 			 pAttr->depth, serverClient, pAttr->visual, 
+ 			 &result);
+     if (!pWin)
+ 	return FALSE;
+ 
+     if (!AddResource(pWin->drawable.id, RT_WINDOW, pWin))
+ 	return FALSE;
+ 
+     mask = 0;
+     if (pAttr->pBackgroundPixmap)
+     {
+ 	pWin->backgroundState = BackgroundPixmap;
+ 	pWin->background.pixmap = pAttr->pBackgroundPixmap;
+ 	pAttr->pBackgroundPixmap->refcnt++;
+ 	mask |= CWBackPixmap;
+     }
+     if (pAttr->pBorderPixmap)
+     {
+ 	pWin->borderIsPixel = FALSE;
+ 	pWin->border.pixmap = pAttr->pBorderPixmap;
+ 	pAttr->pBorderPixmap->refcnt++;
+ 	mask |= CWBorderPixmap;
+     }
+     if (pAttr->pCursor)
+     {
+ 	if (!pWin->optional)
+ 	    if (!MakeWindowOptional (pWin))
+ 	    {
+     	    	FreeResource (pWin->drawable.id, RT_NONE);
+     	    	return FALSE;
+ 	    }
+ 	if (pWin->optional->cursor)
+ 	    FreeCursor (pWin->optional->cursor, (Cursor)0);
+ 	pWin->optional->cursor = pAttr->pCursor;
+ 	pAttr->pCursor->refcnt++;
+ 	pWin->cursorIsNone = FALSE;
+ 	CheckWindowOptionalNeed (pWin);
+ 	mask |= CWCursor;
+     }
+     if (mask)
+ 	(*pScreen->ChangeWindowAttributes) (pWin, mask);
+ 
+     if (pAttr->colormap != None)
+ 	(void) ChangeWindowAttributes (pWin, CWColormap, &pAttr->colormap,
+ 				       serverClient);
+ 
+     MapWindow (pWin, serverClient);
+ 
+     pPriv->hasWindow = TRUE;
+     pSaver->pWindow = pWin;
+ 
+     /* check and install our own colormap if it isn't installed now */
+     wantMap = wColormap (pWin);
+     if (wantMap == None)
+ 	return TRUE;
+     installedMaps = (Colormap *) ALLOCATE_LOCAL (pScreen->maxInstalledCmaps *
+ 						 sizeof (Colormap));
+     numInstalled = (*pWin->drawable.pScreen->ListInstalledColormaps)
+ 						    (pScreen, installedMaps);
+     for (i = 0; i < numInstalled; i++) 
+ 	if (installedMaps[i] == wantMap)
+ 	    break;
+ 
+     DEALLOCATE_LOCAL ((char *) installedMaps);
+ 
+     if (i < numInstalled)
+ 	return TRUE;
+ 
+     pCmap = (ColormapPtr) LookupIDByType (wantMap, RT_COLORMAP);
+     if (!pCmap)
+ 	return TRUE;
+ 
+     pPriv->installedMap = wantMap;
+ 
+     (*pCmap->pScreen->InstallColormap) (pCmap);
+ 
+     return TRUE;
+ }
+ 
+ static Bool
+ DestroySaverWindow (pScreen)
+     ScreenPtr	pScreen;
+ {
+     SetupScreen(pScreen);
+     ScreenSaverStuffPtr		pSaver;
+ 
+     if (!pPriv || !pPriv->hasWindow)
+ 	return FALSE;
+ 
+     pSaver = &savedScreenInfo[pScreen->myNum];
+     if (pSaver->pWindow)
+     {
+ 	pSaver->pWindow = NullWindow;
+ 	FreeResource (pSaver->wid, RT_NONE);
+     }
+     pPriv->hasWindow = FALSE;
+     CheckScreenPrivate (pScreen);
+     UninstallSaverColormap (pScreen);
+     return TRUE;
+ }
+ 
+ static Bool
+ ScreenSaverHandle (pScreen, xstate, force)
+     ScreenPtr	pScreen;
+     int		xstate;
+     Bool	force;
+ {
+     int				state;
+     Bool			ret = FALSE;
+     ScreenSaverScreenPrivatePtr	pPriv;
+ 
+     switch (xstate)
+     {
+     case SCREEN_SAVER_ON:	
+ 	state = ScreenSaverOn;
+ 	ret = CreateSaverWindow (pScreen);
+ 	break;
+     case SCREEN_SAVER_OFF:	
+ 	state = ScreenSaverOff;
+ 	ret = DestroySaverWindow (pScreen);
+ 	break;
+     case SCREEN_SAVER_CYCLE:	
+ 	state = ScreenSaverCycle;
+ 	pPriv = GetScreenPrivate (pScreen);
+ 	if (pPriv && pPriv->hasWindow)
+ 	    ret = TRUE;
+ 	
+     }
+     SendScreenSaverNotify (pScreen, state, force);
+     return ret;
+ }
+ 
+ static int
+ ProcScreenSaverQueryVersion (client)
+     register ClientPtr	client;
+ {
+     REQUEST(xScreenSaverQueryVersionReq);
+     xScreenSaverQueryVersionReply	rep;
+     register int		n;
+ 
+     REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq);
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+     rep.majorVersion = ScreenSaverMajorVersion;
+     rep.minorVersion = ScreenSaverMinorVersion;
+     if (client->swapped) {
+     	swaps(&rep.sequenceNumber, n);
+     	swapl(&rep.length, n);
+     }
+     WriteToClient(client, sizeof (xScreenSaverQueryVersionReply), (char *)&rep);
+     return (client->noClientException);
+ }
+ 
+ ProcScreenSaverQueryInfo (client)
+     register ClientPtr	client;
+ {
+     REQUEST(xScreenSaverQueryInfoReq);
+     xScreenSaverQueryInfoReply	rep;
+     register int		n;
+     ScreenSaverStuffPtr		pSaver;
+     DrawablePtr			pDraw;
+     CARD32			lastInput;
+     ScreenSaverScreenPrivatePtr	pPriv;
+ 
+     REQUEST_SIZE_MATCH (xScreenSaverQueryInfoReq);
+     pDraw = (DrawablePtr) LookupDrawable (stuff->drawable, client);
+     if (!pDraw)
+ 	return BadDrawable;
+ 
+     pSaver = &savedScreenInfo[pDraw->pScreen->myNum];
+     pPriv = GetScreenPrivate (pDraw->pScreen);
+ 
+     UpdateCurrentTime ();
+     lastInput = GetTimeInMillis() - lastDeviceEventTime.milliseconds;
+ 
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+     rep.window = pSaver->wid;
+     if (screenIsSaved != SCREEN_SAVER_OFF)
+     {
+ 	rep.state = ScreenSaverOn;
+ 	if (ScreenSaverTime)
+ 	    rep.tilOrSince = lastInput - ScreenSaverTime;
+ 	else
+ 	    rep.tilOrSince = 0;
+     }
+     else
+     {
+ 	if (ScreenSaverTime)
+ 	{
+ 	    rep.state = ScreenSaverOff;
+ 	    if (ScreenSaverTime < lastInput)
+ 		rep.tilOrSince = 0;
+ 	    else
+ 		rep.tilOrSince = ScreenSaverTime - lastInput;
+ 	}
+ 	else
+ 	{
+ 	    rep.state = ScreenSaverDisabled;
+ 	    rep.tilOrSince = 0;
+ 	}
+     }
+     rep.idle = lastInput;
+     rep.eventMask = getEventMask (pDraw->pScreen, client);
+     if (pPriv && pPriv->attr)
+ 	rep.kind = ScreenSaverExternal;
+     else if (ScreenSaverBlanking != DontPreferBlanking)
+ 	rep.kind = ScreenSaverBlanked;
+     else
+ 	rep.kind = ScreenSaverInternal;
+     if (client->swapped)
+     {
+ 	swaps (&rep.sequenceNumber, n);
+ 	swapl (&rep.length, n);
+ 	swapl (&rep.window, n);
+ 	swapl (&rep.tilOrSince, n);
+ 	swapl (&rep.idle, n);
+ 	swapl (&rep.eventMask, n);
+     }
+     WriteToClient(client, sizeof (xScreenSaverQueryInfoReply), (char *)&rep);
+     return (client->noClientException);
+ }
+ 
+ static int
+ ProcScreenSaverSelectInput (client)
+     register ClientPtr	client;
+ {
+     REQUEST(xScreenSaverSelectInputReq);
+     register int		n;
+     DrawablePtr			pDraw;
+ 
+     REQUEST_SIZE_MATCH (xScreenSaverSelectInputReq);
+     pDraw = (DrawablePtr) LookupDrawable (stuff->drawable, client);
+     if (!pDraw)
+ 	return BadDrawable;
+     if (!setEventMask (pDraw->pScreen, client, stuff->eventMask))
+ 	return BadAlloc;
+     return Success;
+ }
+ 
+ static int
+ ProcScreenSaverSetAttributes (client)
+     register ClientPtr	client;
+ {
+     REQUEST(xScreenSaverSetAttributesReq);
+     register int		n;
+     DrawablePtr			pDraw;
+     WindowPtr			pParent;
+     ScreenPtr			pScreen;
+     ScreenSaverScreenPrivatePtr pPriv = 0;
+     ScreenSaverAttrPtr		pAttr = 0;
+     Bool			newPriv = FALSE;
+     int				ret;
+     int				len;
+     int				class, bw, depth;
+     unsigned long		visual;
+     int				idepth, ivisual;
+     Bool			fOK;
+     DepthPtr			pDepth;
+     PixmapFormatRec		*format;
+     WindowOptPtr		ancwopt;
+     unsigned long		*pVlist;
+     unsigned long		*values = 0;
+     int				valuei;
+     unsigned long		tmask, imask;
+     unsigned long		val;
+     Pixmap			pixID;
+     PixmapPtr			pPixmap;
+     Cursor			cursorID;
+     CursorPtr			pCursor;
+     Colormap			cmap;
+     ColormapPtr			pCmap;
+ 
+     REQUEST_AT_LEAST_SIZE (xScreenSaverSetAttributesReq);
+     pDraw = (DrawablePtr) LookupDrawable (stuff->drawable, client);
+     if (!pDraw)
+ 	return BadDrawable;
+     pScreen = pDraw->pScreen;
+     pParent = WindowTable[pScreen->myNum];
+ 
+     len = stuff->length -  (sizeof(xScreenSaverSetAttributesReq) >> 2);
+     if (Ones(stuff->mask) != len)
+         return BadLength;
+     if (!stuff->width || !stuff->height)
+     {
+ 	client->errorValue = 0;
+         return BadValue;
+     }
+     switch (class = stuff->c_class) 
+     {
+     case CopyFromParent:
+     case InputOnly:
+     case InputOutput:
+ 	break;
+     default:
+ 	client->errorValue = class;
+ 	return BadValue;
+     }
+     bw = stuff->borderWidth;
+     depth = stuff->depth;
+     visual = stuff->visualID;
+ 
+     /* copied directly from CreateWindow */
+ 
+     if (class == CopyFromParent)
+ 	class = pParent->drawable.class;
+ 
+     if ((class != InputOutput) && (class != InputOnly))
+     {
+ 	client->errorValue = class;
+ 	return BadValue;
+     }
+ 
+     if ((class != InputOnly) && (pParent->drawable.class == InputOnly))
+         return BadMatch;
+ 
+     if ((class == InputOnly) && ((bw != 0) || (depth != 0)))
+         return BadMatch;
+ 
+     if ((class == InputOutput) && (depth == 0))
+         depth = pParent->drawable.depth;
+     ancwopt = pParent->optional;
+     if (!ancwopt)
+ 	ancwopt = FindWindowWithOptional(pParent)->optional;
+     if (visual == CopyFromParent)
+ 	visual = ancwopt->visual;
+ 
+     /* Find out if the depth and visual are acceptable for this Screen */
+     if ((visual != ancwopt->visual) || (depth != pParent->drawable.depth))
+     {
+ 	fOK = FALSE;
+ 	for(idepth = 0; idepth < pScreen->numDepths; idepth++)
+ 	{
+ 	    pDepth = (DepthPtr) &pScreen->allowedDepths[idepth];
+ 	    if ((depth == pDepth->depth) || (depth == 0))
+ 	    {
+ 		for (ivisual = 0; ivisual < pDepth->numVids; ivisual++)
+ 		{
+ 		    if (visual == pDepth->vids[ivisual])
+ 		    {
+ 			fOK = TRUE;
+ 			break;
+ 		    }
+ 		}
+ 	    }
+ 	}
+ 	if (fOK == FALSE)
+ 	    return BadMatch;
+     }
+ 
+     if (((stuff->mask & (CWBorderPixmap | CWBorderPixel)) == 0) &&
+ 	(class != InputOnly) &&
+ 	(depth != pParent->drawable.depth))
+     {
+         return BadMatch;
+     }
+ 
+     if (((stuff->mask & CWColormap) == 0) &&
+ 	(class != InputOnly) &&
+ 	((visual != ancwopt->visual) || (ancwopt->colormap == None)))
+     {
+ 	return BadMatch;
+     }
+ 
+     /* end of errors from CreateWindow */
+ 
+     pPriv = GetScreenPrivate (pScreen);
+     if (pPriv && pPriv->attr)
+     {
+ 	if (pPriv->attr->client != client)
+ 	    return BadAccess;
+     }
+     if (!pPriv)
+     {
+ 	pPriv = MakeScreenPrivate (pScreen);
+ 	if (!pPriv)
+ 	    return FALSE;
+     }
+     pAttr = New (ScreenSaverAttrRec);
+     if (!pAttr)
+     {
+ 	ret = BadAlloc;
+ 	goto bail;
+     }
+     /* over allocate for override redirect */
+     values = (unsigned long *) xalloc ((len + 1) * sizeof (unsigned long));
+     if (!values)
+     {
+ 	ret = BadAlloc;
+ 	goto bail;
+     }
+     valuei = 0;
+     pAttr->screen = pScreen;
+     pAttr->client = client;
+     pAttr->x = stuff->x;
+     pAttr->y = stuff->y;
+     pAttr->width = stuff->width;
+     pAttr->height = stuff->height;
+     pAttr->borderWidth = stuff->borderWidth;
+     pAttr->class = stuff->c_class;
+     pAttr->depth = depth;
+     pAttr->visual = visual;
+     pAttr->colormap = None;
+     pAttr->pCursor = NullCursor;
+     pAttr->pBackgroundPixmap = NullPixmap;
+     pAttr->pBorderPixmap = NullPixmap;
+     pAttr->values = values;
+     /*
+      * go through the mask, checking the values,
+      * looking up pixmaps and cursors and hold a reference
+      * to them.
+      */
+     pAttr->mask = tmask = stuff->mask | CWOverrideRedirect;
+     pVlist = (unsigned long *) (stuff + 1);
+     while (tmask) {
+ 	imask = lowbit (tmask);
+ 	tmask &= ~imask;
+ 	switch (imask)
+         {
+ 	case CWBackPixmap:
+ 	    pixID = (Pixmap )*pVlist;
+ 	    if (pixID == None)
+ 	    {
+ 		*values++ = None;
+ 	    }
+ 	    else if (pixID == ParentRelative)
+ 	    {
+ 		if (depth != pParent->drawable.depth)
+ 		{
+ 		    ret = BadMatch;
+ 		    goto PatchUp;
+ 		}
+ 		*values++ = ParentRelative;
+ 	    }
+             else
+ 	    {	
+                 pPixmap = (PixmapPtr)LookupIDByType(pixID, RT_PIXMAP);
+                 if (pPixmap != (PixmapPtr) NULL)
+ 		{
+                     if  ((pPixmap->drawable.depth != depth) ||
+ 			 (pPixmap->drawable.pScreen != pScreen))
+ 		    {
+                         ret = BadMatch;
+ 			goto PatchUp;
+ 		    }
+ 		    pAttr->pBackgroundPixmap = pPixmap;
+ 		    pPixmap->refcnt++;
+ 		    pAttr->mask &= ~CWBackPixmap;
+ 		}
+ 	        else
+ 		{
+ 		    ret = BadPixmap;
+ 		    client->errorValue = pixID;
+ 		    goto PatchUp;
+ 		}
+ 	    }
+ 	    break;
+ 	case CWBackPixel:
+ 	    *values++ = (CARD32) *pVlist;
+ 	    break;
+ 	case CWBorderPixmap:
+ 	    pixID = (Pixmap ) *pVlist;
+ 	    if (pixID == CopyFromParent)
+ 	    {
+ 		if (depth != pParent->drawable.depth)
+ 		{
+ 		    ret = BadMatch;
+ 		    goto PatchUp;
+ 		}
+ 		*values++ = CopyFromParent;
+ 	    }
+ 	    else
+ 	    {	
+ 		pPixmap = (PixmapPtr)LookupIDByType(pixID, RT_PIXMAP);
+ 		if (pPixmap)
+ 		{
+                     if  ((pPixmap->drawable.depth != depth) ||
+ 			 (pPixmap->drawable.pScreen != pScreen))
+ 		    {
+ 			ret = BadMatch;
+ 			goto PatchUp;
+ 		    }
+ 		    pAttr->pBorderPixmap = pPixmap;
+ 		    pPixmap->refcnt++;
+ 		    pAttr->mask &= ~CWBorderPixmap;
+ 		}
+     	        else
+ 		{
+ 		    ret = BadPixmap;
+ 		    client->errorValue = pixID;
+ 		    goto PatchUp;
+ 		}
+ 	    }
+ 	    break;
+ 	case CWBorderPixel:
+             *values++ = (CARD32) *pVlist;
+             break;
+ 	case CWBitGravity:
+ 	    val = (CARD8 )*pVlist;
+ 	    if (val > StaticGravity)
+ 	    {
+ 		ret = BadValue;
+ 		client->errorValue = val;
+ 		goto PatchUp;
+ 	    }
+ 	    *values++ = val;
+ 	    break;
+ 	case CWWinGravity:
+ 	    val = (CARD8 )*pVlist;
+ 	    if (val > StaticGravity)
+ 	    {
+ 		ret = BadValue;
+ 		client->errorValue = val;
+ 		goto PatchUp;
+ 	    }
+ 	    *values++ = val;
+ 	    break;
+ 	case CWBackingStore:
+ 	    val = (CARD8 )*pVlist;
+ 	    if ((val != NotUseful) && (val != WhenMapped) && (val != Always))
+ 	    {
+ 		ret = BadValue;
+ 		client->errorValue = val;
+ 		goto PatchUp;
+ 	    }
+ 	    *values++ = val;
+ 	    break;
+ 	case CWBackingPlanes:
+ 	    *values++ = (CARD32) *pVlist;
+ 	    break;
+ 	case CWBackingPixel:
+ 	    *values++ = (CARD32) *pVlist;
+ 	    break;
+ 	case CWSaveUnder:
+ 	    val = (BOOL) *pVlist;
+ 	    if ((val != xTrue) && (val != xFalse))
+ 	    {
+ 		ret = BadValue;
+ 		client->errorValue = val;
+ 		goto PatchUp;
+ 	    }
+ 	    *values++ = val;
+ 	    break;
+ 	case CWEventMask:
+ 	    *values++ = (CARD32) *pVlist;
+ 	    break;
+ 	case CWDontPropagate:
+ 	    *values++ = (CARD32) *pVlist;
+ 	    break;
+ 	case CWOverrideRedirect:
+ 	    if (!(stuff->mask & CWOverrideRedirect))
+ 		pVlist--;
+ 	    else
+ 	    {
+ 	    	val = (BOOL ) *pVlist;
+ 	    	if ((val != xTrue) && (val != xFalse))
+ 	    	{
+ 		    ret = BadValue;
+ 		    client->errorValue = val;
+ 		    goto PatchUp;
+ 	    	}
+ 	    }
+ 	    *values++ = xTrue;
+ 	    break;
+ 	case CWColormap:
+ 	    cmap = (Colormap) *pVlist;
+ 	    pCmap = (ColormapPtr)LookupIDByType(cmap, RT_COLORMAP);
+ 	    if (!pCmap)
+ 	    {
+ 		ret = BadColor;
+ 		client->errorValue = cmap;
+ 		goto PatchUp;
+ 	    }
+ 	    if (pCmap->pVisual->vid != visual || pCmap->pScreen != pScreen)
+ 	    {
+ 		ret = BadMatch;
+ 		goto PatchUp;
+ 	    }
+ 	    pAttr->colormap = cmap;
+ 	    pAttr->mask &= ~CWColormap;
+ 	    break;
+ 	case CWCursor:
+ 	    cursorID = (Cursor ) *pVlist;
+ 	    if ( cursorID == None)
+ 	    {
+ 		*values++ = None;
+ 	    }
+ 	    else
+ 	    {
+ 	    	pCursor = (CursorPtr)LookupIDByType(cursorID, RT_CURSOR);
+ 	    	if (!pCursor)
+ 	    	{
+ 		    ret = BadCursor;
+ 		    client->errorValue = cursorID;
+ 		    goto PatchUp;
+ 	    	}
+ 		pCursor->refcnt++;
+ 		pAttr->pCursor = pCursor;
+ 		pAttr->mask &= ~CWCursor;
+ 	    }
+ 	    break;
+      	 default:
+ 	    ret = BadValue;
+ 	    client->errorValue = stuff->mask;
+ 	    goto PatchUp;
+ 	}
+ 	pVlist++;
+     }
+     if (pPriv->attr)
+ 	FreeScreenAttr (pScreen);
+     pPriv->attr = pAttr;
+     pAttr->resource = FakeClientID (client->index);
+     if (!AddResource (pAttr->resource, AttrType, (pointer) pAttr))
+ 	return BadAlloc;
+     return Success;
+ PatchUp:
+     FreeAttrs (pAttr);
+ bail:
+     CheckScreenPrivate (pScreen);
+     xfree (pAttr);
+     xfree (values);
+     return ret;
+ }
+ 
+ static int
+ ProcScreenSaverUnsetAttributes (client)
+     register ClientPtr	client;
+ {
+     REQUEST(xScreenSaverSetAttributesReq);
+     DrawablePtr			pDraw;
+     ScreenSaverScreenPrivatePtr	pPriv;
+ 
+     REQUEST_SIZE_MATCH (xScreenSaverUnsetAttributesReq);
+     pDraw = (DrawablePtr) LookupDrawable (stuff->drawable, client);
+     if (!pDraw)
+ 	return BadDrawable;
+     pPriv = GetScreenPrivate (pDraw->pScreen);
+     if (pPriv && pPriv->attr && pPriv->attr->client == client)
+     {
+     	FreeScreenAttr (pPriv->attr);
+ 	pPriv->attr = NULL;
+ 	CheckScreenPrivate (pDraw->pScreen);
+     }
+     return Success;
+ }
+ 
+ static int  (*NormalVector[])() = {
+     ProcScreenSaverQueryVersion,
+     ProcScreenSaverQueryInfo,
+     ProcScreenSaverSelectInput,
+     ProcScreenSaverSetAttributes,
+     ProcScreenSaverUnsetAttributes,
+ };
+ 
+ #define NUM_REQUESTS	((sizeof NormalVector) / (sizeof NormalVector[0]))
+ 
+ static int
+ ProcScreenSaverDispatch (client)
+     ClientPtr	client;
+ {
+     REQUEST(xReq);
+ 
+     if (stuff->data < NUM_REQUESTS)
+ 	return (*NormalVector[stuff->data])(client);
+     return BadRequest;
+ }
+ 
+ static int
+ SProcScreenSaverQueryVersion (client)
+     ClientPtr	client;
+ {
+     REQUEST(xScreenSaverQueryVersionReq);
+     int	    n;
+ 
+     swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq);
+     return ProcScreenSaverQueryVersion (client);
+ }
+ 
+ static int
+ SProcScreenSaverQueryInfo (client)
+     ClientPtr	client;
+ {
+     REQUEST(xScreenSaverQueryInfoReq);
+     int	    n;
+ 
+     swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xScreenSaverQueryInfoReq);
+     swapl (&stuff->drawable, n);
+     return ProcScreenSaverQueryInfo (client);
+ }
+ 
+ static int
+ SProcScreenSaverSelectInput (client)
+     ClientPtr	client;
+ {
+     REQUEST(xScreenSaverSelectInputReq);
+     int	    n;
+ 
+     swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xScreenSaverSelectInputReq);
+     swapl (&stuff->drawable, n);
+     swapl (&stuff->eventMask, n);
+     return ProcScreenSaverSelectInput (client);
+ }
+ 
+ static int
+ SProcScreenSaverSetAttributes (client)
+     ClientPtr	client;
+ {
+     REQUEST(xScreenSaverSetAttributesReq);
+     int	    n;
+ 
+     swaps (&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
+     swapl (&stuff->drawable, n);
+     swaps (&stuff->x, n);
+     swaps (&stuff->y, n);
+     swaps (&stuff->width, n);
+     swaps (&stuff->height, n);
+     swaps (&stuff->borderWidth, n);
+     swapl (&stuff->visualID, n);
+     swapl (&stuff->mask, n);
+     SwapRestL(stuff);
+     return ProcScreenSaverSetAttributes (client);
+ }
+ 
+ static int
+ SProcScreenSaverUnsetAttributes (client)
+     ClientPtr	client;
+ {
+     REQUEST(xScreenSaverUnsetAttributesReq);
+     int	    n;
+ 
+     swaps (&stuff->length, n);
+     REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq);
+     swapl (&stuff->drawable, n);
+     return ProcScreenSaverUnsetAttributes (client);
+ }
+ 
+ static int  (*SwappedVector[])() = {
+     SProcScreenSaverQueryVersion,
+     SProcScreenSaverQueryInfo,
+     SProcScreenSaverSelectInput,
+     SProcScreenSaverSetAttributes,
+     SProcScreenSaverUnsetAttributes,
+ };
+ 
+ static int
+ SProcScreenSaverDispatch (client)
+     ClientPtr	client;
+ {
+     REQUEST(xReq);
+ 
+     if (stuff->data < NUM_REQUESTS)
+ 	return (*SwappedVector[stuff->data])(client);
+     return BadRequest;
+ }
diff -c xc/programs/Xserver/Xext/shm.c:1.1.1.1 xc/programs/Xserver/Xext/shm.c:3.2
*** xc/programs/Xserver/Xext/shm.c:1.1.1.1	Mon Jan 30 17:30:55 1995
--- xc/programs/Xserver/Xext/shm.c	Mon Jan 30 17:30:56 1995
***************
*** 28,33 ****
--- 28,34 ----
  /* THIS IS NOT AN X CONSORTIUM STANDARD */
  
  /* $XConsortium: shm.c,v 1.23 94/04/17 20:32:56 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.2 1994/12/02 05:45:07 dawes Exp $ */
  
  #include <sys/types.h>
  #include <sys/ipc.h>
***************
*** 59,64 ****
--- 60,67 ----
      unsigned long size;
  } ShmDescRec, *ShmDescPtr;
  
+ #if !(defined(sun) && defined (SVR4))
+ 
  #if NeedFunctionPrototypes
  
  #if defined(SVR4)
***************
*** 73,78 ****
--- 76,83 ----
  char *shmat();
  #endif
  
+ #endif
+ 
  static void miShmPutImage(), fbShmPutImage();
  static PixmapPtr fbShmCreatePixmap();
  static int ProcShmDispatch(), SProcShmDispatch();
***************
*** 121,131 ****
--- 126,177 ----
      } \
  }
  
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/signal.h>
+ 
+ static Bool badSysCall = FALSE;
+ 
+ static void
+ SigSysHandler(signo)
+ int signo;
+ {
+     badSysCall = TRUE;
+ }
+ 
+ static Bool CheckForShmSyscall()
+ {
+     void (*oldHandler)();
+     int shmid = -1;
+ 
+     /* If no SHM support in the kernel, the bad syscall will generate SIGSYS */
+     oldHandler = signal(SIGSYS, SigSysHandler);
+ 
+     badSysCall = FALSE;
+     shmid = shmget(IPC_PRIVATE, 4096, IPC_CREAT);
+     /* Clean up */
+     if (shmid != -1)
+     {
+ 	shmctl(shmid, IPC_RMID, (struct shmid_ds *)NULL);
+     }
+     signal(SIGSYS, oldHandler);
+     return(!badSysCall);
+ }
+ #endif
+     
  void
  ShmExtensionInit()
  {
      ExtensionEntry *extEntry;
      int i;
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+     if (!CheckForShmSyscall())
+     {
+ 	ErrorF("MIT-SHM extension disabled due to lack of kernel support\n");
+ 	return;
+     }
+ #endif
  
      sharedPixmaps = xTrue;
      pixmapFormat = shmPixFormat[0];
diff -c xc/programs/Xserver/Xext/sync.c:1.1.1.1 xc/programs/Xserver/Xext/sync.c:3.0
*** xc/programs/Xserver/Xext/sync.c:1.1.1.1	Mon Jan 30 17:30:57 1995
--- xc/programs/Xserver/Xext/sync.c	Mon Jan 30 17:30:57 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: sync.c,v 1.10 94/04/17 20:32:58 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.0 1994/05/08 05:17:34 dawes Exp $ */
  /*
  
  Copyright (c) 1991, 1993  X Consortium
***************
*** 2205,2211 ****
--- 2206,2214 ----
   */
  
  
+ #ifndef MINIX
  #include <sys/time.h>
+ #endif
  
  static pointer ServertimeCounter;
  static XSyncValue Now;
diff -c xc/programs/Xserver/cfb/Imakefile:1.1.1.2 xc/programs/Xserver/cfb/Imakefile:3.4
*** xc/programs/Xserver/cfb/Imakefile:1.1.1.2	Mon Jan 30 17:31:07 1995
--- xc/programs/Xserver/cfb/Imakefile	Mon Jan 30 17:31:07 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 5.42 94/11/21 18:29:57 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.4 1995/01/28 15:45:32 dawes Exp $
  #include <Server.tmpl>
  
  #ifndef PixelSize
diff -c xc/programs/Xserver/cfb/cfbcmap.c:1.1.1.1 xc/programs/Xserver/cfb/cfbcmap.c:3.1
*** xc/programs/Xserver/cfb/cfbcmap.c:1.1.1.1	Mon Jan 30 17:31:08 1995
--- xc/programs/Xserver/cfb/cfbcmap.c	Mon Jan 30 17:31:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: cfbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.1 1994/07/15 06:55:03 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/cfb/cfbmap.h:1.1.1.2 xc/programs/Xserver/cfb/cfbmap.h:3.1
*** xc/programs/Xserver/cfb/cfbmap.h:1.1.1.2	Mon Jan 30 17:31:09 1995
--- xc/programs/Xserver/cfb/cfbmap.h	Mon Jan 30 17:31:10 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: cfbmap.h,v 1.10 94/09/22 21:12:06 dpw Exp $
+  * $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.1 1995/01/28 15:45:34 dawes Exp $
   *
  Copyright (c) 1991  X Consortium
  
diff -c xc/programs/Xserver/cfb/cfbply1rct.c:1.1.1.2 xc/programs/Xserver/cfb/cfbply1rct.c:3.1
*** xc/programs/Xserver/cfb/cfbply1rct.c:1.1.1.2	Mon Jan 30 17:31:11 1995
--- xc/programs/Xserver/cfb/cfbply1rct.c	Mon Jan 30 17:31:11 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: cfbply1rct.c,v 1.15 94/11/21 18:29:57 kaleb Exp $
+  * $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.1 1995/01/28 15:45:35 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/dix/Imakefile:1.1.1.2 xc/programs/Xserver/dix/Imakefile:3.3
*** xc/programs/Xserver/dix/Imakefile:1.1.1.2	Mon Jan 30 17:31:17 1995
--- xc/programs/Xserver/dix/Imakefile	Mon Jan 30 17:31:17 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.47 94/11/21 18:27:00 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.3 1995/01/28 15:45:46 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
***************
*** 40,45 ****
--- 41,56 ----
     SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\"
  #endif
  
+ #ifdef XVendorString
+ VENDORSTRING = XVendorString
+    VENDOR_STRING = -DVENDOR_STRING='$(VENDORSTRING)'
+ #endif
+ 
+ #ifdef XVendorRelease
+ VENDORRELEASE = XVendorRelease
+    VENDOR_RELEASE = -DVENDOR_RELEASE='$(VENDORRELEASE)'
+ #endif
+ 
  #if HasKrb5
           K5DEFS = Krb5Defines
  #endif
***************
*** 46,51 ****
--- 57,64 ----
  
  SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS)
  
+ VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE)
+ 
  NormalLibraryObjectRule()
  NormalLibraryTarget(dix,$(OBJS))
  LintLibraryTarget(dix,$(SRCS))
***************
*** 54,60 ****
--- 67,102 ----
  SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
  SpecialCObjectRule(tables,$(ICONFIGFILES),$(K5DEFS))
  SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(K5DEFS))
+ SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
  
+ #ifndef LinkDirectory
  InstallLinkKitLibrary(dix,$(LINKKITDIR)/lib)
+ #endif
+ 
+ #ifdef LinkDirectory
+ LinkSourceFile(atom.c,LinkDirectory)
+ LinkSourceFile(colormap.c,LinkDirectory)
+ LinkSourceFile(cursor.c,LinkDirectory)
+ LinkSourceFile(devices.c,LinkDirectory)
+ LinkSourceFile(dispatch.c,LinkDirectory)
+ LinkSourceFile(dixfonts.c,LinkDirectory)
+ LinkSourceFile(dixutils.c,LinkDirectory)
+ LinkSourceFile(events.c,LinkDirectory)
+ LinkSourceFile(extension.c,LinkDirectory)
+ LinkSourceFile(gc.c,LinkDirectory)
+ LinkSourceFile(globals.c,LinkDirectory)
+ LinkSourceFile(glyphcurs.c,LinkDirectory)
+ LinkSourceFile(grabs.c,LinkDirectory)
+ LinkSourceFile(initatoms.c,LinkDirectory)
+ LinkSourceFile(main.c,LinkDirectory)
+ LinkSourceFile(pixmap.c,LinkDirectory)
+ LinkSourceFile(privates.c,LinkDirectory)
+ LinkSourceFile(property.c,LinkDirectory)
+ LinkSourceFile(resource.c,LinkDirectory)
+ LinkSourceFile(swaprep.c,LinkDirectory)
+ LinkSourceFile(swapreq.c,LinkDirectory)
+ LinkSourceFile(tables.c,LinkDirectory)
+ LinkSourceFile(window.c,LinkDirectory)
+ #endif
  
  DependTarget()
diff -c xc/programs/Xserver/dix/dispatch.c:1.1.1.2 xc/programs/Xserver/dix/dispatch.c:3.3
*** xc/programs/Xserver/dix/dispatch.c:1.1.1.2	Mon Jan 30 17:31:19 1995
--- xc/programs/Xserver/dix/dispatch.c	Mon Jan 30 17:31:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: dispatch.c,v 5.66 94/10/19 21:59:25 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.3 1995/01/12 05:56:45 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1987, 1989  X Consortium
diff -c xc/programs/Xserver/dix/events.c:1.1.1.2 xc/programs/Xserver/dix/events.c:3.1
*** xc/programs/Xserver/dix/events.c:1.1.1.2	Mon Jan 30 17:31:22 1995
--- xc/programs/Xserver/dix/events.c	Mon Jan 30 17:31:23 1995
***************
*** 48,53 ****
--- 48,54 ----
  
  
  /* $XConsortium: events.c,v 5.76 94/08/16 13:45:06 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.1 1994/09/17 13:45:18 dawes Exp $ */
  
  #include "X.h"
  #include "misc.h"
***************
*** 1996,2002 ****
      if (grab)
  	DeliverGrabbedEvent(xE, keybd, deactivateGrab, count);
      else
! 	DeliverFocusedEvent(keybd, xE, sprite.win, count);
      if (deactivateGrab)
          (*keybd->DeactivateGrab)(keybd);
  }
--- 1997,2004 ----
      if (grab)
  	DeliverGrabbedEvent(xE, keybd, deactivateGrab, count);
      else
! 	if (sprite.win)
! 	    DeliverFocusedEvent(keybd, xE, sprite.win, count);
      if (deactivateGrab)
          (*keybd->DeactivateGrab)(keybd);
  }
diff -c xc/programs/Xserver/dix/main.c:1.1.1.1 xc/programs/Xserver/dix/main.c:3.3
*** xc/programs/Xserver/dix/main.c:1.1.1.1	Mon Jan 30 17:31:25 1995
--- xc/programs/Xserver/dix/main.c	Mon Jan 30 17:31:26 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: main.c,v 5.30 94/04/17 20:26:40 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.3 1994/12/29 09:41:44 dawes Exp $ */
  
  #include "X.h"
  #include "Xproto.h"
***************
*** 353,358 ****
--- 354,360 ----
  
  	if (dispatchException & DE_TERMINATE)
  	{
+ 	    OsCleanup();
  	    ddxGiveUp();
  	    break;
  	}
diff -c xc/programs/Xserver/dix/property.c:1.1.1.1 xc/programs/Xserver/dix/property.c:3.0
*** xc/programs/Xserver/dix/property.c:1.1.1.1	Mon Jan 30 17:31:27 1995
--- xc/programs/Xserver/dix/property.c	Mon Jan 30 17:31:27 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: property.c,v 5.16 94/04/17 20:26:42 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/dix/property.c,v 3.0 1994/12/25 12:15:58 dawes Exp $ */
  
  #include "X.h"
  #define NEED_REPLIES
***************
*** 58,64 ****
  extern void (*ReplySwapVector[]) ();
  extern void CopySwap16Write(), CopySwap32Write(), Swap32Write();
  
! #ifdef LBX
  int fWriteToClient(client, len, buf)
      ClientPtr   client;
      int         len;
--- 59,65 ----
  extern void (*ReplySwapVector[]) ();
  extern void CopySwap16Write(), CopySwap32Write(), Swap32Write();
  
! #if defined(LBX) || defined(LBX_COMPAT)
  int fWriteToClient(client, len, buf)
      ClientPtr   client;
      int         len;
***************
*** 559,565 ****
  		    switch (reply.format) {
  		    case 32: client->pSwapReplyFunc = CopySwap32Write; break;
  		    case 16: client->pSwapReplyFunc = CopySwap16Write; break;
! #ifdef LBX
  		    default: client->pSwapReplyFunc = (void (*) ())fWriteToClient; break;
  #else
  		    default: client->pSwapReplyFunc = (void (*) ())WriteToClient; break;
--- 560,566 ----
  		    switch (reply.format) {
  		    case 32: client->pSwapReplyFunc = CopySwap32Write; break;
  		    case 16: client->pSwapReplyFunc = CopySwap16Write; break;
! #if defined(LBX) || defined(LBX_COMPAT)
  		    default: client->pSwapReplyFunc = (void (*) ())fWriteToClient; break;
  #else
  		    default: client->pSwapReplyFunc = (void (*) ())WriteToClient; break;
diff -c /dev/null xc/programs/Xserver/dixlbx/Imakefile:3.0
*** /dev/null	Mon Jan 30 17:31:29 1995
--- xc/programs/Xserver/dixlbx/Imakefile	Mon Jan 30 17:31:29 1995
***************
*** 0 ****
--- 1,10 ----
+ XCOMM $XFree86: xc/programs/Xserver/dixlbx/Imakefile,v 3.0 1994/12/25 12:16:38 dawes Exp $
+ 
+ #define LinkDirectory ../dix
+ 
+ #include "../dix/Imakefile"
+ 
+ EXTRA_DEFINES = -DLBX
+ 
+ InstallLinkKitNamedLibrary(dix,dixlbx,$(LINKKITDIR)/lib)
+ 
diff -c xc/programs/Xserver/hw/hp/input/drivers/ps2io.h:1.1.1.1 xc/programs/Xserver/hw/hp/input/drivers/ps2io.h:3.0
*** xc/programs/Xserver/hw/hp/input/drivers/ps2io.h:1.1.1.1	Mon Jan 30 17:31:49 1995
--- xc/programs/Xserver/hw/hp/input/drivers/ps2io.h	Mon Jan 30 17:31:49 1995
***************
*** 1,7 ****
  /* $XConsortium: ps2io.h,v 1.1 94/05/28 14:32:49 dpw Exp $ */
  /*
!  * @(#)ps2io.h: $Revision: 1.1 $ $Date: 94/05/28 14:32:49 $
!  * $Locker:  $
   */
  
  #ifndef _SYS_PS2IO_INCLUDED /* allows multiple inclusion */
--- 1,7 ----
  /* $XConsortium: ps2io.h,v 1.1 94/05/28 14:32:49 dpw Exp $ */
  /*
!  * @(#)ps2io.h: $Revision$ $Date$
!  * $Locker$
   */
  
  #ifndef _SYS_PS2IO_INCLUDED /* allows multiple inclusion */
diff -c xc/programs/Xserver/hw/sun/constype.c:1.1.1.2 xc/programs/Xserver/hw/sun/constype.c:3.1
*** xc/programs/Xserver/hw/sun/constype.c:1.1.1.2	Mon Jan 30 17:32:19 1995
--- xc/programs/Xserver/hw/sun/constype.c	Mon Jan 30 17:32:19 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: constype.c,v 1.6 95/01/05 20:01:06 kaleb Exp $
+  * $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.1 1995/01/28 15:45:58 dawes Exp $
   * 
   * consoletype - utility to print out string identifying Sun console type
   *
diff -c xc/programs/Xserver/hw/sun/kbd_mode.c:1.1.1.2 xc/programs/Xserver/hw/sun/kbd_mode.c:3.1
*** xc/programs/Xserver/hw/sun/kbd_mode.c:1.1.1.2	Mon Jan 30 17:32:21 1995
--- xc/programs/Xserver/hw/sun/kbd_mode.c	Mon Jan 30 17:32:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: kbd_mode.c,v 4.7 95/01/05 20:03:44 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.1 1995/01/28 15:46:00 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
***************
*** 41,46 ****
--- 42,51 ----
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/ioctl.h>
+ #ifdef __NetBSD__
+ #include <machine/kbio.h>
+ #include <machine/kbd.h>
+ #else
  #ifdef SVR4
  #include <fcntl.h>
  #include <sys/kbio.h>
diff -c xc/programs/Xserver/hw/sun/sun.h:1.1.1.3 xc/programs/Xserver/hw/sun/sun.h:3.1
*** xc/programs/Xserver/hw/sun/sun.h:1.1.1.3	Mon Jan 30 17:32:21 1995
--- xc/programs/Xserver/hw/sun/sun.h	Mon Jan 30 17:32:21 1995
***************
*** 1,5 ****
--- 1,6 ----
  
  /* $XConsortium: sun.h,v 5.39.1.1 95/01/05 19:58:43 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/sun.h,v 3.1 1995/01/28 15:46:01 dawes Exp $ */
  
  /*-
   * Copyright (c) 1987 by the Regents of the University of California
***************
*** 63,73 ****
  #endif
  
  /* 
!  * Sun specific headers Sun moved in Solaris.
   *
   * Even if only needed by one source file, I have put them here 
   * to simplify finding them...
   */
  #ifdef SVR4
  # include <sys/fbio.h>
  # include <sys/kbd.h>
--- 64,80 ----
  #endif
  
  /* 
!  * Sun specific headers Sun moved in Solaris, and are different for NetBSD.
   *
   * Even if only needed by one source file, I have put them here 
   * to simplify finding them...
   */
+ #ifdef        __NetBSD__
+ # include <machine/fbio.h>
+ # include <machine/kbd.h>
+ # include <machine/kbio.h>
+ # include <machine/vuid_event.h>
+ #else
  #ifdef SVR4
  # include <sys/fbio.h>
  # include <sys/kbd.h>
diff -c xc/programs/Xserver/hw/sun/sunCfb.c:1.1.1.3 xc/programs/Xserver/hw/sun/sunCfb.c:3.1
*** xc/programs/Xserver/hw/sun/sunCfb.c:1.1.1.3	Mon Jan 30 17:32:22 1995
--- xc/programs/Xserver/hw/sun/sunCfb.c	Mon Jan 30 17:32:22 1995
***************
*** 1,5 ****
--- 1,6 ----
  
  /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.1 1995/01/28 15:46:02 dawes Exp $ */
  
  /*
  Copyright (c) 1990  X Consortium
***************
*** 246,254 ****
  /*
   * CG3_MMAP_OFFSET is #defined in <pixrect/cg3var.h> or <sys/cg3var.h>
   * on  SunOS and Solaris respectively.  Under Solaris, cg3var.h 
!  * #includes a non-existent file, and causes the make to abort.  Since all 
!  * cg3var.h is needed for is this one #define, we'll just #define it here 
!  * and let it go at that.
   */
  #define CG3_MMAP_OFFSET 0x04000000
  
--- 247,255 ----
  /*
   * CG3_MMAP_OFFSET is #defined in <pixrect/cg3var.h> or <sys/cg3var.h>
   * on  SunOS and Solaris respectively.  Under Solaris, cg3var.h 
!  * #includes a non-existent file, and causes the make to abort.  Other
!  * systems may not have cg3var.h at all.  Since all cg3var.h is needed
!  * for is this one #define, we'll just #define it here and let it go at that.
   */
  #define CG3_MMAP_OFFSET 0x04000000
  
***************
*** 267,272 ****
--- 268,276 ----
  
  #ifndef i386 /* { */
  
+ #ifdef __NetBSD__
+ #include <machine/cgtworeg.h>
+ #else
  #ifdef SVR4
  #include <sys/cg2reg.h>
  #else
***************
*** 276,281 ****
--- 280,286 ----
  #include <machine/cgtworeg.h>
  #endif
  #endif
+ #endif        /* __NetBSD__ */
  
  typedef struct {
      struct cg2memfb	mem;
diff -c xc/programs/Xserver/hw/sun/sunInit.c:1.1.1.3 xc/programs/Xserver/hw/sun/sunInit.c:3.1
*** xc/programs/Xserver/hw/sun/sunInit.c:1.1.1.3	Mon Jan 30 17:32:22 1995
--- xc/programs/Xserver/hw/sun/sunInit.c	Mon Jan 30 17:32:23 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: sunInit.c,v 5.54 94/12/23 16:49:38 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/sunInit.c,v 3.1 1995/01/28 15:46:04 dawes Exp $ */
  /*
   * sunInit.c --
   *	Initialization functions for screen/keyboard/mouse, etc.
***************
*** 463,469 ****
  	    key.kio_station = 118;
  	    if (ioctl(sunKbdPriv.fd, KIOCGETKEY, &key) == -1) {
  		Error( "ioctl KIOCGETKEY" );
! 		FatalError("Can't KIOCGETKEY on fd %d\n", kbdFd);
  	    }
  	    if (key.kio_entry != HOLE)
  		sunKbdPriv.type = KB_SUN4;
--- 464,470 ----
  	    key.kio_station = 118;
  	    if (ioctl(sunKbdPriv.fd, KIOCGETKEY, &key) == -1) {
  		Error( "ioctl KIOCGETKEY" );
! 		FatalError("Can't KIOCGETKEY on fd %d\n", sunKbdPriv.fd);
  	    }
  	    if (key.kio_entry != HOLE)
  		sunKbdPriv.type = KB_SUN4;
diff -c xc/programs/Xserver/hw/sun/sunIo.c:1.1.1.3 xc/programs/Xserver/hw/sun/sunIo.c:3.1
*** xc/programs/Xserver/hw/sun/sunIo.c:1.1.1.3	Mon Jan 30 17:32:23 1995
--- xc/programs/Xserver/hw/sun/sunIo.c	Mon Jan 30 17:32:23 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: sunIo.c,v 5.26.1.3 95/01/25 23:02:33 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/sunIo.c,v 3.1 1995/01/28 15:46:06 dawes Exp $ */
  /*-
   * sunIo.c --
   *	Functions to handle input from the keyboard and mouse.
diff -c xc/programs/Xserver/hw/sun/sunMfb.c:1.1.1.2 xc/programs/Xserver/hw/sun/sunMfb.c:3.1
*** xc/programs/Xserver/hw/sun/sunMfb.c:1.1.1.2	Mon Jan 30 17:32:24 1995
--- xc/programs/Xserver/hw/sun/sunMfb.c	Mon Jan 30 17:32:24 1995
***************
*** 1,5 ****
--- 1,6 ----
  
  /* $XConsortium: sunMfb.c,v 1.5 95/01/05 20:15:41 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/sun/sunMfb.c,v 3.1 1995/01/28 15:46:07 dawes Exp $ */
  
  /*
  Copyright (c) 1990, 1993  X Consortium
diff -c /dev/null xc/programs/Xserver/hw/xfree86/CHANGELOG:3.129
*** /dev/null	Mon Jan 30 17:32:31 1995
--- xc/programs/Xserver/hw/xfree86/CHANGELOG	Mon Jan 30 17:32:32 1995
***************
*** 0 ****
--- 1,1052 ----
+ XFree86 3.1.1 (30 January 1995)
+ 265. --- Code freeze ---
+ 264. Include final form of fix-11.
+ 
+ XFree86 3.1.0Zg (29 January 1995)
+ 263. Include final form of fix-10.
+ 262. Fix some merge problems.
+ 
+ XFree86 3.1.0Zf (28 January 1995)
+ 261. Merge in prelim version of XC fix-11.
+ 
+ XFree86 3.1.0Ze (28 January 1995)
+ 260. Merge in prelim version of XC fix-10.
+ 
+ XFree86 3.1.0Zd (28 January 1995)
+ 259. Merge in XC fix-09.
+ 258. Minor updates (mostly typographical) to smooth the fix-11 merge.
+ 257. Define X_LOCALE for Linux.
+ 
+ XFree86 3.1.0Zc (27 January 1995)
+ 256. Doc updates.
+ 255. Minor hw/xfree86 updates for fix-11 (Kaleb Keithley).
+ 254. Merge in XC fix-08.
+ 
+ XFree86 3.1.0Zb (26 January 1995)
+ 253. Rename some files under hw/xfree86 to avoid clashes when truncated to
+      8.3 type names as used on ISO9660 format CDROMs.
+ 
+ XFree86 3.1.0Za (25 January 1995)
+ 252. Minor pixmux clock limit update for Trio64 (Harald Koenig).
+ 251. Merge in XC fix-07.
+ 250. Some documentation updates.
+ 
+ XFree86 3.1.0Z (23 January 1995)
+ 249. Restore correct key maps for 84-key keyboard, but allow alternate (old)
+      behaviour when "ServerNumLock" is set in the XF86Config.
+ 248. xf86config updates (Harald Koenig).
+ 247. Remove stripes when panning with Ti3025 (Harald Koenig).
+ 246. Enable linear fb probing for VLB Trio64 cards with > 1MB DRAM
+      (Harald Koenig).
+ 245. Put blank delay values back to what they were for non-#9 Ti3025
+      boards (Harald Koenig).
+ 244. Fix AGX fill problems and hangs when exiting with an AGX-016 under
+      SVR4 (Henry Worth).
+ 243. Fix AGX font cache problem, and other updates/cleanups
+      (Henry Worth).
+ 
+ XFree86 3.1.0Ce (22 January 1995)
+ 242. Updates to vgawonder driver, including fix for 68800-6 memory probe,
+      and a reworking of the clock matching code (Marc Aurele La France).
+ 241. Remove most BIOS dependencies in vgawonder probe code
+      (Marc Aurele La France).
+ 240. Change ordering of Mach32 and Mach64 probing in SuperProbe, ati.test
+      and the vgawonder driver to avoid hanging Mach32 boards.  Also use
+      a timeout in all WaitIdle loops in the probes (Marc Aurele La France).
+ 239. Minor #9 GXE64Pro updates (Hans Nasten).
+ 238. Allow LASTLOG to be independent of SYSV_UTMP in xterm -- so it will
+      work for Linux (Helmut Geyer).
+ 
+ XFree86 3.1.0Cd (21 January 1995)
+ 237. Improve positioning of pixmap expansion and font cache areas with
+      the S3 server.
+ 236. Fix problem with Cirrus mono server crashing (Stephen Kump).
+ 235. Allow the "sw_cursor" option to work for the S3 server.
+ 234. Fix S3 HW cursor hot spot problem when no ViewPort entry is given in
+      the XF86Config (Harald Koenig).
+ 233. Fix some S3 Trio64 8bpp+pixmux display errors (Harald Koenig).
+ 232. Fix #9 GXE64Pro problems introduced in 3.1.0Cc (Hans Nasten).
+ 231. SPEA auto-detection for their Trio64 cards (Norbert Distler).
+ 230. Possible fix for keymap problems with 84-key keyboards.
+ 229. Internationalisation support for xterm (Martin Forssén).
+ 228. Remove the need for a Virtual entry in the XF86Config for the Mach64
+      server.
+ 
+ XFree86 3.1.0Cc (20 January 1995)
+ 227. Add a check to the W32 server for invalid depths.
+ 226. Fix bug in PaintWindow in Mach32 and AGX servers (Stuart Anderson).
+ 225. Chrontel 8391 programmable clock support (Richard Burdick
+      and Harald Koenig).
+ 224. S3 programmable clock code updates (Harald Koenig).
+ 223. Support for S3 Trio32 and Trio64 (Harald Koenig).
+ 222. Updates to S3 Ti3025 code for the Miro 40SV (Harald Koenig).
+ 221. Update xf86config to know about the latest clockchip changes
+      (Harm Hanemaayer).
+ 220. Minor cirrus HW cursor patch (Harm Hanemaayer).
+ 219. Updates to OAK driver, including mapping the linear fb above 64MB
+      (Jorge Delgado).
+ 
+ XFree86 3.1.0Cb (19 January 1995)
+ 218. Fix XLOCAL parsing problem introduced in XC fix-06 (Steve Forsythe).
+ 217. Added a DocIndex (to use as a starting point for the HTML docs).
+ 216. README.Oak (Jorge Delgado).
+ 215. SuperProbe/kbd_mode updates for compiling with PCVT_SUPPORT
+      (Joerg Wunsch).
+ 214. Fix for 90C31 acceleration problems.
+ 213. Don't use '-ansi -pedantic' for Solaris versions earlier than 2.4.
+ 
+ XFree86 3.1.0Ca (18 January 1995)
+ 212. S3 update for SPEA Mercury P64 (Norbert Distler).
+ 211. Late LBX updates from the XC.
+ 210. Add a "no_imageblt" option for the Cirrus driver (Harm Hanemaayer).
+ 209. Support for 2:1 pixmux 8bpp RAMDACs on boards with fixed clock chips.
+ 208. S3 changes for the ICS5342 ramdac/clock (Harald Koenig).
+ 207. Fix problem in miZeroClipLine() which can cause a server hang
+      (Harald Koenig).
+ 206. Fix register unlocking problem in S3 server (for Stealth 64 VRAM)
+      (Harald Koenig).
+ 
+ XFree86 3.1.0C (15 January 1995)
+ 205. Preliminary programmable clock support for the Mach64 server
+      (Kevin Martin).
+ 204. Add accelerated line code for the P9000 server and fix/update some
+      other accelerated code (Chris Mason).
+ 203. Allow XF86Config Videoram to override autodetection with the P9000
+      server, and allow the "vram_128" option force recognition of
+      128kx8 VRAM (Erik Nygren).
+ 202. Change P9000 programmable clock operation to be consistent with other
+      servers (Erik Nygren).
+ 201. Allow Cirrus MMIO for the 5429, and change on of the fixed clocks
+      in the Cirrus programmable clock code (Harm Hanemaayer).
+ 
+ XFree86 3.1.0Bf (14 January 1995)
+ 200. Preprocess Linux jump files, and allow libX11 to be built with XdmAuth
+      (Orest Zborowski).
+ 199. Fix VTSema-related problem in s3bstore.c (Henry Worth).
+ 198. Merge in XC's pre-fix-07 LBX code.
+ 
+ XFree86 3.1.0Be (12 January 1995)
+ 197. Include Japanese translations of some XFree86 3.1 docs (Kazuyuki Okamoto).
+ 196. Updates to SPEA detection code (Norbert Distler).
+ 195. Fix for ICS2595 initialisation problem (Norbert Distler).
+ 194. Some vgawonder driver fixes (Marc Aurele La France).
+ 193. Prevent xf86config from crashing when some fields are missing in
+      the Cards database (Matthieu Herrb).
+ 192. Fix S3 cursor X position when the display address is not changed to
+      avoid display errors.
+ 191. Set S3 M/N paramters depending on the MCLK value (which can be probed
+      or set in XF86Config) (Harald Koenig).
+ 
+ XFree86 3.1.0Bd (12 January 1995)
+ 190. Update cl64xx driver for modeRec changes.
+ 189. Merge in XC public fix-06.
+ 
+ XFree86 3.1.0Bc (11 January 1995)
+ 188. Added a DontZoom keyword for the XF86Config "ServerFlags" section
+      to disable the mode switching key sequences.
+ 187. Updates for ISC.  Includes imake config support for the SVR3 mmap
+      driver, updates to install.svr3, and patches for building lbxproxy
+      (Michael Rohleder).
+ 186. Fix 864 + STG1700 8bpp pixmux for clocks between 67.5 and 95 MHz
+      (Harald Koenig).
+ 185. Change VRAM timings for Diamond Stealth 64 VRAM (Harald Koenig).
+ 184. Set HSyncEnd overflow in S3 server when needed (Harald Koenig).
+ 183. Prevent C&T driver from pretending to support the 82c45x chipsets.
+ 182. Don't trap <ctrl><alt><bs> when DontZap is set.
+ 
+ XFree86 3.1.0Bb (10 January 1995)
+ 181. Updates to linear fb code for OTI087, and allow the FIFO threshold
+      to be set from XF86Config (Jorge Delgado).
+ 180. Add hooks for server/driver mode validation.  This is currently used
+      only by the NCR SVGA driver (Stuart Anderson).
+ 179. Fix for ET4000/W32 bank switching code in the SVGA et4000 driver
+      (David Etherton).
+ 178. Similar hw cursor move fix for S3 server.
+ 177. Fix for Cirrus crash when the hw cursor is moved while in another VT
+      (Harm Hanemaayer).
+ 176. Allow the "s3_964_bt485_vclk" to be used for the Diamond Stealth64 (VRAM).
+      This requires the "diamond" option (Harald Koenig).
+ 175. Rewrite xlfd_round_double() to speed it up on machines with no
+      hw floating point.  This reduces server startup time on such machines
+      (Harald Koenig).
+ 174. Reduce amount of floating-point calculation in icd2061a and S3 gendac
+      clock code (Harald Koenig).
+ 173. Probe code to detect some SPEA boards and correctly set the clockchip
+      (Norbert Distler).
+ 172. Allow Xservers to be built with only PCVT support on *BSD, and
+      clean up the console driver probing for *BSD (Joerg Wunsch).
+ 
+ XFree86 3.1.0Ba (8 January 1995)
+ 171. Change "ct5??" chips&tech names to "ct655??".
+ 170. Fix for Xnest (and Xvfb) not calling OsInitColors().
+ 169. Add support for relinking the Xnest server with the LinkKit.
+ 168. Modify vgawonder to probe clocks when -probeonly is used
+      (Marc Aurele La France).
+ 167. Fix some cirrus line drawing problems and fix non-interlaced modes
+      with vertical timings > 1024 (Harm Hanemaayer).
+ 166. Avoid use of the threads lib for SolX86 (David Holland).
+ 
+ XFree86 3.1.0B (4 January 1995)
+ 165. Support for C&T 65540/45 added to the SVGA server (Régis Cridlig).
+ 164. Change cirrus programmable clock code to use a tested set of clock
+      parameters when there is one close to the requested clock freqency
+      (Harm Hanemaayer).
+ 163. Fix cirrus BitBLTs with height > 1024 for 543x (Harm Hanemaayer).
+ 162. Clock-related updates to the vgawonder driver (reject invalid clocks
+      where possible) (Marc Aurele La France).
+ 161. Config updates (including installatiion of host.def and fix references
+      to cl64xx driver in xf86site.def) (Marc Aurele La France).
+ 
+ XFree86 3.1.0Ae (2 January 1995)
+ 160. Replace docs with the ascii versions generated from the sgml source.
+ 159. Major updates to xf86config(1), including the addition of a Cards
+      database (Harm Hanemaayer).
+ 158. Check and reject invalid XF86Config depths for the VGA16 and Mono
+      servers.
+ 157. Add an "s3_964_bt485_vclk" option to fix a problem with 964+Bt485.
+      Also added code to detect the MIRO 20SV board revision (Harald Koenig).
+ 156. Add an S3Mclk entry to XF86Config to allow the MCLK value to be specified
+      in order to aid the calculation of the optimal M parameter
+      (Harald Koenig).
+ 155. Fix S3 linear fb check and allow membase to work for 864/964 boards
+      (Harald Koenig).
+ 154. Move server lock code back into Xserver/os so that it gets used by
+      Xnest and Xvfb.
+ 
+ XFree86 3.1.0Ad (26 December 1994)
+ 153. Fix problems with DBLSCAN code introduced in 3.1.0Aa (Harm Hanemaayer).
+ 152. Support for adding LBX via the LinkKit.
+ 151. Fix some LinkKit config problems.
+ 150. Fix LinkKit Imakefile bug introduced in 3.1.0A.
+ 149. Support for SPEA Mercury P64 (Bt485 + 964) (Norbert Distler).
+ 148. Enable ICD2061A/SC11412 clockchip by default for S3 server if the
+      the "SPEA_Mercury" option is given and Bt485 + 964/928 is detected
+      (doesn't happen if an XF86Config entry for either ramdac or clockchip
+      is present) (Norbert Distler).
+ 147. Fix for PCI Type 2 probe for I128 SuperProbe code (Robin Cutshaw).
+ 146. Major Cirrus update.  Includes new acceleration using mmio (lines
+      tilefill and rectangles), and more acceleration for 16/32bpp
+      (Harm Hanemaayer).
+ 145. Fixes for AGX dashed line code (Henry Worth).
+ 144. Allow S3 server to put the cache in the area to the right of the screen
+      when it is larger than the area below it (Leonard N. Zubkoff).
+ 
+ XFree86 3.1.0Ac (20 December 1994)
+ 143. Imake template and rules for LinuxDoc-SGML formatting.
+ 142. Documentation converted to LinuxDoc-SGML (Gertjan Akkerman,
+      Jayadev Billa, Matthieu Herrb, Michael Klemme).
+ 141. Re-enable SO_REUSEADDR code in Xtranssock.
+ 
+ XFree86 3.1.0Ab (18 December 1994)
+ 140. Item 58. below (the patch didn't get included before).
+ 139. Add some sanity checking for horizontal timing parameters (including
+      HTotal overflow for 864 with 24bpp, pixmux and HTotal > 1024)
+      (Harald Koenig).
+ 138. Add check for 864 DCLK limit for 24bpp (Harald Koenig).
+ 137. Clean up of SDAC/GENDAC detection and related messages (Harald Koenig).
+ 136. Allow the following ramdac and clock chips to be specified by name:
+      att21c498 (att20c498), ics5300 (s3_gendac), ics5342 (s3_sdac),
+      ics9161a & dcs2824 (icd2061a).  (Harald Koenig)
+ 135. OS/2 updates, including config updates, SuperProbe support and
+      compile-time support for most of the Xserver (Holger Veit).
+ 134. Updated cl64xx driver, including support for the CL6440.  Note, the
+      driver name has changed from "cl6420" to "cl64xx" (Manfred Brands and
+      Randy Hendry).
+ 133. Fix VT switch problem with the SVGA MX driver (Frank Dikker).
+ 132. Add PCI config type 1 support to I128 probe in SuperProbe (Robin Cutshaw).
+ 131. Update support for STB Pegasus (928 + Bt485), including 16bpp and
+      32bpp (Leonard N. Zubkoff).
+ 130. Fix pixmux clock check in Mach32 server (Alan Hourihane).
+ 129. Mods to allow XFree86 servers to compile with 'gcc -ansi -pedantic'
+      on Solaris 2.x (David Holland).
+ 128. Fix stipple problem in S3 server.
+ 127. Fix for setuid-root xterm problem reading .Xauthority file on
+      nfs-mounted filesystem (so far only for systems with POSIX_SAVED_IDS)
+      (Christos Zoulas).
+ 126. Move server lock code into hw/xfree86 (Kaleb Keithley).
+ 125. Really fix Membase handling for S3 server and 805/928.
+ 124. Fix Mach32 probe problem.
+ 123. Fix SVR3 config problems (Michael Rohleder).
+ 
+ XFree86 3.1.0Aa (11 December 1994)
+ 122. Fix default mapping for numpad keys.  ServerNumLock should now not
+      be required (for clients using R6 Xlib).
+ 121. DoubleScan modes are no longer specified with doubled vertical timings.
+ 120. Add extra timings fields to the ModeRec which are the CRTC values
+      used by the hardware.
+ 119. Update oak driver to support linear mode for the oti-087 (Jorge Delgado).
+ 118. Fix '-DSTATIC_COLOR' problems (Hans Nasten).
+ 117. Fix typos which prevented Mach64 detection in SuperProbe from working
+      (Marc Aurele La France).
+ 116. Allow XF86Config settings to override ELSA probe (Harald Koenig).
+ 115. Fix Membase handling for S3 server and 805/928.
+ 114. Make BSD console driver support selectable from imake.
+ 113. Fix some SVR4 config problems.
+ 
+ XFree86 3.1.0A (5 December 1994)
+ 112. Mach64 pixmap cache fixes (Kevin Martin).
+ 111. Improve cirrus programmable clock handling (Harm Hanemaayer).
+ 110. Add code to SuperProbe to detect the #9 Imagine I128 (Robin Cutshaw).
+ 
+ XFree86 3.1.0g (2 December 1994)
+ 109. Enable mmio for the Cirrus 543x (Harm Hanemaayer).
+ 108. Updates to xf86config (Harm Hanemaayer).
+ 107. Code for SuperProbe to successfuly detect CL-GD543x (Harm Hanemaayer).
+ 106. Eliminate all references to "SYSV386".  "-Di386" should be used instead,
+      even in the BOOTSTRAPCFLAGS for SVR4 and SVR3 (Kaleb Keithley).
+ 105. Some typo changes to bring our code closer to what the XC has.
+ 
+ XFree86 3.1.0f (1 December 1994)
+ 104. Eliminate references to SYSV386.
+ 103. Add check for usable linear fb for 864/964 boards.
+ 102. Detect and reject Mach64 boards whose ROM or VGA capability has been
+      disabled (Marc Aurele La France).
+ 101. Expermental code in the vgawonder driver to reset Mach* boards.  This
+      is enabled with the "noaccel" option (Marc Aurele La France).
+ 100. Fix clashes with K_SCROLLLOCK and related symbols defined in newer
+      Linux releases (Marc Aurele La France).
+  99. Change SuperProbe to detect the Mach64, and deal with ATI DAC classes
+      6 and 7, and recognise the ATI 28800-6 chip (Marc Aurele La France).
+  98. ISC 3.x and 4.x support (Michael Rohleder).
+  97. Add support for 640 and 800 line widths to AGX server (Henry Worth).
+  96. Fix cursor/screen scrolling problem for doublescan modes (Henry Worth).
+  95. Add missing XF86_Mach64.c file.
+ 
+ XFree86 3.1.0e (27 November 1994)
+  94. Add missing install rule for gccmakedep.
+  93. Define CSRG_BASED for *BSD (Kaleb Keithley).
+  92. Code/prototype cleanup under hw/xfree86 (Kaleb Keithley).
+  91. Mach64 accelerated server (Kevin Martin).
+ 
+ XFree86 3.1.0d (22 November 1994)
+  90. Updates to NetBSD aperture driver (Matthieu Herrb).
+  89. Bring back 'gccmakedep' from 2.x.  Currently only use it when
+      UseInstalled is true.
+  88. Support for additional keys on Microsoft ergonomic keyboard (may
+      require support in the OS's console driver) (Kaleb Keithley).
+  87. Updates for SCO (David McCullough).
+  86. Don't require the Virtual size to be specifed for the Mach32 server.
+  85. Allow virtual widths < 1024 for Mach32 server (currently untested).
+  84. Some preliminary support for ISC (SVR3) 4.x (Michael Rohleder).
+  83. ET4000/W32 server updates.  Includes accelerated 32-bit opaque and
+      transparent stipple, acceleration for cases where the planemask != 0xFF,
+      and ramdac code changed to accomodate more ramdac types (Glenn Lai).
+  82. NetBSD support in hw/sun (Dennis Ferguson, Matthew Green, Matthieu
+      Herrb).
+  81. Fix xterm hang-on-exit problem on SolX86 2.4 (David Holland).
+  80. Speedups for AGX constant-metric and non-overlapping characters
+      (Henry Worth).
+  79. AGX accelerated dashed lines, and solid fills for arcs and polygons
+      (Henry Worth).
+  78. Doublescan support for the AGX server (Henry Worth).
+  77. Update AGX server to delete unusable modes, and to allow the virtual
+      width to be less than the display width (Henry Worth).
+  76. Fix typo in oak driver (which broke 067/077 support) (Jorge Delgado).
+  75. NetBSD updates, including SparcArchitecture support in imake config
+      (Matthieu Herrb).
+  74. 32bpp support for SPEA Mercury (928+Bt485) (Norbert Distler).
+  73. Modify Linux kbd code to read the "high_keys" mapping (Takashi Manabe).
+  72. Fix RGBPath in XF86Config being ignored.
+ 
+ XFree86 3.1.0c (6 November 1994)
+  71. Fix xload for FreeBSD 1.1.5 (Joerg Wunsch).
+  70. Modify S3 linear fb probe to handle the non-standard CR5A[6:7] address
+      mapping used by some Diamond boards (including the Diamond Stealth Pro).
+      Also, the 10 most significant bits of a specified MemBase value are
+      now used (which leads to an incompatibility with previous usage)
+      (Dick Streefland).
+  69. Fix clock matching and some other problems in vgawonder driver
+      (Marc Aurele La France).
+  68. Reduce RAS to 6 MCLKs for SPEA Mercury (Norbert Distler).
+  67. Fix setting of CR65 for the SPEA Mercury -- fixes 1600 width at 8bpp
+      and 1152 width at 16bpp (Norbert Dislter).
+  66. Change MCLK from 46MHz to 49MHz in the SC11412 clock code (Norbert
+      Distler).
+  65. S3 code to detect 866/868/968/Trio32/Trio64 and treat them as
+      an 864 (Harald Koenig).
+  64. Update SuperProbe to detect  STG1700, S3 GENDAC and SDAC, ATT22C498,
+      S3 Vision866, 868, 968, Trio32 and Trio64 (Harald Koenig).
+  63. Enforce 95MHz limit for 864 when no pixmux (eg, 16bpp) (Harald Koenig).
+  62. Increase pixmux cut-in point for ATT20C498 to 95MHz (Harald Koenig).
+  61. ATT22C498 detection and (untested) support (Harald Koenig).
+  60. New code for S3 SDAC/GENDAC detection, and enable the programmable
+      clock when one of these is detected (Harald Koenig).
+  59. Fixes for S3 RAMDAC detection (STG1700 and SDAC) (Harald Koenig).
+  58. Fix ICD2061A code for clocks between 110MHz and 120MHz (Harald Koenig).
+  57. Chips & Technology SVGA driver (Jon Block, Mike Hollick, Régis Cridlig).
+  56. 16/32bpp support for #9 boards with Ti3020 ramdac (Robin Cutshaw).
+  55. Fix bsdi.cf problems with gcc options (Hans Nasten).
+ 
+ XFree86 3.1.0b (30 October 1994)
+  54. 16/32bpp support for Elsa Winner2000Pro (964+Ti3020) (Dirk Hohndel).
+  53. Update to cirrus programmable clock code (Harm Hanemaayer).
+  52. Accelerated 16/32bpp bitblt for the Cirrus driver (Harm Hanemaayer).
+  51. The vgawonder driver will now attempt to determine what the board uses to
+      generate clocks (Marc Aurele La France).
+  50. Allow mode flags to specify composite sync polarity (Marc Aurele
+      La France).
+  49. ati.test and vgawonder driver updates (Marc Aurele La France).
+  48. Vgawonder driver will now attempt to use a default video mode (derived
+      from the existing CRTC settings) when no modes are specified in the
+      XF86Config (Marc Aurele La France).
+  47. Fix problem where clock probe could report high values as zero (Marc
+      Aurele La France).
+  46. SVGA driver for Avance Logic Inc. ali2301, ali2302, ali2308 and
+      ali2401 (Ching-Tai Chiu).
+  45. Enable linear aperture access for BSD/386 (Hans Nasten).
+  44. Some Linux xterm fixes (Orest Zborowski).
+  43. Fix Linux xdm groups setting problem (Orest Zborowski).
+  42. Allow Mach8 server to delete unsuitable modes (Hans Nasten).
+  41. Attempt at fixing FatalError() re-entrancy problems when aborting.
+  40. Add X server lock file code.
+  39. Modify PTS code in xtrans to remove an existing node at server startup
+      (as happens with UNIXCONN).
+  38. Set debug level to 1 in xtrans (this should allow error messages to
+      finally be seen).
+  37. Modify xtrans to use ErrorF() for debug/error messages within the
+      X server.
+  36. Updates to the S3MNAdjust option -- including no longer using global
+      variables (Harald Koenig).
+  35. Fix horizontal stripes when panning with an S3 805i (Harald Koenig).
+  34. Fix SDAC + pixmux patch (Harald Koenig).
+  33. Fix line-related crash problem when using linear addressing with
+      the SVGA server (Harm Hanemaayer).
+  32. Fix Cirrus 5434 linear addressing text blt bug (Harm Hanemaayer).
+  31. Fix Cirrus 14-pixel font bug (Harm Hanemaayer).
+  30. Improve Cirrus probing (Harm Hanemaayer).
+ 
+ XFree86 3.1.0a (21 October 1994)
+  29. Fix some missing globals in Linux libX11 (Orest Zborowski).
+  28. Fix for TCPCONN code's checking for an existing server.
+  27. Support for building ELF dynamic libs on Linux (Michael Riepe).
+  26. Fix gcc local label usage in vgaFasm.h (Adam Richter).
+  25. OS/2 client support (Holger Veit).
+  24. Fix some data initialisation problems in libX11 and libXt
+      (Christos Zoulas).
+  23. Use '-ansi -pedantic' with GCC when building the core tree.
+  22. Changes to vgaFasm.h to allow compilation with 'gcc -ansi -pedantic'.
+  21. Revised OAK driver which includes OTI-087 support (Jorge Delgado).
+  20. Don't use -lmalloc for FreeBSD 1.1.5 -- it seems to cause some server
+      crashes.
+  19. Change FreeBSD.cf to refer to the compiler as 'cc' instead of 'gcc'
+      (Rich Murphey).
+  18. Work around some problems GNU make 3.62 has with the rstart Imakefile
+      (Jim Tsillas).
+  17. Fix HW cursor problems after switching resolutions with the SVGA
+      server (Harm Hanemaayer).
+  16. Fix I/O permission problem with AL2101 driver (Harm Hanemaayer).
+  15. Preliminary doublescan mode flag support (Harm Hanemaayer).
+  14. Accelerated transparent text for Cirrus 5426/8 (Harm Hanemaayer).
+  13. Cirrus programmable clock support (Harm Hanemaayer).
+  12. Cirrus accelerated image text for 16/32bpp (Harm Hanemaayer).
+  11. Fix Cirrus HW cursor colour map at 16/32bpp (Harm Hanemaayer).
+  10. Fix 16bpp VC switch lockup on Cirrus 5426 (Harm Hanemaayer).
+   9. Fix SDAC 15/16bpp setup and 8bpp pixmux clock selection (Harald Koenig).
+   8. New (faster) S3 stipple code (Hans Nasten).
+   7. Add the xf86config program to the source tree (Harm Hanemaayer).
+   6. Gamma correction support for Ti3025 (Hans Nasten).
+   5. Add code to set 170MHz Bt485/20C505 limits for 32bpp.
+   4. Fix incorrect clock limit for ATT20C490 + programmable clock.
+   3. Fix S3 co-ord overflow check for bpp > 8.
+   2. Fix to S3 server to support newer #9 GXE64Pro boards (Robin Cutshaw).
+   1. Documentation updates.
+ 
+ XFree86 3.1 (29 September 1994)
+ 400. --- Code freeze ---
+ 399. Fix slow server death and VT switching problems with W32 server
+      (Glenn Lai).
+ 398. Fix problem with the W32 server not being installed set-uid (Hans Nasten).
+ 397. Fix problem with LinkKit Imakefile (Matthieu Herrb).
+ 396. Documentation updates.
+ 
+ XFree86 3.0Z (27 September 1994)
+ 395. Fix mouse access problem when server resets while not in the active VT
+      (Orest Zborowski).
+ 394. Fix typo in pvga1 driver (Simon Cooper).
+ 393. Documentation updates.
+ 392. Disable MMIO for Cirrus -- doesn't work yet (Harm Hanemaayer).
+ 391. Workaround for Cirrus GRF corruption in SVGA probe (Harm Hanemaayer).
+ 390. Update colourmap/blanking for W32 server (Glenn Lai).
+ 389. Fix clock ordering problem for vgawonder driver (Marc Aurele La France).
+ 388. Fix typo in Mach32 server which prevents it from starting at 16bpp
+      (Alan Hourihane).
+ 
+ XFree86 3.0Fe (26 September 1994)
+ 387. Fix for S3 line drawing overwriting HW cursor storage.
+ 386. Include Monitors and Devices files which contain the Monitor and Device
+      XF86Config sections that have been submitted (Gertjan Akkerman).
+ 385. Update Cirrus probing for 543x chips in SuperProbe (Harm Hanemaayer).
+ 384. Update ET4000/W32 probing for SuperProbe (Glenn Lai).
+ 383. 16bpp support for S3 GENDAC + 801/805 (Harald Koenig).
+ 382. Updates to S3 GENDAC code -- program best matching clock frequency
+      (Harald Koenig).
+ 381. Fix most pixel shift problems for #9GXE64Pro (Hans Nasten and
+      Robin Cutshaw).
+ 380. Don't allow the S3 "dac_8_bit" option to have any affect at 16/32bpp,
+      and fix related problem when using the SC15025 RAMDAC.
+ 379. Fix problem with Spea Mercury (Norbert Distler).
+ 378. Documentation updates.
+ 377. Updates to SolX86 aperture driver config (David Holland).
+ 376. Don't write mouse speed setting commands when using a non-logitech
+      protocols.
+ 
+ XFree86 3.0Fd (25 September 1994)
+ 375. AGX documentation updates (Henry Worth).
+ 374. Fix for text-mode restore problem with AGX server (Henry Worth).
+ 373. Change name of XF86Vga256Drivers to XF86SvgaDrivers.
+ 372. Documentation updates.
+ 371. Enable 16bpp, 32bpp for 964+Bt485.
+ 370. Support for 16bpp and 32bpp on 964+Bt485 -- tested so far on
+      Miro Crystal 20SV (Eddy Olk).
+ 369. Fix pixel wrapping for 964+Bt485 (Eddy Olk).
+ 368. Fix low-res mode support for GXE64Pro (Robin Cutshaw).
+ 367. Fix some depth 15 vs depth 16 code for the Ti3020 (Hans Nasten).
+ 366. Update W32 server (Glenn Lai).
+ 
+ XFree86 3.0Fc (24 September 1994)
+ 365. Fix image shift at 32bpp on GXE64Pro (Hans Nasten).
+ 364. Only initialise TrueColor visual for 16/32bpp since DirectColor is
+      not appropriate for the hardware.
+ 363. Man page updates.
+ 362. Fix installation problems with XF86Config man page.
+ 361. Disable some code in vgawonder driver that leads to problems with
+      SuperProbe (Marc Aurele La France).
+ 360. Change clock ordering (in some cases) for vgawonder driver so it
+      now depends only on the clock chip used (Marc Aurele La France).
+ 359. Fix S3 VT switching problem with #9 GXE64Pro (Robin Cutshaw).
+ 358. Added README.SOLX86 (David Holland).
+ 
+ XFree86 3.0Fb (23 September 1994)
+ 357. Enable ICS2595 clockchip support.
+ 356. Enable 32bpp for Ti3025+964.
+ 355. Change font cache and pixmap expansion allocation policy for S3
+      server.  This allows better performance when there isn't much
+      offscreen memory available (Hans Nasten). 
+ 354. Fix for banked ImageFill for bpp>8 (Hans Nasten).
+ 353. Updates to XF86_Accel man page.
+ 352. Remove references to 'Xconfig' in source code.
+ 351. Updates for ICS2595 code (Norbert Distler).
+ 350. Enable 16bpp for Spea Mercury.
+ 349. VTSema fixes for AGX server (Henry Worth).
+ 348. Updated 16bpp/32bpp support for 928+Bt485 (Norbert Distler).
+ 347. Partial support for 16bpp/32bpp with 964+Bt485 (Steve Parker).
+ 346. Fix Ti3025 pll save/restore, and set MCLK to 54.8MHz to eliminate
+      screen corruption (Hans Nasten).
+ 345. Fix for AGX tile SEGV (plus some cleanups) (Henry Worth).
+ 344. Update to solx86 aperture driver docs (David Holland).
+ 343. Fix problem with S3 mmio usage at 16bpp and 32bpp (Hans Nasten).
+ 342. Fix Mono VGA server crashes when compiled with gcc2.
+ 341. Updates to xterm for Linux to handle its UTMP style and lastlog
+      (Helmut Geyer).
+ 340. Remove some dependencies on removed cfb.banked.
+ 339. Fix Mach32 SW cursor SEGV.
+ 338. Prevent "nomemaccess" being used for S3 864/964.
+ 337. Change FreeBSD.cf to use gnumalloc for FreeBSD 2.x (Rich Murphey).
+ 336. Set weights correctly for Cirrus 32bpp (Harm Hanemaayer).
+ 335. Fix signal handling in xinit for SVR4 (David Holland).
+ 
+ XFree86 3.0Fa (21 September 1994)
+ 334. Fix problems with cirrus top/left edge handling with HW cursor
+      (Simon Cooper).
+ 333. Fix GC problem causing S3 server crash at 16bpp and 32bpp.
+ 332. Added copyright to the output of reconfig.
+ 331. Fixes for vgawonder driver (Marc Aurele La France).
+ 330. Update README.ati and ati.test.c (Marc Aurele La France).
+ 329. Fix potential problem with tranparent text for the cirrus 543x
+      (Harm Hanemaayer).
+ 328. Fixes for ICS2595 clock code (Norbert Distler).
+ 327. Remove cfb.banked.
+ 
+ XFree86 3.0F (20 September 1994)
+ 326. Fix problem building reconfig when BuildServersOnly is YES.
+ 325. Upates to README.FreeBSD (Rich Murphey).
+ 324. Fix P9000 problem starting at 16bpp (Erik Nygren).
+ 323. Fix AGX screen saver, and a flash that occurs when switching into
+      XGA mode (Henry Worth).
+ 322. Preliminary support for the ICS2595 clock chip (not enabled yet)
+      (Norbert Distler).
+ 321. Fix pixel shift problem with GXE64Pro at 8bpp and 16bpp (Robin Cutshaw).
+ 320. Change clock doubler transition to 80MHz for Ti3025 (Robin Cutshaw).
+ 319. Add README.Bsdi (Hans Nasten).
+ 318. Removed the need to specify the "elsa_w1000pro" and "elsa_w1000isa"
+      Options.
+ 317. Remove "stealth64" and "miro_crystal20sv" Options -- they are no longer
+      needed.
+ 
+ XFree86 3.0Ec (19 September 1994)
+ 316. Fixes for Ti3025 support -- fixes problem with machine lockups, and
+      adds preliminary 16bpp support (Robin Cutshaw).
+ 315. No longer allow 'Device' in the Keyboard section.  Must now use
+      'Protocol'.
+ 314. Updates to Cirrus BitBLT and fix for tile fill bug (Harm Hanemaayer).
+ 313. Disable Cirrus top/left edge HW cursor handling -- problems when
+      changing cursors near the edge.
+ 312. Fix another clock limit bug in S3 server.
+ 311. Disable Fresco by default.
+ 310. Updates to W32 server (Glenn Lai).
+ 
+ XFree86 3.0Eb (18 September 1994)
+ 309. Updates to README.NetBSD (Matthieu Herrb).
+ 308. Fix Mode Flags error reporting in xf86Config.c.
+ 307. Fix sessreg for Linux and add an install rule for it (Leonard N. Zubkoff).
+ 306. Fix xdm support with shadow passwords for Linux (Leonard N. Zubkoff).
+ 305. Fix typo in bsdi.cf (Hans Nasten).
+ 304. Support for Ti3025/#9GXE64pro (Robin Cutshaw).
+ 303. Don't include s3_svga driver in SVGA server by default.
+ 
+ XFree86 3.0Ea (17 September 1994)
+ 302. Update bsdi.cf so Gcc2 is default for versions 1.1 and later only
+      (Hans Nasten).
+ 301. Fix mfb.banked so it will compile with gcc 1.4x (Hans Nasten).
+ 300. Remove old Xconfig code.
+ 299. Fix some SEGV after FatalError() problems in xf86Config.c.
+ 298. Set max clock to 67.5MHz for Mach32 at 16bpp.
+ 297. Support for P9000 screen blanking at 16bpp and 32bpp (Erik Nygren).
+ 296. Merge in XC public fix-05.
+ 295. Trap bpp > 8 in S3 server for Bt485 and Ti RAMDACs since it doesn't work.
+ 294. Fixes for various xf86Config.c bugs.
+ 293. Fix S3 clock limits when using clock doubling RAMDACs.
+ 292. Fixes to  Ti3025 code to prevent lockups (Robin Cutshaw).
+ 291. Move S3 Bt485 probe to after the Ti3020/5 probe (Robin Cutshaw).
+ 290. Fix cirrus HW cursor behaviour at top and left edges (Simon Cooper).
+ 289. Set background colour mapping of Cirrus HW cursor correctly
+      (Simon Cooper).
+ 288. Allow cirrus hardware cursor to be used when accel is turned off
+      (Simon Cooper).
+ 287. Don't build shared lib for LBX on Linux (Orest Zborowski).
+ 286. Add README.Linux (Orest Zborowski).
+ 285. Fix P9000 cursor problems when VT switching (Erik Nygren).
+ 284. Update P9000 server to work with XF86Config (Erik Nygren).
+ 283. Fixes for Solaris 2.4 x86 build problems with reconfig and shm.c
+       (Doug Anson).
+ 
+ XFree86 3.0E (14 September 1994)
+ 282. Change the 'Device' entry in the Keyboard section of XF86Config to
+      'Protocol'.
+ 281. Update the M magic formula for S3 server (Harald Koenig).
+ 280. Disable TI3025 support in S3 server -- it is incomplete.
+ 
+ XFree86 3.0Dl (13 September 1994)
+ 279. XF86Config(4/5) manual page.
+ 278. LinkKit support for the W32 server.
+ 277. Change HW cursor code to position cursor next to the top/left edges
+      instead of disappearing (Harm Hanemaayer).
+ 276. Add code to the Cirrus driver to determine clock limits based on the
+      available DRAM bandwidth (Harm Hanemaayer).
+ 275. Add an "S3MNAdjust" entry to the Device section of the XF86Config
+      to allow tuning of the M and N parameters in the S3 server (Harald
+      Koenig).
+ 274. Add a Gamma entry to the Monitor section in the XF86Config (Harald
+      Koenig).
+ 273. Don't strip server binaries when installing.
+ 272. Set PLL limits in S3 server for S3 GENDAC and SDAC.
+ 
+ XFree86 3.0Dk (11 September 1994)
+ 271. Add check for incorrect Modes line in XF86Config.
+ 270. Add some sanity checks to S3 server for supported depths.
+ 269. Fix SEGV during startup of VGA16 server.
+ 268. Support for HW cursor in the Cirrus driver (Simon Cooper).
+ 267. Fix LinkKit Imakefile for building SVGA server (Simon Cooper).
+ 266. Update lnxLib.rules for new dll tools (Orest Zborowski).
+ 265. Add code to the VGA servers to handle drivers (like tvga with 512k
+      in 256 colour mode) which require scaling of the raw clock to give
+      the pixel clock.
+ 264. Add code to the VGA servers to handle drivers (like the generic 256
+      colour driver) which use only builtin modes.
+ 263. Fix bitPerRGB reported by the SVGA server.
+ 262. ET4000/W32 accelerated server (Glenn Lai).
+ 261. Fix for AGX rect tile and stipple code (Henry Worth).
+ 260. Add checks for the presence of Modes lines to servers that require them.
+ 259. S3 code to handle limits imposed by clock chips.
+ 258. Fix S3 pMode->SynthClock code (Harald Koenig).
+ 257. Fix S3 raw clock setting for SC15025 (Harald Koenig).
+ 256. Fixes for Mach32ImageStipple (Mike Bernson).
+ 255. Improve AGX support for the Hercules dual RAMDACs, provide
+      better screen blanking at startup, and fixe memory probe (Henry Worth).
+ 254. Add clockchip "ti3025" recognition (Hans Nasten).
+ 253. Fix xf86Config handling of ClockChip (Harald Koenig).
+ 252. Fix xf86Config handling of default colour weights (Harm Hanemaayer).
+ 251. P9000 updates (Erik Nygren).
+ 250. Fix SEGV problem in Mach32 font cache code.
+ 249. S3 code to handle clock/bpp/ramdac dependent raw-clock vs pixel clock
+      scaling.
+ 
+ XFree86 3.0Dj (8 September 1994)
+ 248. Fixed and enabled ImageRead in CopyArea for P9000 server (Chris Mason).
+ 247. Fixed xdm server restart problem with P9000 server (Erik Nygren).
+ 246. Added a sample XF86Config file that gets installed as
+      $(LIBDIR)/XF86Config.eg.
+ 245. Change search method for XF86Conifg file.  Only allow user-specified
+      location when real-uid == 0.  Also change -xconfig flag to -xf86config,
+      and $XCONFIG to $XF86CONFIG.
+ 244. Fix reconfig's problem with "ps/2" (Orest Zborowski).
+ 243. External changes for W32 server (Glenn Lai).
+ 242. Change ELSA probe to check for BIOS signature first (Harald Koenig).
+ 241. Preliminary support for the Ti3025 & #9GXE64pro (Robin Cutshaw).
+ 
+ XFree86 3.0Di (7 September 1994)
+ 240. Remove AGX server's dependence on VGA256 (Henry Worth).
+ 239. Fix display start address in vgawonder driver for Mach32 and Mach64
+      boards (Marc Aurele La France).
+ 238. Fix clock probling in vgawonder driver for Mach64 boards
+      (Marc Aurele La France).
+ 237. vgawonder driver now detects and rejects Mach32 boards without
+      VGA Wonder functionality (Marc Aurele La France).
+ 236. Add ClockChip XF86Config keyword for programmable clock chips.
+ 235. Add a FIFO_MODERATE option for AGX server (Henry Worth).
+ 234. Limited support for Big-RAMDAC and dual-RAMDAC for 2MB Hercules
+      Graphite cards (Henry Worth).
+ 233. Eliminate use of libvga256 in AGX server (Henry Worth).
+ 232. Convert AGX code to use the Ramdac keyword instead of Options (Henry
+      Worth).
+ 231. Fix (?) ELSA probe code's register restoral.
+ 230. Auto-detection code for the NetBSD aperture driver (Matthieu Herrb).
+ 229. Change OpStipple interface in font code (Hans Nasten and Jon Tombs).
+ 228. Fix clock and register restoration in P9000 server (Chris Mason,
+      Harry Langenbacher, Erik Nygren).
+ 227. Fix Orchid P9000 support (Harry Langenbacher).
+ 226. Fix BIOS Probe for Viper PCI (Bob Hollinger).
+ 225. 16bpp/32bpp support code for SVGA server.  Cirrus 16bpp/32bpp support
+      is now enabled (Harm Hanemaayer).
+ 224. Fix Mach32 cache problems (Mike Bernson).
+ 223. Fix Mach32 memory probe.
+ 222. xf86Config and reconfig bug fixes.
+ 
+ XFree86 3.0Dh (4 September 1994)
+ 221. Added minimal reconfig(1) man page so that 'make install.man'
+      doesn't fail.
+ 220. Combine Stealth64 and Miro Crystal 20SV code.  This should fix
+      some Stealth64 problems.
+ 219. Fix InstallManPageAliases rule for FreeBSD (Ernest Hua).
+ 218. 16bpp and 32bpp support for Cirrus driver -- still requires some changes
+      to the SVGA server, so not enabled yet (Harm Hanemaayer).
+ 217. Fixes for Mach32 cache clipping problems (Mike Bernson).
+ 216. 32bpp S3 updates for ELSA cards (Harald Koenig).
+ 215. Updates to new XF86Config code.
+ 
+ XFree86 3.0Dg (3 September 1994)
+ 214. Change over to new config file format -- XF86Config (Gertjan Akkerman).
+ 
+ XFree86 3.0Df (31 August 1994)
+ 213. Amoeba support updates (Kees Verstoep).
+ 212. Fixes for Viper PCI support (Matt Thomas).
+ 211. MoveWindow acceleration for all depths on P9000, and acceleration
+      now enabled by default (Chris Mason).
+ 210. P9000 updates.  Includes updates to sysconfig code, Orchid and PCI
+      support now enabled by default (Erik Nygren).
+ 209. SuperProbe and ModeDB updates (David Wexelblat).
+ 208. Support for the S3 805i and 16-bit RAMDACS (including ATT20C498, 
+      STG1700, SDAC) (Bernhard Bender).
+ 207. Support for the S3 SDAC with S3 864 (Bernhard Bender).
+ 206. Basic support for ET4000W32 chipsets in the VGA servers.  Includes
+      chipset detection and code to handle up to 4MB video memory (Harm
+      Hanemaayer).
+ 205. Mach32 server modified to use generic cache code (Mike Bernson).
+ 204. Allow pixmap expansion for display widths <= 800 in S3 server.
+ 203. Updates for SCO (including 3.2.4 and international crypt support)
+      (David McCullough).
+ 202. Use mi cursor for 32bpp on S3 928 because HW cursor is broken (Harald
+      Koenig).
+ 201. Fix nomemaccess code in s3im.c (Harald Koenig).
+ 200. Code to auto-detect ELSA Winner cards, and automatically enable the
+      icd2061a clock (Harald Koenig).
+ 199. Fix for 32bpp S3 font cache problems (Harald Koenig).
+ 198. Support for a linear addressing mode in the Cirrus driver (Harm
+      Hanemaayer).
+ 197. Performance improvements for the "fastvga256" asm code (Harm Hanemaayer).
+ 196. Fix for Cirrus problem caused by pvga1 probe.
+ 195. Code added to S3, Mach8 and VGA servers to delete modes from the
+      "Modes" line which would previously have caused the server to
+      not start (Stuart Anderson).  Note: the Mach32 server already had
+      this code.
+ 
+ XFree86 3.0De (20 August 1994)
+ 194. Add run-time check for SHM kernel support on FreeBSD and NetBSD.
+ 193. Updates to xload for Solx86 (David Holland).
+ 192. Fix NULL dereference in showfont (David Holland).
+ 191. xconsole and doc updates for NetBSD 1.0_BETA (Matthieu Herrb).
+ 190. Major Cirrus driver update.  Includes faster solid, stipple and tile
+      filling, improved text acceleration, blt in background, shadow I/O
+      registers, optional MMIO support for 543x (Harm Hanemaayer).
+ 189. Support for the miroCRYSTAL 20SV (S3 964) (Eddy Olk).
+ 188. Preliminary 32bpp S3 support (Harald Koenig).
+ 187. Make Trucolor the default root visual for 15/16/24bpp S3 (Harald Koenig).
+ 186. Fix S3 16bpp for 1024x768 and 1152x900 and some panning problems
+      (Harald Koenig).
+ 185. Fix tiling problem, and VT switch problems for S3 16bpp (Harald Koenig).
+ 184. Fix for Ti3020 ramdac support at >8bpp (Robin Cutshaw).
+ 183. AGX server fixes.  Includes CopyPlane, (vga) save/restore, SC15021 CLUT
+      access, scratchpad config.  (Henry Worth).
+ 182. Merge in XC public fix-04.
+ 
+ XFree86 3.0Dd (12 August 1994)
+ 181. Fix for unnecessary read-ahead in mfbblt, and remove the '-32' display
+      width restriction (Pascal Haible, Gertjan Akkerman).
+ 180. Support for SGS/inmos STG1700 RAMDAC -- S3 server (Bernhard Bender).
+ 179. Performance improvements for AGX server (Henry Worth).
+ 178. More 15/16bpp fixes for S3 (Harald Koenig).
+ 
+ XFree86 3.0Dc (11 August 1994)
+ 177. Various 15/16bpp S3 fixes (Jon Tombs, Harald Koenig).
+ 176. 16bpp support for ATT 20C490 (Jon Tombs).
+ 175. 16/24/32bpp code for SC15025 (Harald Koenig).
+ 174. Support for gamma correction in S3 server (Harald Koenig).
+ 173. Probe code for the SC15025 (S3 server and SuperProbe) (Harald Koenig).
+ 
+ XFree86 3.0Db (6 August 1994)
+ 172. Patches for N.M value triming (Harald Koenig).
+ 171. ATT20C498 and 864 support for 15/16/24bpp in S3 server (Harald Koenig).
+ 170. Ti3020 and Bt485 Ramdac support for 15/16/24bpp in S3 server
+      (Robin Cutshaw).
+ 169. Fix problems building debugging libFS (Christos Zoulas).
+ 168. Remove XOR'd extended register addressing in S3 server.
+ 
+ XFree86 3.0Da (3 August 1994)
+ 167. Use XOR'd extended register addresses for S3 server -- avoids clash
+      with "COM4" I/O address (Jon Tombs).
+ 166. 16bpp S3 support (no ramdac initialisation yet) (Jon Tombs).
+ 
+ XFree86 3.0D (1 August 1994)
+ 165. Fix for text restore problems with cl6420 driver (Manfred Brands).
+ 164. Change S3 screensaver code to do the same thing as the vga256 code
+      (Bernhard Bender).
+ 163. Update Cirrus driver for vga256 changes (Harm Hanemaayer).
+ 162. Fixes for font scaling problems on SVR4 (David Wexelblat).
+ 161. Remove all of the old unused pixmap cache code (David Wexelblat).
+ 160. Use generic font cache code for S3 server (David Wexelblat).
+ 159. Native AGX code for Save/RestoreAreas, CopyWindow and PaintWindow
+      (Henry Worth).
+ 158. Change AGX clock mappings -- see README.agx for details (Henry Worth).
+ 157. Update AGX server for vga256 changes (Henry Worth).
+ 156. Xtest fix for Linux (Erik Nygren).
+ 155. Speedup for cached text output in Mach8 and 8514 servers (Hans Nasten).
+ 154. Workaround for 6225 with LCD where full on white pixels cause display
+      problems (Philip Homburg).
+ 153. Fix memory handling for Mach8 boards with the SVGA vgawonder driver
+      (Marc Aurele La France).
+ 152. Fix some build problems on NCR SVR4 (Stuart Anderson).
+ 151. Fix problem which caused xjewel to lock up the S3 server when running
+      in linear mode (Harald Koenig).
+ 150. xman support for gzip'd man pages.
+ 149. Fix LinkKit problems.
+ 148. Omit monitor ID check in 8514 server.
+ 147. Fix card ident problem with ati driver.
+ 146. Fix asm problem in new pvga1/bank.s.
+ 145. Fix programs/Imakefile error.
+ 
+ XFree86 3.0Ce (24 July 1994)
+ 144. Alternate "SlowBcopy()" which avoids I/O (which causes problems on
+      some cards) (Glenn Lai).
+ 143. Restore original mouse baud rate when exiting and VT switching (Harald
+      Koenig).
+ 142. pvga1 driver updates.  Includes 90C33 support for 2MB, and accel code
+      updates (Bill Conn and Bill Morgart).
+ 141. Major updates to the SVGA ATI vgawonder driver.  Includes support for
+      4MB, probe code to detect Mach8, Mach32 and Mach64 boards, RAMDAC
+      detection, clock probe update to handle the clock chip used on Mach64
+      boards, and fixes for V3, V4 and V5 boards (Marc Aurele La France).
+ 140. Support for BuildServersOnly option to build only the servers using
+      a cut-down source tree (Gertjan Akkerman).
+ 139. Preliminary P9000 accelerated support (currently incomplete and
+      disabled by default) (Chris Mason and Erik Nygren).
+ 138. Preliminary Viper PCI, Orchid P9000 support (currently disabled by
+      default) (Erik Nygren).
+ 137. Replace the cfb.banked code with fb code which relies more on the
+      standard cfb code.  For further details see the file "Design" in
+      xfree86/vga256/vga/ (Stuart Anderson).
+ 
+ XFree86 3.0Cd (22 July 1994)
+ 136. Add dacspeed Xconfig keyword, and modify the S3 server to use it.
+ 135. Update contrib source to the XC's full release version.
+ 134. Fix pixel doubling problem on #9 GXE64 cards (Robin Cutshaw).
+ 133. Change '--print' to 'print-libgcc-file-name' in Linux config files
+      for compatibility with gcc 2.6 (Orest Zbrowoski).
+ 
+ XFree86 3.0Cc (19 July 1994)
+ 132. Make use of the Xconfig Ramdac keyword in the S3 server.
+ 131. Improved support for the ELSA W2000Pro (Dirk Hohndel).
+ 
+ XFree86 3.0Cb (16 July 1994)
+ 130. Updated xc/bug-report for XC fix-03.
+ 129. Don't mark duplicate clocks as zero in VGA servers.
+ 128. Support for #9GXE64 in S3 server (Robin Cutshaw).
+ 127. Tiled pixmap/stipple expansion for the S3 server (David Wexelblat).
+ 126. Tiled pixmap/stipple expansion for Mach8 and 8514 servers (Hans Nasten).
+ 125. P9000 updates.  Includes colour restoration fix, changes in Modes
+      processing, and removal of banking support (Erik Nygren).
+ 124. 16 and 32 bpp TrueColor support for the P9000 server (Erik Nygren).
+ 123. Updates to AGX server.  Includes font cache fixes, line fixes and
+      some more tuning options (Henry Worth).
+ 122. Aperture driver for NetBSD (Matthieu Herrb).
+ 121. Added basic man page for beforelight (Rich Murphey).
+ 120. Swap order of libXExExt and libXext.
+ 119. Remove the temporary Mach32ShareCfb option.
+ 
+ XFree86 3.0Ca (28 June 1994)
+ 118. NetBSD updates (Christos Zoulas).
+ 117. Various updates for Minix (Philip Homburg).
+ 116. Support for including the MIT-SCREEN-SAVER extension (David Holland).
+ 115. Fixes for AGX font cache code (Henry Worth).
+ 114. Banking support for P9000 (doesn't seem to work yet) (David Moews).
+ 113. Text restoration code for P9000 (Chris Mason).
+ 
+ XFree86 3.0C (22 June 1994)
+ 112. Fix server crash when started with a lock key on.
+ 111. Recognise 864/964 PCI as capable of linear memory access.
+ 110. Fix ramdac access and clock probe problems with AGX server (Henry Worth).
+ 109. Support for Stealth 64 (S3 964 + Bt485) (Steven Parker).
+ 108. Fix for 4-pixel border problem with S3 864 pixmux (Harald Koenig).
+ 107. Allow the S3 SVGA driver to recognise the 864 and 964 (Harald Koenig).
+ 106. Improved 5434 support, and accelerated copyPlane1to8 for cirrus
+      (Harm Hanemaayer).
+ 
+ XFree86 3.0Bc (19 June 1994)
+ 105. Fix VT switch problem in 16bpp Mach32 when sharing cfb.
+ 104. Add framework for a ramdac Xconfig setting (like chipset).
+ 103. Reorganise mode/clock matching code (Marc Aurele La France).
+ 102. Fix server's client count problem after authorisation failure.
+ 101. Option "power_saver" to enable power-down mode on "green" monitors.
+      So far this is implemented only for VGA (all depths) and S3 servers.
+ 100. Remove old "memaccess" S3 option.
+  99. Add Option "pci_hack" to work around a lockup problem reported with
+      some 928-P cards.
+  98. Fix S3 928-P detection/reporting.
+  97. Don't allow S3 "nomemaccess" option for 864/964 chipsets.
+  96. Make cbrt a library -- removes the need for NeedCbrt on Linux
+      (Marc Aurele La France).
+  95. Change ATI SVGA driver to Marc Aurele La France's version
+      (includes support for Vga2 and Vga16).
+  94. Function prototyping for AGX, and prototype cleanup in vga16 (Stuart
+      Anderson).
+  93. Fix (not complete?) problem with dual-headed servers.
+ 
+ XFree86 3.0Bb (16 June 1994)
+  92. AGX server (Henry Worth).
+  91. Accelerated support for 90C33 (Bill Conn).
+  90. Use s3ImageWriteFunc to load S3 cursor.
+  89. Fix problems with SPEA Mercury for clocks > 120MHz (Norbert Distler).
+  88. Code to program S3 GENDAC clock (Clocks "s3gendac") (Jon Tombs).
+  87. Fix some build problems with lbx.
+  86. Build servers with -DAVOID_GLYPHBLT.
+ 
+ XFree86 3.0Ba (11 June 1994)
+  85. Preliminary ELSA Winner 2000PRO support (S3 964) (Dirk Hohndel).
+  84. Updates to S3 864 support (Harald Koenig).
+  83. Merge in XC fix-02.
+ 
+ XFree86 3.0B (6 June 1994)
+  82. bitblt fixes (including big memory leak) for 8514, Mach8, Mach32 and
+      S3 servers (Tiago Gons).
+  81. line/seg fixes for 8514 and Mach8 servers (Tiago Gons).
+  80. Remove separate cfb libs for Mach32 (only compile-tested so far).
+  79. Restore hw/xfree86/etc directory.
+  78. Update bsdinst.sh for SVR4 (use /usr/ucb/install, and run 'mcs -d'
+      as well as strip).
+  77. Cirrus driver updates (Harm Hanamaayer).
+  76. Mach support (Robert Baron).
+ 
+ XFree86 3.0Ac (1 June 1994)
+  75. Amoeba fixes (Kees Verstoep).
+  74. Fixes for Mach32 dashed line/segment code (Mike Bernson).
+  73. Preliminary 90C33 support (Bill Conn).
+  72. NetBSD.cf updates, and README.NetBSD added (Matthieu Herrb).
+  71. Preliminary support for the ELSA Winner 1000PRO-VL-2 (Harald Koenig).
+  70. Add "weight" and "displayWidth" entries to ScrnInfoRec.
+  69. Banked vga2 server (Pascal Haible).
+  68. Font cache changes for the Mach8 and 8514 servers.  This allows them
+      to work without a font cache, and should allow their use with 512k
+      Mach8 cards.  (Hans Nasten)
+  67. Don't include XIE in the Mono and VGA16 servers (it doesn't handle
+      bit-order != byte_order).
+  66. Add LinkKit and updated VGADriverDoc.
+ 
+ XFree86 3.0Ab (28 May 1994)
+  65. Add support for gzip'd man pages on FreeBSD.
+  64. P9000 server (Erik Nygren).
+  63. Video7 SVGA driver (Craig Struble).
+  62. CL6420 SVGA driver (Manfred Brands).
+  61. Set default paths for xdm for *BSD (so {Give,Take}Console can find chown).
+  60. Add a hw/xfree86/doc directory, and start putting the docs back.
+  59. Fixes for Amoeba support (Kees Verstoep).
+ 
+ XFree86 3.0Aa (22 May 1994)
+  58. Merge in XC public fix-01.
+  57. Updates to FreeBSD.cf.
+  56. Add xf86site.def which can optionally be included from site.def.
+  55. SCO support and some bug fixes (David McCullough).
+  54. Some initial untested S3 864/964 code (Harald Koenig).
+  53. Fix for bsdLib.tmpl.
+  52. STREAMSCONN fixes for xdm, chooser and Xserver XDMCP code (Stuart
+      Anderson).
+ 
+ XFree86 3.0A (15 May 1994)
+  51. SVGA driver for the AL2101 chipset (Paolo Severini).
+  50. SVGA driver for the MX68000 and MX68010 chipsets (Frank Dikker).
+  49. Updates to the Cirrus driver (Harm Hanemaayer).  Includes code cleanup,
+      mono support, improved handling of the 5430, 5434, and transparent
+      text acceleration.
+  48. Preliminary code for detecting S3 864/964 and AT&T 20C498 (Harald Koenig).
+  47. Generic VGA256 driver -- works only at 320x200 (Harm Hanemaayer)
+  46. Fixes for vga2/mfb and vga16/mfb Imakefiles.
+  45. Include SuperProbe.
+ 
+ XFree86 3.0d (8 May 1994)
+  44. Add missing files to vga2/mfb.
+  43. Set VendorString and VendorRelease up for XFree86.
+  42. Workaround for STREAMSCONN Xdmcp problems (Xserver and xdm).
+  41. 16 bit (directcolor) support for Mach32 (Craig Groeschel).
+  40. Minix 3886vm support (Philip Homburg).
+ 
+ XFree86 3.0c (6 May 1994)
+  39. Fixes for Solaris X86 (Doug Anson).
+  38. No longer link the Mono and VGA16 servers with Xserver/mfb/libmfb.a.
+  37. Updates to the VGA16 code (Gertjan Akkerman).  Includes banking support
+      (old-style rather than the Xsvga method), staticcolor visual, oak
+      driver enabled, added some missing files to vga16/mfb.
+  36. Fix Linux shared libs (Orest Zborowski)
+  35. Apollo mono driver (Hamish Coleman)
+  34. Support for dual-headed vga2+mono and vga16+mono servers (Pascal Haible).
+  33. Reorganisation of the mono server (Pascal Haible).  Includes removing
+      xfree86/bdm2, xfree86/hga2, and replacing them with xfree86/mono.
+  32. Fixes for PEX font compiler (from our 940327a snapshot).
+  31. Fix SIOCGIFCONF code in xdm and Xserver for SVR4 (with Lachman TCP)
+      and FreeBSD.  There are still xdm and chooser problems on SVR4.
+ 
+ XFree86 3.0b (29 April 1994)
+  30. Add S3 driver to SVGA server.
+  29. Disable accelerated text blit for Cirrus 543x.
+  28. Reorder some of the Bt485 code, and get clock doubling working again
+      without pixmux.
+  27. Fix image shift problem for pixmux on #9 cards (Robin Cutshaw).
+  26. Fix initialisation bug for Cirrus 62{2,3}5 cards (Harm Hanemaayer).
+  25. Remove 8514 monitor ID check in Mach8 server.
+  24. Fix for problem with compaq driver.
+  23. Add "no_bitblt" option for the cirrus driver.
+  22. Recognise the 5429 in the cirrus driver.
+  21. Disable interrupts while programming the ICD2061A.
+  20. sync-on-green support for the TI3020.
+  19. Move S3 clock doubler setting from icd2061ClockSelect() to s3Init().
+  18. Fix dac_8_bit for Bt485 cursor, and fix Bt cursor blanking problem.
+  17. S3 pixmux support for STB Pegasus, and cleanup of pixmux and icd code.
+      (Leonard Zubkoff).
+  16. Change "fifo_conservative" setting for CLGD543x.
+  15. Don't reserve video memory for HW cursor on S3 when using a RAMDAC cursor.
+  14. Allow the "8clocks" option to force 9 clocks instead of 17 on WD90C3{0,1}
+      cards.
+  13. Fix some DEALLOCATE_LOCAL problems in accel servers.
+  12. Support for Bt485 on #9 cards (Robin Cutshaw).
+  11. Fixes for Cirrus driver (Harm Hanemaayer).
+  10. Fix for text restore problem on some S3 cards (Jon Tombs).
+   9. Workaround for Mach32 detection problem on some platforms.
+   8. Fix incorrect usage of $(DESTDIR) in some lnxLib.rules.
+   7. Code to detect 928-P (Harald Koenig).
+   6. Fix cbrt() in mi/ so that it can handle negative arguments.
+   5. Fix for line clipping problem in cfb.banked (Glenn Lai).
+ 
+ XFree86 3.0a (28 April 1994)
+   4. Add XFree86 server names to the list in xinit.
+   3. Set XawI18nDefines correctly for SVR4.0.
+   2. Update ncr.cf to pick up AllocateLocalDefines when building servers.
+   1. Fold in client/lib OS support not picked up by the XC.
+ 
+ XFree86 3.0 (26 April 1994)
diff -c /dev/null xc/programs/Xserver/hw/xfree86/CHANGELOG.R5:3.0
*** /dev/null	Mon Jan 30 17:32:33 1995
--- xc/programs/Xserver/hw/xfree86/CHANGELOG.R5	Mon Jan 30 17:32:34 1995
***************
*** 0 ****
--- 1,1249 ----
+ XFree86 2.1.1 (4 May 1994)
+  36. Fix server crash on reset problem in Mach32 and S3 servers
+  35. Fix typos in apollo driver
+  34. Fix for Imake config problem on ISC 4.0
+  33. ET3000 memory probe fix for SuperProbe
+  32. Documentation updates
+  31. Some updates for NetBSD-current
+ 
+ XFree86 2.1.0B (26 April 1994)
+  30. Disable accelerated text blit for Cirrus 543x
+  29. Reorder some of the Bt485 code, and get clock doubling working again
+      without pixmux
+  28. Disable the PIXMUX_SWITCH_HACK stuff -- it doesn't seem needed any more
+  27. Fix image shift problem for pixmux on #9 cards (Robin Cutshaw)
+  26. Fix initialisation bug for Cirrus 62{2,3}5 cards (Harm Hanemaayer)
+  25. Remove 8514 monitor ID check in Mach8 server
+  24. Updates to the NetBSD README (Matthieu Herrb)
+  23. Hey Rocky, watch me unbreak the Compaq driver... This time for sure...
+ 
+ XFree86 2.1.0Ab (16 April 1994)
+  22. Rewrite of ATI SVGA driver (Marc La France)
+  21. Add "no_bitblt" option for the cirrus driver
+  20. Recognise the 5429 in the cirrus driver
+  19. Disable interrupts while programming the ICD2061A
+  18. sync-on-green support for the TI3020
+  17. Move S3 clock doubler setting from icd2061ClockSelect() to s3Init()
+  16. Fix dac_8_bit for Bt485 cursor, and fix Bt cursor blanking problem
+  15. SuperProbe updates
+ 
+ XFree86 2.1.0Aa (10 April 1994)
+  14. BDM2 apollo driver (Hamish Coleman)
+  13. S3 support for switching between pixmux and non-pixmux modes
+      (Amancio Hasty)
+  12. S3 pixmux support for STB Pegasus, and cleanup of pixmux and icd code
+      (Leonard Zubkoff)
+  11. Change "fifo_conservative" setting for CLGD543x
+  10. Updates for NetBSD-current, including bumping shared lib revs
+ 
+ XFree86 2.1.0A (7 April 1994)
+   9. Don't reserve video memory for HW cursor on S3 when using a RAMDAC cursor
+   8. Allow the "8clocks" option to force 9 clocks instead of 17 on WD90C3{0,1}
+      cards
+ 
+ XFree86 2.1.0a (6 April 1994)
+   7. Fix some DEALLOCATE_LOCAL problems in accel servers
+   6. Support for Bt485 on #9 cards (Robin Cutshaw)
+   5. Fixes for Cirrus driver (Harm Hanemaayer)
+   4. Fix for text restore problem on some S3 cards (Jon Tombs)
+   3. Workaround for Mach32 detection problem on some platforms
+   2. Fix incorrect usage of $(DESTDIR) in some lnuxLib.rules and x386.cf rules
+   1. Code to detect 928-P (Harald Koenig)
+ 
+ XFree86 2.1 (11 March 1994)
+ 151. OS README updates (affect individual OSs only)
+ 150. Fix AltGr handling for Linux (affects Linux only)
+ 149. Comment out the unused s3Save() and s3Restore() functions -- a typo in
+      some unreachable code may cause problems with some compilers (should not
+      affect any OSs)
+ 148. Linux compile-time fix for fonts/PEX/lex.l (affects Linux only)
+ 147. Late cirrus fix for large tiles
+ 146. Fix for LinkKit site.def and Imakefile (remove dbm references)
+ 
+ XFree86 2.0Z (8 March 1994)
+ 145. Fix text/graphics mode switching for pixmux with SPEA Mercury.  This
+      code is now reasonably stable (interlace support is still absent though)
+      (Norbert Distler)
+ 144. Fix for cirrus stipple fill when virtual width is not a multiple of 32
+ 143. Linux keyboard updates
+ 
+ XFree86 2.0Ce (7 March 1994)
+ 142. Preliminary support for Bt485 pixel multiplexing on the SPEA Mercury
+      card (Norbert Distler)
+ 141. More documentation updates
+ 140. SuperProbe updates (ATI and Weitek fixes)
+ 139. Fix for second MB cirrus BitBLT but -- BitBLT now turned back on for
+      2MB cards (Wolfgang Jung)
+ 
+ XFree86 2.0Cd (6 March 1994)
+ 138. Default to building shared libs for FreeBSD
+ 137. Updates to cirrus driver: (Harm Hanemaayer)
+       New Option flag "no_2mb_banksel" for cards that have 2MB in the form
+         of 512kx8 DRAMS (4 chips)
+       Disable BitBLT engine use when using more than 1MB because there
+         are problems
+       New text bitmap transfer code
+ 136. Documentation updates
+ 135. Fix mi/cbrt.c so it handles negative arguments.
+ 
+ XFree86 2.0Cc (5 March 1994)
+ 134. Update x386/etc/console.h to current version
+ 133. Some documentation updates (including removing README.XS3)
+ 132. Updates to cirrus driver: (Harm Hanemaayer)
+       New option flags "fifo_conservative" and "fifo_aggressive" to
+         control the CRTC fifo threshold.
+       Reduce clock limit for the 5420
+       Remove accelerated PolyGlyphBlt -- it causes problems
+ 131. Modify pvga1 driver to detect the 90C24 and treat it as a 90C30
+ 130. Support for the SC15025 RAMDAC in 8-bit/RGB mode (requires
+      the "sc15025" and "dac_8_bit" options) (Helmut Geyer)
+ 129. Fix vga colourmap save/restore when using a RAMDAC in 8-bit mode (Helmut
+      Geyer)
+ 
+ XFree86 2.0Cb (3 March 1994)
+ 128. Fix for "snow" problems on WD90C3x cards with 80MHz clock (Anders Bostrom)
+ 127. Fixes for compilation problems on Mach and ISC
+ 126. Support for 8-bit/RGB for the AT&T 20C490/491 ramdacs (S3 server).
+      There is no auto-detect, so the "att_20c490_1" Option must be
+      specified (together with the "dac_8_bit" Option)
+ 125. Added some sample patches from Gertjan Akkerman which document some
+      useful changes which could me made to the VGA16 server (these are
+      in x386/vga16/doc/).
+ 124. Fix Mach8 and Mach32 server hang when run on a card with no Mach chip
+ 123. Update xterm's terminfo file
+ 122. Install mit/config/README in lib/X11/config
+ 121. Modify Trident driver to recognise the 9000i, 9200CX, 9100B and 9420
+      chipsets.  The first is treated as a 9000, and the last three are
+      treated as a 8900CL.
+ 
+ XFree86 2.0Ca (2 March 1994)
+ 120. Fix CR60 setting for clocks > 100MHz (S3 server)
+ 119. Fix cirrus compilation on SVR4, and bsd_init.c typo
+ 118. Enable Home/End esc sequences for xterm on all OSs
+ 117. SuperProbe register unlock fixes
+ 
+ XFree86 2.0C (1 March 1994)
+ 116. Allow the MIT-SHM extension to be disabled at run-time on BSD systems
+      when kernel support for sysv-shm isn't present
+ 115. Enable Home/End esc sequences for xterm (Linux only -- should this be
+      extended?)
+ 114. Set default xterm tty parameters to reasonable values (fixes problems
+      seen when using xdm)
+ 113. gccmakedep fix (David McCullough)
+ 112. Special-case code for lines where this is one rectangle in the clip
+      region -- for Mach32 (Craig Groeschel)
+ 111. Update to compaq probe code -- hopefully this will reduce the number
+      of false positives
+ 110. Major updates to SuperProbe
+ 109. Cirrus driver patches
+ 
+ XFree86 2.0Bb (27 February 1994)
+ 108. Removed experimental "cr60=..." options (S3), and made CR60=0xFF
+      the default setting.  The "dram_{slow,med,fast}" options still remain
+      as un-documented options (just in case).
+ 107. Manual page updates
+ 106. Support for linear fb location on Mach32 PCI cards
+ 105. Include Solaris x86 "aperture driver" (Doug Anson and David Holland)
+ 104. Updated Thomas Wolfram's SVR3 mmap driver to version 2.2.3
+ 103. Allow the MemBase setting in Xconfig specify the high 5 bits of the
+      4MB aperture address for the Mach32 server, and the high 6 bits of
+      the LAW address for the S3 server
+ 
+ XFree86 2.0Ba (25 February 1994)
+ 102. Fix/speedup for window->pixmap part of CopyPlane() in the accel servers
+ 101. Fix bits per RGB reported for S3 server when using 8bpRGB
+ 100. Modify code for determining when pixel multiplexing is required for
+      the S3 server, and restrict the DisplayWidth to either 1024 or 2048 when
+      pixel multiplexing is used
+  99. Preliminary support for the SC11412 clock chip used on the SPEA Mercury
+      (S3).  Use 'Clocks "sc11412"' to select this (Norbert Distler)
+  98. "icd2061a" now uses the "icd2061a_slow" clock setting algorithm.
+      The name "icd2061a_slow" will be dropped in the release after 2.1
+  97. Fixes for zero-width arcs for the VGA16 server (Gertjan Akkerman)
+  96. Support for David Holland's "aperture driver" for linear fbs on Solaris
+  95. Fix Solaris panic when no free VTs are available
+  94. Much-enhanced accelerated support for Cirrus chips (Harm Hanemaayer)
+  93. Support for up to 17 clocks on WD90C3x cards (Anders Bostrom)
+  92. Fix for Compaq avga driver
+  91. Keyboard updates to handle Linux' key remapping (Orest Zborowski)
+  90. README for Solaris (David Holland)
+ 
+ XFree86 2.0B (21 February 1994)
+  89. Possible fix for Bt probe problem that some people see
+ 
+ XFree86 2.0Ab (19 February 1994)
+  88. Combine DRAM and non-DRAM mach8 image assembler code into single files
+      with #ifdefs
+  87. Fix for hga2 driver to prevent it from blanking MDA displays when
+      swithching back to text mode
+  86. Code to explicitly recognise the *BSD PCVT console driver
+  85. Preliminary support for the S3 805i in interleaved mode
+  85. Fix for single-bank SVGA bitblt code (Giovanni Novelli)
+  84. Fix alu usage in mach32CopyArea() (Craig Groeschel)
+  83. Fix dash line support in Mach32 server (Mike Bernson)
+ 
+ XFree86 2.0Aa (13 February 1994)
+  82. S3 "No_Bt485" and "No_Ti3020" options have been replaced by "Normal_DAC",
+      and a "20C505" option has been added
+  81. ATI text restore fixes for Mach32 server (Ton van Rosmalen)
+  80. Planemask fixes for Mach32GetImage() (Craig Groeschel)
+  79. Prevent S3 Ti cursor from being turned on when the screen is blanked
+  78. No longer define __386BSD__ for BSD/386, NetBSD, FreeBSD.  Change
+      the FreeBSD define from -DFreeBSD to -D__FreeBSD__.  Code outside
+      ddx/x386 now uses the value of BSD (from <sys/param.h>) and for
+      code below ddx/x386, __BSD__ is defined for all the x86 BSD OSs
+  77. Rewrite of Mach32 memory detection code (Mark Weaver)
+  76. Set clock-doubler cut-in to 67.5MHz for Bt485 and 90MHz for AT&T 20C505
+  75. Add ClearRTS option (some mice seem to need it)
+  74. Mach8 server now uses a 1024 line pitch (regardless of virtualX) for
+      cards with 1MB
+  73. Support for bank switching with the VGA16 server. Staticgray and
+      Grayscale visuals added to the VGA16 server (Gertjan Akkerman)
+  72. Slowed down image routines for DRAM based Mach8 cards (Hans Nasten)
+  71. Improvements to solx86 in/out assembler code, and removal of the
+      broken ProworksMOption
+ 
+ XFree86 2.0A (15 January 1994)
+  70. Increase Bt485 clock-doubler cut-in point from 67.5MHz to 90MHz.  This
+      should fix the "flashing pixel" problem many have reported
+  69. Mach8 font cache performance updates
+  68. Update assembler code and SuperProbe Makefile.std for the ProWorks
+      compile on Solaris x86
+  67. Ti3020 probe code for SuperProbe (Robin Cutshaw)
+  66. Fix Mach32 server to recognise PCI cards
+ 
+ XFree86 2.0g (9 January 1994)
+  65. Clock probe code for Mach32 server
+  64. Support for TI3020 ramdac for S3 server (Robin Cutshaw)
+  63. Fix server crash problem if reset occurs when VT switched away
+  62. Make accel servers honour the -dpi flag
+  61. Mach8 font cache updates
+  60. Support for the ProWorks compiler on Solarix x86
+  59. Add memory probe to SuperProbe (only for a couple of chipsets so far)
+  58. Support for display widths of 640, 800 and 2048 with S3 server
+  57. Generalise S3 HW cursor memory allocation -- fixes problems that showed
+      up with some virtualY/displaywidth combinations, and will work for
+      display widths < 1024
+ 
+ XFree86 2.0f (27 December 1993)
+  56. Fix mach32RecolorCursor() SIGSEGV when VT switched away
+  55. Possible fix for cases where the S3 linear fb probe fails the first
+      time the server is started but succeeds on subsequent times
+  54. Updates to Mach32 memory probe
+  53. Fixes for ATI SVGA save/restore code (Ton van Rosmalen)
+  52. Fix xman's handling of nroff bullets and bolding (Rich Murphey)
+  51. Mach8 font cache updates (Hans Nasten)
+  50. Mach32 HW cursor fixes (Mark Weaver)
+  49. Change "makedepend" for systems with gcc to use "gcc -M" (based on
+      code from Hongjiu Lu).  This is much slower than the other version,
+      and maybe should be disabled by default for !UseInstalled
+ 
+ XFree86 2.0e (18 December 1993)
+  48. SuperProbe updates (details in SuperProbe/ChangeLog)
+  47. Imake updates for NetBSD
+  46. Ramdac multiplexing for Mach32 cards with TLC34075 (and ATI68875?)
+      ramdacs (Mike Bernson)
+  45. Imake changes to allow easy building of just the servers with a
+      cut-down source tree
+  44. Fix ClearDTR -- now it clears *only* the DTR line
+ 
+ XFree86 2.0d (11 December 1993)
+  43. Xconfig keyboard option: VTSysReq to enable SVR4-style VT switching
+      sequence on Linux and *BSD+syscons
+  42. Solaris 2.x x86 support (David Holland, Doug Anson)
+  41. Accelerated dline and dseg for Mach32 (Mike Bernson)
+  40. Accelerated non-cache text code for Mach8 (Hans Nasten)
+  39. VirtualY limit removed for Mach8 (cache can be disabled)
+  38. Dynamic allocation for font cache for Mach8 (Hans Nasten)
+  37. New GetImage for Mach32 (Mike Bernson)
+  36. Support for linear fb on *BSD with mmapable /dev/mem
+  35. Preliminary support for 1152 width on Rev C 801 and Rev E 928, and
+      1600 width on Rev E 928 in S3 server
+ 
+ XFree86 2.0c (3 December 1993)
+  34. Support for 8-bit/gun for Mach32 server (Craig Groeschel)
+  33. New GetImage() for Mach8 and 8514
+  32. Fix error message printed when no appropriate graphics sections are
+      present in Xconfig
+  31. Add a "fb_debug" option to the S3 server
+  30. MemBase Xconfig parameter added to allow the fb base address to be
+      specified.  This is currently used only by some bdm2 drivers
+  29. Support added to bdm2 for Visa board (untested)
+  28. HGC-1280 now supported on both primary and secondary addresses
+  27. Sigma L-View driver tested and works now
+  26. Code from ATI to work around memory probing problems with some Mach32
+      chips (untested)
+  25. Workaround for some 2MB DRAM ATI cards (eg, CLX).  This allows the
+      VideoRam amount specified in Xconfig to override the detected value
+  24. Support for NetBSD/FreeBSD shared libraries (John Brezak & ??)
+  23. Add option "intel_gx" to handle linear fb on Intel GX/Pro (Mach32)
+  22. Composite sync support for Mach8
+  21. Allow linear fb for EISA S3 cards
+  20. Fix s3RecolorCursor() SIGSEGV when VT switched away
+ 
+ XFree86 2.0b (14 November 1993)
+  19. Add virtualY <= 896 check to Mach8 server
+  18. Restore settings for VGA aperture mapping if linear fb access fails for,
+      S3.  Also restore those registers at exit
+  17. Merge in MIT fix-26 (mainly xterm security patch)
+  16. Fix S3 interlaced modes with VTotal > 1025.
+  15. Hack for 1280x1024 on S3 801 with 110MHz clock
+  14. Composite sync support for Mach32 (Todd Pfaff)
+ 
+ XFree86 2.0a (9 November 1993)
+  13. Speedup for aligned <=16 bit wide stipple ops for Mach8 and 8514
+  12. Fix NULL dereference when ModeDB is empty (Bill Metzenthen)
+  11. make mit/rgb consistent with the server's usage of it.  showrgb can now
+      read rgb.txt directly, and [sng]dbm is no longer required
+  10. Attempt to clean up strerror() vs sys_errlist[] usage outside ddx/x386
+   9. Disable saving the Tek screen to a file in xterm -- a quick hack to
+      get around another security problem.  An official X Consortium fix
+      should be available soon
+   8. Fix vgaFasm.h so it works for gcc2 with '-traditional'
+   7. Fix clock probing problem in pvga1 driver
+   6. Fix typo in xf86_OSlib.h
+   5. Fix ClockProg informational message
+   4. Truncate clock values to MHz resolution when checking against the limit
+   3. Fix bug in LinkKit Imakefile
+   2. Fix malloc problem in the PEX font reader
+   1. Some documentation fixes
+ 
+ XFree86 2.0 (24 October 1993)
+ 247. Documentation finalised
+ 246. Fix for VT switching problem with Mach32 server
+ 
+ XFree86 1.9Za (23 October 1993)
+ 245. Documentation updates
+ 244. Fix bug in backing pixmap used for VT switching with the S3 server
+ 243. Fix typo which prevented nomemaccess being turned of when a localbus
+      S3 card is used without linear fb mapping
+ 
+ XFree86 1.9Z (18 October 1993)
+ 242. Code freeze for 2.0.  Docs still not finished
+ 241. Disable linear fb mapping for BSD/386 since it doesn't appear to work
+ 240. Fix for dline bug in Mach8 and 8514 servers
+ 239. Updates to ati SVGA driver
+ 238. SCO doc updates
+ 237. Allow "nolinear" Option for Mach32 server
+ 
+ XFree86 1.9Fe (17 October 1993)
+ 236. Fix S3 cursor problem when panning
+ 235. Mach32 HW cursor fixes
+ 234. Include Accel cards db
+ 233. Fix video mmap problem with *BSD
+ 
+ XFree86 1.9Fd (17 October 1993)
+ 232. Add undocumented "showcache" Option for the S3 server
+ 231. Fix ALLOCATE_LOCAL/DEALLOCATE_LOCAL problem in S3 server
+ 230. Fix multi-screen I/O permission bug on SYSV
+ 229. SVR3 version of IOPL kernel patch (required for ISC 2.0.2)
+ 228. Get xload's compiled-in kernel name from <paths.h> for BSD
+ 227. Fix some compilation-related problems
+ 226. Sigma Lview driver doesn't work, so removed references to it
+ 225. DAC_MASK save/restore for 8514 server
+ 
+ XFree86 1.9Fc (16 October 1993)
+ 224. Stipple and colour mapping fixes for vga16
+ 223. Fix for Mach8 VT switching problem
+ 222. Include README.Bsdi
+ 221. Fix SEGV in s3WarpCursor when VT not active
+ 220. Don't use kbd_mode for BSDI
+ 
+ XFree86 1.9Fb (13 October 1993)
+ 219. Mach32 HW cursor colouring fixes (still not quite right)
+ 218. Change Mach8 clock probing to measure the divided-by-4 values only
+ 217. Correct fix for problems when some cards are in mono address mode
+ 216. Fix sync polarity problem with S3 server
+ 215. Update kbd_mode for syscons
+ 214. Add "memaccess" option (for S3) so that mem access can be forced on
+      for localbus cards when the linear framebuffer can't be mapped
+ 
+ XFree86 1.9Fa (9 October 1993)
+ 213. 1-pixel segments fix for Mach8
+ 212. Trap virtual screen sizes which are too large for Mach32
+ 211. Turn off Mach32 HW cursor if insufficient videoram
+ 210. Some documentation updates
+ 209. Move clock limit definitions so that they can be changed when using
+      the LinkKit
+ 208. SuperProbe updates
+ 207. Fix mis-detection of ATI cards by the compaq driver
+ 206. Fix hard-coded path in xdpr script
+ 205. Print max clock before resolving modes
+ 204. Fix CRTC setting procedure for Mach32
+ 
+ XFree86 1.9F (4 October 1993)
+ 203. Limit clock to 80MHz for Mach8 and Mach32
+ 202. Mach32 HW cursor fixes and mach32im cleanup
+ 201. Cleanup startup messages in Mach8 and Mach32 servers
+ 200. Disable xterm logging by default, and provide a safer(?) method of
+      opening the log file
+ 
+ XFree86 1.9Ed (2 October 1993)
+ 199. Support for Cirrus 62x5 chips (Prof. Hank Dietz)
+ 198. Clean up handling of 'volatile', etc for 'gcc -traditional'
+ 197. Merge Mach8 font cache fix into Mach32
+ 196. Default to probe for 4 clocks on pvga1 cards
+ 195. Remove implicit assumption that certain mouse protocols are only used
+      by serial devices
+ 194. Updates/cleanups for bdm2 code
+ 193. Include SVR3 mmap and SCO dmmap drivers (in x386/etc)
+ 192. Change location of console.h to machine/ for FreeBSD
+ 191. Fix setting of AdmDir for *BSD
+ 190. Update GnuMalloc option.  Now it enables use of GNU malloc for clients
+      as well as the servers
+ 189. Patches for Amoeba
+ 188. Fix for OAK crash with SVGA server
+ 187. Fix for ATI SVGA restore problem
+ 186. HW cursor for Mach32 (Mike Bernson)
+ 185. Option checking in other accel servers
+ 
+ XFree86 1.9Ec (1 October 1993)
+ 184. Option checking in S3 server
+ 183. Fix default colour visual handling for accel servers
+ 182. Add checking of clock limits
+ 181. Clean up s3Init()
+ 180. Fix to allow SVR3 shared libs to build when using gas
+ 
+ XFree86 1.9Eb (29 September 1993)
+ 179. Updates to syscons support (requires lastest console.h  -- which is now
+      included in ddx/x386/etc)
+ 178. Fix for colourmap restoration problem with 8514/A cards
+ 177. Updates to Bt485 code
+ 
+ XFree86 1.9Ea (28 September 1993)
+ 176. Man page updates
+ 175. Modify "number9gxe" option to use the Bt485's clock doubling for clocks
+      higher than 67.5Mhz
+ 174. Alternate ICD clock selection code.  Enable it with
+      'Clocks "icd2061a_slow"'
+ 173. site.def cleanup
+ 172. Fix Bt485 Cursor support
+ 171. Update syscons support
+ 170. Fix for S3 font cache server crash problem
+ 169. Fix for S3 xqueue problems when operating in linear mode
+ 168. Fix for S3 928 localbus problem
+ 167. Fix SuperProbe's graphics co-processor detection, and add code to detect
+      Bt485 on S3 cards.
+ 166. Fix text problems in Mach8 and 8514 servers
+ 165. Image read/write fix for Mach32
+ 
+ XFree86 1.9E (23 September 1993)
+ 164. Support for the syscons driver on *BSD (S|ren Schmidt)
+ 163. Get/PutImage speedups for S3
+ 162. Accelerated image text for non-cached fonts (S3)
+ 161. Image read/write speedups for Mach32
+ 
+ XFree86 1.9Dc (22 September 1993)
+ 160. Hooks added for HW cursor support on SVGA cards
+ 159. Support for ISC 4.0
+ 158. Accel text functions for non-cached fonts (S3 server)
+ 157. Fix problems with vga sequencer not being turned off in the right places
+ 156. Support for dmmap driver for SCO
+ 155. Oak driver (from Steve Goldman)
+ 154. Updates for Minix
+ 
+ XFree86 1.9Db (21 September 1993)
+ 153. Accelerated WD90C31 support (Mike Tierney)
+ 152. Updates to ImageStipple code for Mach8 and 8514
+ 151. Fix for memory leak in mi backing store (Amancio Hasty)
+ 150. Accelerated Cirrus support (Simon Cooper and Bill Reynolds)
+ 149. Accelerated dline for Mach8 and 8514 (from Tiago Gons)
+ 148. Fixes for localbus 928
+ 147. Modify server to use rgb.txt directly and create an internal hash table
+      (from Thomas Roell)
+ 146. SuperProbe updates
+ 145. Fix cursor recolour problems in S3 server
+ 144. Use uname/gethostbyname for cases where SIOCGIFCONF fails
+ 
+ XFree86 1.9Da (18 September 1993)
+ 143. ImageStipple speedup for Mach8 and 8514 (from Hans Nasten)
+ 142. Reorganise man page installation details for *BSD
+ 141. Fix various minor bugs
+ 
+ XFree86 1.9D (15 September 1993)
+ 140. Use non-MAP_FIXED for mmap on Linux -- requires latest kernel
+ 139. dseg for S3
+ 
+ XFree86 1.9Cf (14 September 1993)
+ 138. line updates for S3 (including dline)
+ 137. Support for Thomas Wolfram's mmap driver for SVR3
+ 136. Config changes to support NetBSD and FreeBSD
+ 135. Correct fix for SIOCGIFCONF on *BSD (from Mark Davies)
+ 134. Use Jerry Whelan's BSDselect() for SVR4 in libXt and libXbsd
+ 133. CopyPlane() for Mach32 server
+ 132. Include Berkeley str{,n}casecmp() in libXbsd
+ 131. Sigma LView driver for bdm2 (untested)
+ 130. OsMouse support for SCO (uses the SCO event driver)
+ 
+ XFree86 1.9Ce (9 September 1993)
+ 129. Improve reliablilty of mmio code (thanks Thomas)
+ 128. Fix xdm-related server crash on Linux
+ 127. Support for 4MB aperture with EISA Mach32 cards
+ 126. CopyPlane() for 8514 server
+ 125. Fix "xfig" problem in accel servers
+ 124. Fix GetImage and PolyText in accel servers
+ 123. Fix problem with VT-switching and server reset
+ 122. Fix some more cfb.banked bugs
+ 
+ XFree86 1.9Cd (5 September 1993)
+ 121. Fast image read/write for 8514 server
+ 120. Mmio support for 928 in S3 server
+ 119. Fixes for BT ramdac HW cursor (S3) (still doesn't work)
+ 118. CopyPlane() fixes for S3
+ 117. Speedup for PolyPoint() in Mach8 (and others)
+ 116. Fix for lines in accel servers -- now match cfb lines.
+ 115. CopyPlane()
+ 
+ XFree86 1.9Cc (2 September 1993)
+ 114. Fix auto-repeat trapping of lock keys
+ 113. Support BT485 ramdac's HW cursor (S3 server) (doesn't work yet)
+ 112. Use mmap for BIOS access on SVR4
+ 111. Only protect page 0 for SVR4 when the -protect0 flag is given.  It makes
+      cores less useful
+ 110. bdm2 (banked dumb mono) fb/driver (from Pascal Haible)
+ 109. Fast image fill for Mach8 (from Hans Nasten)
+ 108. Update shared-lib version numbers for Linux
+ 107. Split bsdi os-support from 386BSD -- little code was common
+ 106. Modify s3Init() code to use vgaHWInit()
+ 
+ XFree86 1.9Cb (28 August 1993)
+ 105. Fast image read/write for Mach8 (from Hans Nasten)
+ 
+ XFree86 1.9Ca (28 August 1993)
+ 104. Default to NoMemAccess for S3 localbus cards on OSs that don't
+      support linear videomem mapping
+ 103. Add QueryBestSize() for S3
+ 102. Protect page 0 for SVR4 (to help find NULL pointer dereferences)
+ 101. Fix ChordMiddle
+ 100. Fix some compilation problems with vga16
+  99. vga16 fix for OpaqueMove bug
+  98. Work around GNU make's "different" default dependency handling.
+      Dependencies should now work reliably with GNU make.
+  97. Fast CopyPlane() for S3 server
+  96. Fix I/O port handling to deal with multiple screens
+  95. Mach8 updates
+ 
+ XFree86 1.9C (25 August 1993)
+  94. Updated video mem <-> main mem copy code to get better performance on
+      localbus cards
+  93. Alternate fix for xqueue with S3 (previous fix degraded performance too
+      much)
+ 
+ XFree86 1.9Be (25 August 1993)
+  92. SIOCGIFCONF fix for ISC in xdm
+  91. Mach support for mapping arbitrary video memory
+  90. Fix for performance problems in S3 server
+ 
+ XFree86 1.9Bd (24 August 1993)
+  89. Updated version of Xconfig/probe info
+  88. Update libXt jump entries for Shm on Linux
+  87. Another S3 cursor update
+  86. Use mmap() for mapping framebuffer on SVR4
+  85. Localbus linear mapping for S3 (tested only on Linux)
+ 
+ XFree86 1.9Bc (23 August 1993)
+  84. SuperProbe update
+  83. Improve picture stability when using high clocks (S3)
+  82. Get memory detection right for S3 911
+  81. Change localbus wait states for S3
+  80. Go back to the MAP_FIXED mmap for Linux, added xf86UnMapVidMem()
+  79. S3 cache updates and cursor changes
+ 
+ XFree86 1.9Bb (21 August 1993)
+  78. Fix S3 server crash if it exits when its VT isn't active
+  77. Indicate where information in server startup messages comes from (ie
+      whether from Xconfig or by probing, etc)
+  76. Fix ATI/Mach probing in SuperProbe
+  75. Fix S3 cursor "shadowing" in interlaced modes
+  74. Fix problems with the S3 server when using xqueue
+  73. 16-colour generic VGA server (from Gertjan Akkerman)
+ 
+ XFree86 1.9Ba (18 August 1993)
+  72. Support for a Hitachi Puma Plus digitising tablet's 4-button puck
+      (from Randy Terbush)
+  71. Mouse "ChordMiddle" option.  This is for a 3-button mouse which
+      generates left+right events when the middle button is used.  This is
+      for Microsoft protocol only (from Ted Goldblatt)
+  70. Reorganise the way SpeedUp options are handled so that the speedup code
+      is only linked into the server when the appropriate chipset driver is
+      included.
+  69. Fix inb/inw inlines for gcc without gas
+  68. Code to use memory to the right of the screen for caching (S3)
+  67. Various compilation-related fixes
+ 
+ XFree86 1.9B (16 August 1993)
+  66. Fix memory leak on server reset
+ 
+ XFree86 1.9Ai (16 August 1993)
+  65. Fix LinkKit
+  64. Cirrus driver was ignoring clocks when a VideoRam line is specified
+  63. Fix VT switching for Mach8 and ibm8514 servers
+  62. Fix server reset for S3 server
+  61. Fix problems in mach32ImageFill for virtual width != 1024
+  60. Text save/restore added to Mach32 server
+ 
+ XFree86 1.9Ah (15 August 1993)
+  59. Updates to SuperProbe so it can detect the latest S3 chip revisions
+  58. VT switching support for the S3 server
+  57. Fix for S3 image write problems with screen width 1024 & 2MB videoram
+ 
+ XFree86 1.9Ag (14 August 1993)
+  56. Another stipple fill fix in cfb.banked
+  55. S3 clock select fixes -- allows clock probing to work
+  54. Fix initialisation of miCacheFreeSlot
+ 
+ XFree86 1.9Af (13 August 1993)
+  53. Allow programmable clocks to be specified with 'Clocks "prog_clk_type"'
+      in Xconfig.
+  52. Virtual size fixes for S3
+ 
+ XFree86 1.9Ae (13 August 1993)
+  51. Extended I/O and IOPL handling for BSDI.
+  50. Set virtual size for S3 if not given.
+ 
+ XFree86 1.9Ad (13 August 1993)
+  49. Imake config updates
+  48. Created libxf86_hw in common_hw, and moved clock probe code there.
+  47. XF86_Mach8 and XF86_8514 compilable.
+ 
+ XFree86 1.9Ac (12 August 1993)
+  46. S3 updates (diff15)
+  45. XF86_Mach32 compilable
+ 
+ XFree86 1.9Ab (11 August 1993)
+  44. XF86_S3 compilable and runnable on Linux
+  43a Cirrus driver updates (including fix for line problem)
+  43. Fix problem in Xlib compose-key code that caused auto-repeat problems
+      on some SVR4.
+  42. Keep /dev/console open for pccons on 386BSD to work around keyboard
+      hanging problem (from Mark Weaver)
+  41. Fix for zero width horiz, vert lines with rop other than GXcopy, GXxor
+      (from Mark Weaver)
+ 
+ XFree86 1.9Aa (6 August 1993)
+  40. Include accel dirs (not compilable yet)
+ 
+ XFree86 1.9A (4 August 1993)
+  39. Fix authorisation for LOCALCONN connections on SYSV.
+  38. OS-lib fixes
+ 
+ XFree86 1.9e (1 August 1993)
+  37. Make the ET4000 Option "force_bits" standard behaviour
+  36. Fix problem of renderer config not being handled properly in the LinkKit
+  35. Update screen configuration handling to better suit multiple servers.
+ 
+ XFree86 1.9d (29 July 1993)
+  34. Mach OS-lib fixes
+ 
+ XFree86 1.9c (28 July 1993)
+  33. Lots of SCO patches (including fixing the bogus window problem, xterm,
+      font server, PEX)
+  32. SuperProbe updates (includes identification of AT&T RAMDACs and
+      detection of 8514/A and ATI Mach-xx chipsets)
+  31. Fix for bug in cfbgetsp.c
+  30. Include pixmap cache support in mi, mfb, cfb.
+  29. SVR3/ISC updates for gcc 2.4.5
+  28. Moved OS-specific parts of x386Io.c to the OS-lib
+  27. OS-lib fixes.
+  26. Converted the experimental ET4000 RCCONF code to an Option flag:
+      "fast_dram"
+  25. Fix SIOCGIFCONF related problems in xdm, chooser and server/os/access.c
+      on SVR4 and 386BSD (thanks to Ian Donaldson and Peter Wemm).
+  24. Support for easily adding multiple servers to server/Imakefile and
+      the LinkKit
+ 
+ XFree86 1.9b (13 July 1993)
+  23. Fix for interlaced support in the Cirrus driver
+  22. OS-library added to separate out OS-specifics under ddx/x386
+  21. Fix initialisation of supported pixmap formats
+  20. Fix for authorisation on streams connections for SVR3
+  19. Fix other line bugs (fLineH.s, suLine.s, suVHLine.s)
+  18. Really make the horizontal panning symmetric
+  17. Fix 2MB support on Cirrus 5426
+  16. Fix line bug in non-speedup code (fLineBres.s)
+ 
+ XFree86 1.9a (3 July 1993)
+  15. Added support for BSDI's BSD/386 (from Hans Nasten)
+  14. SuperProbe updates for C&T chipsets
+  13. Make horizontal panning symmetric
+  12. Allow Cirrus driver to address 2MB on the 5426 cards (not tested)
+  11. Add ChipRounding to the vga ChipRec so that chip-specific rounding of
+      virtualX can be handled properly
+  10. OSF/1 patches (Marc Evans)
+   9. Fix for xload problem on Linux
+   8. Fix for ATI text-mode font restore problem
+   7. Experimental code to set the RCCONF register on ET4000 cards (this is
+      only used if Et4000SetRCConf is set to YES in site.def)
+   6. Allow "black" and "white" colours to be specified in Xconfig for the mono
+      vga server
+   5. Fix Xconfig visual spec check for mono servers
+   4. Fixed some long file names (in extensions/lib/PEXlib, fonts/bdf/misc)
+   3. Fix xman bug introduced in 1.2Da
+   2. Fix bank-switching bug in cfbfillsp.c
+   1. Fix a couple problems that show up when using a XFree86 patched source
+      tree on non-i386 systems
+ 
+ XFree86 1.3 (5 June 1993)
+ 98. Updates to ncr driver
+ 97. NCR imake config changes
+ 96. Docs updated for gzip extension change ".z" -> ".gz"
+ 95. Experimental "force_bits" option flag for ET4000
+ 
+ XFree86 1.2Da (2 June 1993)
+ 94. Modify xman to use groff instead of nroff for Linux
+ 93. Modify xload to use /proc/loadavg for Linux
+ 92. Change ownership of /dev/console and /dev/tty0 for Linux
+ 91. Added xmodmap.std to the etc dir which lists the default key map in a form
+     that can be read by xmodmap(1)
+ 90. Various small SVR3 adjustments, and new README.SVR3
+ 89. Add a README for the LinkKit
+ 88. Support for banked mono in ET3000 driver (thanks to Joerg Wunsch)
+ 87. ET3000 probe changes
+ 86. README.Linux updates
+ 
+ XFree86 1.2D (26 May 1993)
+ 85. Merge in MIT fix-25
+ 84. OSF/1 support is incomplete -- so remove references to it in the docs
+ 83. Add -keeptty flag to prevent server from detaching its controlling tty
+     (useful when debugging)
+ 82. Include support for 77C22E in ncr driver
+ 81. Set bank 0 for save/restore in trident driver [removed]
+ 80. Workaround for mouse loss when VT switching on SCO
+ 79. Compile-time support for SCO 3.2.4
+ 78. Don't include PEX in mono server (even when BuildPex is set) because it
+     only works for 8-bit PseudoColour
+ 77. Mach support for SuperProbe
+ 76. Various SVR3 shared lib fixes including fixes for AT&T SVR3.2, XDM auth
+     support and fixes for initialisation problems that showed up with Motif.
+ 75. Ignore SIGHUP in xterm for ISC 2.2.1, 3.0
+ 74. rgb/Imakefile fix
+ 73. Imake.tmpl updates for ISC
+ 
+ XFree86 1.2Cb (19 May 1993)
+ 72. Code to slow down DAC access
+ 71. Possible fix for font restore bug on Linux and 386BSD (works for some
+     people, but not everyone)
+ 70. Merge in MIT fix-24
+ 69. Xosdefs.h mod for Mach
+ 68. Eliminate various compiler warnings with PEX
+ 67. Modify lndir to ignore directories called "CVS"
+ 66. Fix overscan restore problem when mode switching
+ 65. Fix a Cirrus-specific font/text restore problem
+ 
+ XFree86 1.2Ca (16 May 1993)
+ 64. Fix for lndir to work with Linux (Gnu ls)
+ 63. Documentation updates
+ 62. Allow PEX to be turned on/off at link-time with the LinkKit
+ 61. Add "hibit_high" and "hibit_low" Option flags to handle some ET4000
+     cards when the server is started from a high-res text mode
+ 60. Fix screen corruption when mode-resolving fails (problem was introduced
+     in 1.2Bb)
+ 59. Fix to pvga1 driver for 90C11
+ 58. kbd_mode modified to be a no-op for codrv
+ 57. Imake.tmpl updates for SCO and OSF/1
+ 56. Remove need for <sys/ioctl_pc.h> with LinkKit on 386BSD
+ 
+ XFree86 1.2C (8 May 1993)
+ 55. Modify Cirrus driver to set the reported clocks to the preset values
+     rather than probing them.  Probing can be forced with the "Probe_Clocks"
+     Option flag.
+ 
+ XFree86 1.2Bb (6 May 1993)
+ 54. Compatibility support for codrv 0.1.1 (run-time only)
+ 53. Merge in OSF/1 support (from Marc Evans)
+ 52. Merge in SCO support (from David McCullough)
+ 
+ XFree86 1.2Ba (4 May 1993)
+ 51. SuperProbe updates (can now be compiled with a K&R compiler)
+ 50. Compaq driver (from Hans Oey)
+ 49. Merge codrv and pccons support so that a single server can support
+     both
+ 48. Cirrus driver for CLGD542x cards (no accelerated support) (from Bill
+     Reynolds)
+ 47. Allow inline'd macros to be disabled for debugging purposes (by compiling
+     the video drivers with -DNO_INLINE)
+ 46. Print OS version in startup message
+ 
+ XFree86 1.2B (19 April 1993)
+ 45. ET4000 text clock restoration modified -- maybe it will fix the problems
+     when restoring to a high res text mode
+ 44. Sample SVGA driver stubs and documentation added
+ 43. Xconfig option to specify VGA BIOS base address (not all are at 0xC0000)
+ 42. Major rewrite of tvga driver.  Now supports 8800CS, 8900B, 8900C, 8900CL,
+     9000 in all modes.
+ 41. Xconfig option to clear DTR after opening MouseSystems mouse (only for
+     SYSV, Linux, 386BSD)
+ 40. Change server names.  X386 -> XF86_SVGA, X386mono -> XF86_Mono.
+ 
+ XFree86 1.2Aa (17 April 1993)
+ 39. SuperProbe will now find vga BIOS at addresses other than 0xC0000
+ 38. Support for building Linux shared libs (DLL version)
+ 37. Remove case-sensitivity of the Chipset option.
+ 36. Save and restore registers affected by clock probing
+ 35. Some more Xconfig validity checks
+ 34. Change 'Vendor' keyword in Xconfig to 'Option'
+ 33. Fix to make use of the RGBPath specified in Xconfig (this was pointed out
+     by Greg Hartman back in Sept)
+ 32. Use XWINHOME to specify ProjectRoot at run-time
+ 31. PEX patches for Linux
+ 30. libX11 shared lib problem fixed (for SVR4)
+ 
+ XFree86 1.2A (3 April 1993)
+ 29. More pvga1/wd driver tuning, added rudimentary support for 90c20
+ 28. Improve overscan handling
+ 27. modeDB.txt updates
+ 
+ XFree86 1.2e (27 March 1993)
+ 26. Minix/Amoeba updates
+ 25. New et3000 probe (to prevent tvga8900CL being falsly detected as et3000)
+ 24. More interlace tuning for pvga1 and tvga8900 drivers
+ 23. SuperProbe
+ 22. XDMCP fixes for Linux (and others)
+ 
+ XFree86 1.2d (24 March 1993)
+ 21. Added support for Minix-386 and Amoeba (from Kees Verstoep)
+ 
+ XFree86 1.2c (20 March 1993)
+ 20. Merged in MIT fix-23
+ 19. Support for 9th clock on WD90Cxx chips
+ 18. NCR 77C22 driver (from Stuart Anderson)
+ 17. Allow multiple Clocks lines in Xconfig
+ 16. Changes to external clock program code to handle VT switching better
+ 15. ISC 2.0.2 support (from Aki Atoji)
+ 14. Include driver source instead of objects in LinkKit
+ 
+ XFree86 1.2b (1 March 1993)
+ 13. Improved ISC support for xman
+ 12. Improved handling of overscan colour
+ 11. Make the server's -pn option the default (compile time configurable)
+ 10. Hga2 support for 386BSD and Mach
+ 9.  pvga1 driver support for WD90C3x
+ 8.  Portable assembler macros (from Greg Sharp)
+ 7.  More flexible handling of Vendor strings in Xconfig
+ 6.  Store clock resolutions to nearest 1kHz.
+ 5.  Removed old SpeedUp version
+ 4.  Changes in LinkKit to handle distributions built with PEX support
+ 
+ XFree86 1.2a (20 February 1993)
+ 3.  Xlib support for run-time selectable multiple LOCAL connection types
+     for SVR3, SVR4
+ 2.  Fix mapping problem when using codrv and a non-US keyboard mapping
+ 1.  Fix for TVGA interlaced modes
+ 
+ 
+ XFree86 1.2 (8 February 1993)
+ 74. README updates
+ 73. ATI driver updates
+ 72. Banked mono doesn't work on ET3000 -- so turned off for that driver
+ 71. Merged in MIT fix-22
+ 70. Changes so that XFree86 patched source will build on other platforms.
+ 
+ XFree86 1.1F (1 February 1993)
+ 69. Add check for presence of "Modes" line in Xconfig
+ 68. Add assembler code for byte-order swapping in mfb
+ 67. More svr3 shlib "tuning"
+ 
+ XFree86 1.1E (26 January 1993)
+ 66. Change to pvga1 driver to get correct clock ordering for 90C30
+ 65. Fix linux problem building liboldX
+ 64. server locking to prevent clobbering of local connection pipes
+ 63. xhost fix for LOCALCONN
+ 62. Add missing svr3 shlib patches
+ 
+ XFree86 1.1D (24 January 1993)
+ 61. Removed SVR3 shlib stubs from clients
+ 
+ XFree86 1.1Ce (23 January 1993)
+ 60. SVR3 shared lib support (from Thomas Wolfram)
+ 59. Added Hercules driver (from Davor Matic)
+ 58. Re-map scancodes for Codrv so that the keycodes the server sees are the
+     same on all platforms
+ 57. Modify NumPad handling so that Shift works properly.
+ 
+ XFree86 1.1Cd (13 January 1993)
+ 56. Commented out force VT disabling -- causes problems with Esix 4.0.3A
+ 55. Support for tvga9000 (from Gertjan Akkerman)
+ 54. Ignore FontPath in Xconfig when a FontPath is provided with the -fp option
+ 53. Support for new Linux VTs
+ 52. Turn off Alt-Sysreq-F (forced VT switch) by default for SYSV.  Added an
+     Xconfig option to prevent this disabling (AllowForceVT)
+ 51. X386keybd man page added
+ 50. mfb.banked fixes
+ 
+ XFree86 1.1Cc (3 January 1993)
+ 49. tvga driver updates for banked mono
+ 48. Fixes to cfbblt, mfbblt for single-banked drivers
+ 
+ XFree86 1.1Cb (1 January 1993)
+ 47. Added -verbose (default) and -quiet flags, and print out more information
+     in verbose mode
+ 46. Improved banking for mfb.banked
+ 
+ XFree86 1.1Ca (30 December 1992)
+ 45. cmfb code (from Davor Matic), and an experimental mfb.banked
+ 44. Flush mouse input after opening
+ 43. Fix problem starting X from within an X session
+ 
+ XFree86 1.1C (23 December 1992)
+ 42. Added -probeonly option which causes the server to exit after the
+     device probe stage.
+ 41. Merged in MIT fix-21
+ 40. Support for an external clock setting program
+ 39. Patches for Destiny (SVR4.2)
+ 
+ XFree86 1.1Ba (17 December 1992)
+ 38. Merged in MIT fix-20
+ 37. Various improved error messages
+ 36. Improve accuracy of clock probing code -- add delay so VCO can
+     stabilise before starting the measurement
+ 35. Store dot-clocks to .1MHz accuracy
+ 34. Make the server's -dpi option work
+ 33. Extend fontpath validation to the compiled-in default fontpath
+ 32. Increase server priority while probing for clocks
+ 31. Fixed KDSETRAD bug introduced in 1.1a (affected DELL)
+ 30. Bell support for pccons driver on 386BSD
+ 
+ XFree86 1.1B (21 November 1992)
+ 29. Hack for ISC local connection on SVR4 with ACP (requires the ISC
+     client binary to be edited)
+ 28. Added code to change IOPL on SYSV for extended I/O (including patch
+     scripts for the SVR4 kernel)
+ 27. Merged in MIT fix-18 and fix-19
+ 26. Support for PS/2 mouse
+ 
+ XFree86 1.1A (16 November 1992)
+ 25. Fix problems compiling with a non-ansi compiler.
+ 
+ XFree86 1.1c (8 November 1992)
+ 24. Xconfig options to set default mapping of some special keys
+ 23. Code to validate the fontpath given in Xconfig
+ 22. Patches for Logitech Trackman/Mouseman (from Christian Ziemann)
+ 21. Updates for version 0.1.1 of Holger's co driver
+ 20. Fix for et3000 text mode restoration (from Holger Veit)
+ 19. Fix NumLock support -- use two sets of keycodes for num keypad
+ 18. Add Compose / Multi-key support to Xlib (from MIT contrib)
+ 17. Don't reset state of lock keys when starting the server
+ 16. Fix code for setting visual type from Xconfig
+ 
+ XFree86 1.1b (21 October 1992)
+ 15. Xload support for Linux
+ 14. Use Xconfig.cpp to generate the sample Xconfig with paths consistent with
+     the configuration.
+ 13. Allow multiple "FontPath" lines in Xconfig which are concatenated to build
+     the FontPath.
+ 12. Blank and clear the screen during server startup
+ 11. Fix tegblt code for mono server (instead of the previous workaround)
+ 10. Fix non-32bit tiles and stipples for mono server with 8-bit scanlines
+ 9.  Fix circle/ellipse drawing for mono server
+ 8.  Use 8-bit bitmap scanlines for mono server (can now remove pixmap hack)
+ 7.  Add check in server to see if euid==0.  If not, exit with a warning.
+ 
+ XFree86 1.1a (11 October 1992)
+ 6.  Add a VTInit option to Xconfig to run a program on the VT during
+     screen initialisation.
+ 5.  Fix security holes in reading Xconfig files, and the undocumented
+     -mono and -colour options.
+ 4.  Use KDMKTONE for bell for systems that support it
+ 3.  Allow 4 clocks for generic driver
+ 2.  Mods to allow compile time selection of 128k display mapping for mono
+     (this is experimental and may be removed)
+ 1.  Holger's 386BSD co driver support (compile-time selectable)
+ 
+ 
+ XFree86 1.1 (1 October 1992)
+ 70. Public release
+ 69. Set mailbox for 386bsd in Xaw
+ 
+ XFree86 1.0Zb (30 September 1992)
+ 68. Mods to startx so that an absolute path is not required for a server
+ 67. Make the right-hand <ALt> key behave like Alt_R
+ 66. Updates to X386.man
+ 65. Add -mono and -colour (undocumented) options to server
+ 64. Look for Xconfig file in /etc before /usr/X386/lib/X11
+ 63. Print out Trident version in probe routine and add README.trident
+ 
+ XFree86 1.0Za (27 September 1992)
+ 62. cfb.banked changes for Mach's BSD cpp.
+ 61. Add mkwhatis script for 386BSD
+ 60. Fix problems with xgc/lex.l
+ 59. Modify default keymap so Alt_L will work like both Meta_L and Alt_L.
+ 58. xload fixes for 386BSD
+ 57. Change config/x386config.sh for dumb BSD sh.
+ 
+ XFree86 1.0Z (24 September 1992)
+ 56. Beta release (final for 1.1)
+ 55. Add ISC22, ISC30 defines
+ 
+ XFree86 1.0Yb (21 September 1992)
+ 54. Included Thomas Eberhardt's updates to the compressed font code.
+ 53. Put Alan Hourihane's generic save/restore code into vgaHW.c
+ 52. Correction to xmh man page
+ 51. Support use of libdbm.a for ISC 3.0
+ 
+ XFree86 1.0Ya (17 September 1992)
+ 50. Merge in Linux support (from Orest Zborowski)
+ 
+ XFree86 1.0Y (14 September 1992)
+ 49. Beta release (second for 1.1)
+ 48. Removed FAS support on SVR4
+ 47. Changes to font and text save/restore
+ 
+ XFree86 1.0Xc (12 September 1992)
+ 46. Fix xman scroll bug
+ 45. Update to ati driver to save more planes
+ 44. Single/double bank selection for drivers
+ 
+ XFree86 1.0Xb (9 September 1992)
+ 43. Link Kit updates
+ 
+ XFree86 1.0Xa (8 September 1992)
+ 42. Fix some Xconfig related problems
+ 41. Trident driver (256 colour and mono)
+ 40. Mono drivers for et3000, pvga1, gvga (untested)
+ 
+ XFree86 1.0X (4 September 1992)
+ 39. Beta release
+ 38. Minor updates
+ 
+ XFree86 1.0m (2 September 1992)
+ 37. Change name to XFree86
+ 36. Added link kit
+ 
+ X386 1.2E 1.0l (30 August 1992)
+ 35. Added (experimental) ATI driver
+ 34. Changed configuration so that mono and colour servers can be built
+     at the same time.
+ X386 1.2E 1.0k (30 August 1992)
+ 33. Directory re-organisation
+ 
+ X386 1.2E 1.0j (29 August 1992)
+ 32. Fix problem of server crashing while resetting
+ 
+ X386 1.2E 1.0i (28 August 1992)
+ 31. Portability changes to vgaFasm.h (for cc and gcc-1.??)
+ 30. Added a -xconfig flag to specifiy the Xconfig file from the command line.
+ 29. Fixed problem with xdmauth accessing memory between 640k and 1M.
+ 28. Round down the specified virtual width to the nearest required multiple.
+ 27. Fix some bugs in the Xconfig parser.
+ 26. Added 'vga2' keyword for Xconfig so one file can be used for both the
+     colour and mono servers.
+ 25. README's updated
+ 24. Minor speedup fix
+ 23. More server configuration changes
+ 
+ X386 1.2E 1.0h (26 August 1992)
+ 22. cfb.banked updated for fix-17
+ 21. New SpeedUp code (works for any* virtual width)
+ 20. Monochrome VGA server
+ 19. Changes for compile-time selection of supported chipsets, and font
+     renderers
+ 18. Updated X386.man, README.Mach
+ 17. Fix mouse map bug for logitech (and microsoft?).
+ 16. Merge in changes for Mach386 (from Robert Baron, Joel Jacobson)
+ 15. Merge in changes for 386BSD (from Rich Murphey, Amancio Hasty)
+ 
+ X386 1.2E 1.0g (25 August 1992)
+ 14. Merged in MIT fix-17
+ 
+ X386 1.2E 1.0f (4 August 1992)
+ 13. SpeedUp flag for Rectangle Stipple fills
+ 
+ X386 1.2E 1.0e (4 August 1992)
+ 12. Extend the trapping of unexpected fatal signals beyond just SIGSEGV.
+     The NoTrapSegV option has been changed to NoTrapSignals.
+ 
+ X386 1.2E 1.0d (3 August 1992)
+ 11. Run mkfontdir in install directory rather than copying fonts.dir from
+     the build directory.
+ 10. Merged in MIT fix-16
+ 
+ X386 1.2E 1.0c (1 August 1992)
+ 9.  Run 'mcs -d' on SVR4 shared libraries
+ 8.  Merged in official Type1 font patch
+ 7.  Merged in MIT fix-15
+ 6.  Fixed malloc/free problems in lib/X/XcmsLRGB.c, clients/xdm/greet.c
+ 5.  Merged in MIT fix-14
+ 
+ X386 1.2E 1.0b (27 July 1992)
+ 4.  Updated version of fFill.s
+ 3.  Bug fixes (for stipple) from Jim (require GCC at the moment)
+ 
+ X386 1.2E 1.0a (22 July 1992)
+ 2.  Merged in MIT fix-13
+ 1.  Fix problem with divide by zero when bell pitch was set to zero.
+ 
+ 
+ X386 1.2E 1.0 (16 July 1992)
+ 97. First general release
+ 96. Define repz to be repe for gas.
+ 95. Update XdmConf.svr4 to read /etc/default/login to set ulimit, etc.
+ 
+ X386 1.2E 0.2c (15 July 1992)
+ 94. Allow easy selection of ansi level when building non-core clients.
+ 93. Install and use sessreg (for xdm)
+ 92. .align changes for gas
+ 91. README and X386.man updates
+ 
+ X386 1.2E 0.2b (11 July 1992)
+ 90. Mods to SpeedUp for gas (jcxz changes).
+ 89. Minor change to xdm/auth.c for ISC3.0
+ 88. Removed SVR4 Vendor defines.
+ 
+ X386 1.2E 0.2a (8 July 1992)
+ 87. Added some missing cld's to gBitBlt.s
+ 86. Some portability changes to fFill.s
+ 85. VT release problem when using FAS/SVR4 really fixed this time.
+ 84. Moved libinetemul.a to lib/InetEmul; library now called libXinetem.a, and
+     used in a similar way as libXbsd.a.  Changes to top level Imakefile have
+     been removed.
+ 83. Updates to README (building under ISC2.2, compiling clients)
+ 82. Include libXbsd.a in ExtraLibraries for SVR4/SYSV
+ 
+ X386 1.2E 0.2 (3 July 1992)
+ 81. Second beta version
+ 80. et debug option removed
+ 
+ X386 1.2E 0.1i (2 July 1992)
+ 79. Fixed VT release problem when using FAS/SVR4.
+ 78. Added warning about using xdmauth.
+ 77. Updated XdmConf.svr4 to handle different auth types
+ 76. Reorganisation of some compiler and assembler related options in x386.cf
+ 
+ X386 1.2E 0.1h (27 June 1992)
+ 75. More portability changes to assembler code.
+ 74. Updates to modeDB, XdmConf.svr4
+ 
+ X386 1.2E 0.1g (25 June 1992)
+ 73. Assembler portability changes from Jon Block.
+ 72. Change startup message from 'X Windows System' to 'X Window System'
+ 
+ X386 1.2E 0.1f (20 June 1992)
+ 71. Fixed line problem when compiling with SVR4 'cc'.
+ 70. Changes to make source compile with Esix 3.2D, ISC 3.0 (without TCPCONN)
+ 
+ X386 1.2E 0.1e (17 June 1992)
+ 69. Removed Glenn's wrapper comments from cfb.banked files.
+ 68. Added a debug flag to check operation of hiclock selection, and hopefully
+     fixed the problem with that.
+ 67. Fixed PIC flag problem in sv4Lib.rules
+ 
+ X386 1.2E 0.1d (13 June 1992)
+ 66. Xconfig is installed as Xconfig.sample so as not to overwrite a locally
+     configured one.
+ 65. Use HasSdbm to determine use of -lsdbm for server and rgb.
+ 64. Made SpeedUp the default when appropriate, and added 'SpeedUp "none"' and
+     'NoSpeedUp' options.
+ 63. Updates to README, X386.man, modeDB.txt.
+ 62. Added a shar file with sample configuration files for xdm.
+ 61. Another setpgrp() change in xdm.
+ 60. Added command line option to specify which VT the server runs on.
+ 59. Changed default pointer map to the correct 1:1 map.
+ 58. Fixed bug in merge of SPEEDUP_TEGBLT8 which caused problems when that
+     option was not selected.
+ 
+ X386 1.2E 0.1c (7 June 1992)
+ 57. Remove some setpgrp() calls in xdm.  This allows xdm to work with
+     xqueue on Microport, Dell, AT&T versions.
+ 56. Default for server to open SCO Xsight connection for SVR4.  SVR4.0.4
+     supports this as part of its "Advanced Compatibility Package".  The
+     code doesn't appear to cause problems with versions of SVR4 without this
+     (the feature just can't be used on them).
+ 
+ X386 1.2E 0.1b (3 June 1992)
+ 55. Fixed bug in SPEEDUP_TEGBLT8 selection in vga.c
+ 54. Glenn's new cfbteblt8.c
+ 
+ X386 1.2E 0.1a (30 May 1992)
+ 53. Fixed problem when switching VT away too quickly after switching back.
+ 52. Added Vendor defines for ISC SVR4 (ISC4), AT&T SVR4 (ATT4)
+ 
+ X386 1.2E 0.1  (29 May 1992)
+ 51. First beta version
+ 
+ X386 1.2E 0.0n (28 May 1992)
+ 50. Added README.X386-1.2E
+ 49. Introductory info added to modeDB.
+ 48. A few missed RCS Header lines.
+ 
+ X386 1.2E 0.0m (26 May 1992)
+ 47. Added options to control building 75dpi, 100dpi, and large misc fonts.
+ 46. More updates to modeDB.
+ 45. Assembly changes for more pedantic 4.0.4 assembler.
+ 44. Moved site-specific defines from x386.cf to site.def
+ 43. Define usleep as the nap syscall for all SVR4 to avoid using libucb.a
+ 
+ X386 1.2E 0.0l (23 May 1992)
+ 42. Added BuildType1 option
+ 41. Fixed ManDir and LibmanDir in site.def
+ 40. Added RCS Header lines to modified files
+ 
+ X386 1.2E 0.0k (23 May 1992)
+ 39. Moved Glenn's and Jim's assembler routines into ddx/x386/enhanced
+ 38. Local connection added to X386.man
+ 37. Jim's update to cfbtileodd.c
+ 
+ X386 1.2E 0.0j (21 May 1992)
+ 36. Updates to ModeDB.txt
+ 35. New fLineH.s from Jim
+ 34. New gLine.s from Glenn
+ 
+ X386 1.2E 0.0i (19 May 1992)
+ 33. Fixed problem with setting mouse acceleration
+ 32. Prettied up startup message
+ 
+ X386 1.2E 0.0h (16 May 1992)
+ 31. Removed SPEEDUP_TEGBLT8 from SPEEDUP_ALL -- it causes problems for some
+     font rendering (characters coming out as solid filled blocks).
+ 30. Added Thomas Eberhardt's compressed bitmap font patches
+ 
+ X386 1.2E 0.0g (15 May 1992)
+ 29. #undef'd SO_DONTLINGER in os/connection.c for SVR4 -- it is not properly
+     defined for SVR4, and it removes the familiar startup error message.
+ 28. Changed SPEEDUP_VHLINE to SPEEDUP_LINE since it's not just for V, H lines
+ 27. Included Glenn's gLine.s
+ 26. Modified auto-detect HiClock code to use Thomas' method of making 16
+     clocks available with ET4000.  HiClock option has been removed since
+     this change makes it obsolete.  X386.man and Xconfig have been updated
+     accordingly.
+ 25. Fix problem switching after SIGHUP is sent while VT switched away.
+ 24. Take x386Resetting out of os/utils.c and put it in x386Init.c
+ 23. Turn on screen saver before copying screen to pixmap when switching away
+ 22. Fixed typo in vga.c related to SPEEDUP_TEGBLT8
+ 
+ X386 1.2E 0.0f (14 May 1992)
+ 21. Removed special handling of SIGSEGV when server is exiting.
+ 20. Take care of server exiting and resetting when VT is switched away.
+ 19. Copy screen to dummy pixmap when switching away, and copy it back when
+     switching back.  (The contents were of the dummy pixmap were previously
+     ignored.)  Masking window is no longer used.
+ 
+ X386 1.2E 0.0e (13 May 1992)
+ 18. Add missing argument in call of GlennsFillBoxSolid -- hopefully fixes
+     SIGSEGV problem.
+ 17. Added x386Version.h, CHANGELOG
+ 16. Added a couple of #undef's in cfbhrzvert.c
+ 15. Fold in public-patch-9 for cfb/cfbbresd.c into cfb.banked/cfbbresd.c
+ 14. casting for VGABASE in cfbbitblt.c
+ 13. #include fix in connection.c
+ 12. Disable building of FontServer in site.def
+ 
+ X386 1.2E 0.0d (12 May 1992)
+ 11. Changes to gFillCopy.s, gVHLine.s to improve hseg100 performance.
+ 10. Change the way GCOps are initialised when SpeedUp is selected
+ 9.  Add SpeedUp to cfbteblt8.c that assumes xdim=1024
+ 
+ X386 1.2E 0.0c (10 May 1992)
+ 8.  Allow SpeedUp Xconfig option to individually select various speedups
+ 
+ X386 1.2E 0.0b (10 May 1992)
+ 7.  Autodetect for HiClock option (not tested yet)
+ 6.  Fix for cfbblt not setting read on dst for GC ops that require it
+ 5.  Minor change in X386.man
+ 
+ X386 1.2E 0.0a (09 May 1992)
+ 4.  Reset screen saver timer for ForceScreenSaver(Reset)
+ 3.  Reset screen saver when switching back
+ 2.  Raise masking window when switching back so all windows get expose events
+ 1.  Use dummy buffer for screen writes when VT is switched away
+ 
+ X386 1.2E 0.0  (07 May 1992)
diff -c xc/programs/Xserver/hw/xfree86/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/Imakefile:3.18
*** xc/programs/Xserver/hw/xfree86/Imakefile:1.1.1.2	Mon Jan 30 17:32:36 1995
--- xc/programs/Xserver/hw/xfree86/Imakefile	Mon Jan 30 17:32:36 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/05 20:53:30 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.16 1994/11/30 20:35:44 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/05 20:53:30 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.18 1995/01/28 16:57:25 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
***************
*** 103,109 ****
  #endif
  
  InstallManPage(XFree86,$(MANDIR))
! InstallNamedTarget(install.man,XF86Conf,$(INSTMANFLAGS),$(FILEMANDIR),XF86Config.$(FILEMANSUFFIX))
  InstallManPage(XF86_Mono,$(MANDIR))
  InstallManPage(XF86_VGA16,$(MANDIR))
  InstallManPage(XF86_SVGA,$(MANDIR))
--- 103,109 ----
  #endif
  
  InstallManPage(XFree86,$(MANDIR))
! InstallGenManPageLong(XF86Conf,$(FILEMANDIR),XF86Config,$(FILEMANSUFFIX))
  InstallManPage(XF86_Mono,$(MANDIR))
  InstallManPage(XF86_VGA16,$(MANDIR))
  InstallManPage(XF86_SVGA,$(MANDIR))
diff -c xc/programs/Xserver/hw/xfree86/XF86Conf.cpp:1.1.1.1 xc/programs/Xserver/hw/xfree86/XF86Conf.cpp:3.11
*** xc/programs/Xserver/hw/xfree86/XF86Conf.cpp:1.1.1.1	Mon Jan 30 17:32:36 1995
--- xc/programs/Xserver/hw/xfree86/XF86Conf.cpp	Mon Jan 30 17:32:36 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: XF86Conf.cpp,v 1.5 95/01/16 13:16:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF86Conf.cpp,v 3.10 1995/01/11 03:46:15 dawes Exp $
  XCOMM
  XCOMM Copyright (c) 1994 by The XFree86 Project, Inc.
  XCOMM
--- 1,5 ----
  XCOMM $XConsortium: XF86Conf.cpp,v 1.5 95/01/16 13:16:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF86Conf.cpp,v 3.11 1995/01/28 15:46:18 dawes Exp $
  XCOMM
  XCOMM Copyright (c) 1994 by The XFree86 Project, Inc.
  XCOMM
diff -c xc/programs/Xserver/hw/xfree86/XF86Conf.man:1.1.1.1 xc/programs/Xserver/hw/xfree86/XF86Conf.man:3.11
*** xc/programs/Xserver/hw/xfree86/XF86Conf.man:1.1.1.1	Mon Jan 30 17:32:37 1995
--- xc/programs/Xserver/hw/xfree86/XF86Conf.man	Mon Jan 30 17:32:37 1995
***************
*** 1,5 ****
  .\" $XConsortium: XF86Conf.man,v 1.5 95/01/16 13:16:10 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Conf.man,v 3.10 1995/01/11 03:46:17 dawes Exp $
  .TH XF86Config 4/5 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86Config - Configuration File for XFree86
--- 1,5 ----
  .\" $XConsortium: XF86Conf.man,v 1.5 95/01/16 13:16:10 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Conf.man,v 3.11 1995/01/28 15:46:20 dawes Exp $
  .TH XF86Config 4/5 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86Config - Configuration File for XFree86
diff -c xc/programs/Xserver/hw/xfree86/XF86_Acc.man:1.1.1.2 xc/programs/Xserver/hw/xfree86/XF86_Acc.man:3.25
*** xc/programs/Xserver/hw/xfree86/XF86_Acc.man:1.1.1.2	Mon Jan 30 17:32:38 1995
--- xc/programs/Xserver/hw/xfree86/XF86_Acc.man	Mon Jan 30 17:32:38 1995
***************
*** 1,5 ****
  .\" $XConsortium: XF86_Acc.man,v 1.8 95/01/23 15:33:27 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Acc.man,v 3.24 1995/01/22 03:04:16 dawes Exp $
  .TH XF86_Accel 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_Accel - accelerated X Window System servers for
--- 1,5 ----
  .\" $XConsortium: XF86_Acc.man,v 1.8 95/01/23 15:33:27 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Acc.man,v 3.25 1995/01/28 15:46:22 dawes Exp $
  .TH XF86_Accel 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_Accel - accelerated X Window System servers for
diff -c xc/programs/Xserver/hw/xfree86/XF86_Mono.man:1.1.1.2 xc/programs/Xserver/hw/xfree86/XF86_Mono.man:3.8
*** xc/programs/Xserver/hw/xfree86/XF86_Mono.man:1.1.1.2	Mon Jan 30 17:32:39 1995
--- xc/programs/Xserver/hw/xfree86/XF86_Mono.man	Mon Jan 30 17:32:39 1995
***************
*** 1,5 ****
  .\" $XConsortium: XF86_Mono.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Mono.man,v 3.7 1995/01/21 07:14:23 dawes Exp $
  .TH XF86_Mono 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_Mono - 1 bit non-accelerated X Window System servers for UNIX on
--- 1,5 ----
  .\" $XConsortium: XF86_Mono.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Mono.man,v 3.8 1995/01/28 15:46:23 dawes Exp $
  .TH XF86_Mono 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_Mono - 1 bit non-accelerated X Window System servers for UNIX on
diff -c xc/programs/Xserver/hw/xfree86/XF86_SVGA.man:1.1.1.2 xc/programs/Xserver/hw/xfree86/XF86_SVGA.man:3.17
*** xc/programs/Xserver/hw/xfree86/XF86_SVGA.man:1.1.1.2	Mon Jan 30 17:32:39 1995
--- xc/programs/Xserver/hw/xfree86/XF86_SVGA.man	Mon Jan 30 17:32:39 1995
***************
*** 1,5 ****
  .\" $XConsortium: XF86_SVGA.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_SVGA.man,v 3.16 1995/01/21 07:14:25 dawes Exp $
  .TH XF86_SVGA 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_SVGA - non-accelerated SVGA X Window System servers for UNIX on 
--- 1,5 ----
  .\" $XConsortium: XF86_SVGA.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_SVGA.man,v 3.17 1995/01/28 15:46:25 dawes Exp $
  .TH XF86_SVGA 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_SVGA - non-accelerated SVGA X Window System servers for UNIX on 
diff -c xc/programs/Xserver/hw/xfree86/XF86_VGA16.man:1.1.1.2 xc/programs/Xserver/hw/xfree86/XF86_VGA16.man:3.8
*** xc/programs/Xserver/hw/xfree86/XF86_VGA16.man:1.1.1.2	Mon Jan 30 17:32:40 1995
--- xc/programs/Xserver/hw/xfree86/XF86_VGA16.man	Mon Jan 30 17:32:40 1995
***************
*** 1,5 ****
  .\" $XConsortium: XF86_VGA16.man,v 1.5 95/01/23 15:33:31 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_VGA16.man,v 3.7 1995/01/21 07:14:26 dawes Exp $
  .TH XF86_VGA16 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_VGA16 - 4 bit non-accelerated X Window System server for UNIX on
--- 1,5 ----
  .\" $XConsortium: XF86_VGA16.man,v 1.5 95/01/23 15:33:31 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_VGA16.man,v 3.8 1995/01/28 15:46:26 dawes Exp $
  .TH XF86_VGA16 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XF86_VGA16 - 4 bit non-accelerated X Window System server for UNIX on
diff -c xc/programs/Xserver/hw/xfree86/XFree86.man:1.1.1.2 xc/programs/Xserver/hw/xfree86/XFree86.man:3.10
*** xc/programs/Xserver/hw/xfree86/XFree86.man:1.1.1.2	Mon Jan 30 17:32:40 1995
--- xc/programs/Xserver/hw/xfree86/XFree86.man	Mon Jan 30 17:32:41 1995
***************
*** 1,5 ****
  .\" $XConsortium: XFree86.man,v 1.6 95/01/23 15:33:32 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.man,v 3.8 1995/01/21 07:14:27 dawes Exp $
  .TH XFree86 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XFree86 - X11R6 for UNIX on x86 platforms
--- 1,5 ----
  .\" $XConsortium: XFree86.man,v 1.6 95/01/23 15:33:32 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.man,v 3.10 1995/01/28 15:46:28 dawes Exp $
  .TH XFree86 1 "Version 3.1.1"  "XFree86"
  .SH NAME
  XFree86 - X11R6 for UNIX on x86 platforms
***************
*** 441,447 ****
  Cirrus 64xx SVGA driver
  .TP 8
  Randy Hendry       \fIrandy@sgi.com\fP
! Cirrus 64xx SVGA driver
  .TP 8
  Frank Dikker       \fIdikker@cs.utwente.nl\fP
  MX SVGA driver
--- 441,447 ----
  Cirrus 64xx SVGA driver
  .TP 8
  Randy Hendry       \fIrandy@sgi.com\fP
! Cirrus 6440 support in the cl64xx SVGA driver
  .TP 8
  Frank Dikker       \fIdikker@cs.utwente.nl\fP
  MX SVGA driver
diff -c xc/programs/Xserver/hw/xfree86/xf86Version.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/xf86Version.h:3.70
*** xc/programs/Xserver/hw/xfree86/xf86Version.h:1.1.1.2	Mon Jan 30 17:32:41 1995
--- xc/programs/Xserver/hw/xfree86/xf86Version.h	Mon Jan 30 17:32:41 1995
***************
*** 1,4 ****
  /* $XConsortium: xf86Version.h,v 1.6 95/01/23 15:33:26 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.68 1995/01/23 01:28:10 dawes Exp $ */
  
  #define XF86_VERSION " 3.1.1 "
--- 1,4 ----
  /* $XConsortium: xf86Version.h,v 1.6 95/01/23 15:33:26 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.70 1995/01/28 16:57:26 dawes Exp $ */
  
  #define XF86_VERSION " 3.1.1 "
diff -c xc/programs/Xserver/hw/xfree86/LinkKit/README:1.1.1.1 xc/programs/Xserver/hw/xfree86/LinkKit/README:3.7
*** xc/programs/Xserver/hw/xfree86/LinkKit/README:1.1.1.1	Mon Jan 30 17:32:45 1995
--- xc/programs/Xserver/hw/xfree86/LinkKit/README	Mon Jan 30 17:32:45 1995
***************
*** 117,123 ****
          by running it with the `-showconfig' flag.  To check which
          extensions are included, start the Xserver and run `xdpyinfo'.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml,v 3.2 1995/01/14 10:47:43 dawes Exp $
  
  
  
--- 117,124 ----
          by running it with the `-showconfig' flag.  To check which
          extensions are included, start the Xserver and run `xdpyinfo'.
  
!   $XConsortium: LinkKit.sgml,v 1.2 95/01/16 13:17:43 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml,v 3.3 1995/01/28 16:01:36 dawes Exp $
  
  
  
***************
*** 130,134 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/LinkKit/README,v 3.6 1995/01/15 10:57:24 dawes Exp $
--- 131,134 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/LinkKit/README,v 3.7 1995/01/28 16:17:18 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/00README:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/00README:3.3
*** xc/programs/Xserver/hw/xfree86/SuperProbe/00README:1.1.1.1	Mon Jan 30 17:32:49 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/00README	Mon Jan 30 17:32:49 1995
***************
*** 77,80 ****
  
  
  $XConsortium: 00README,v 1.4 95/01/12 19:05:31 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/00README,v 3.2 1994/11/30 20:36:06 dawes Exp $
--- 77,80 ----
  
  
  $XConsortium: 00README,v 1.4 95/01/12 19:05:31 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/00README,v 3.3 1995/01/28 15:46:42 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c:1.1.1.1	Mon Jan 30 17:32:50 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c	Mon Jan 30 17:32:50 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: 8514.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c,v 3.1 1994/08/31 04:19:17 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: 8514.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/8514.c,v 3.2 1995/01/28 15:46:45 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c:1.1.1.1	Mon Jan 30 17:32:50 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c	Mon Jan 30 17:32:50 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: AL.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c,v 3.1 1994/08/31 04:19:18 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: AL.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AL.c,v 3.2 1995/01/28 15:46:46 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c:3.4
*** xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c:1.1.1.1	Mon Jan 30 17:32:51 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c	Mon Jan 30 17:32:51 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: ATI.c,v 1.4 95/01/06 20:56:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c,v 3.3 1994/12/10 02:05:18 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: ATI.c,v 1.4 95/01/06 20:56:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ATI.c,v 3.4 1995/01/28 15:46:48 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c:3.5
*** xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c:1.1.1.1	Mon Jan 30 17:32:51 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c	Mon Jan 30 17:32:51 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: ATIMach.c,v 1.5 95/01/23 15:33:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c,v 3.4 1995/01/22 03:04:46 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: ATIMach.c,v 1.5 95/01/23 15:33:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ATIMach.c,v 3.5 1995/01/28 15:46:49 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c:1.1.1.1	Mon Jan 30 17:32:52 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c	Mon Jan 30 17:32:52 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Ahead.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c,v 3.1 1994/08/31 04:19:23 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Ahead.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Ahead.c,v 3.2 1995/01/28 15:46:50 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds:3.1
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds:1.1.1.1	Mon Jan 30 17:32:52 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds	Mon Jan 30 17:32:52 1995
***************
*** 1,6 ****
  # Amakefile for X11R5/mit/server/ddx/x386/SuperProbe.
  # $XConsortium: Amake.cmds,v 1.2 94/11/21 21:29:50 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds,v 3.0 1994/05/14 06:50:40 dawes Exp $
  
  INCLUDES=
  {
--- 1,6 ----
  # Amakefile for X11R5/mit/server/ddx/x386/SuperProbe.
  # $XConsortium: Amake.cmds,v 1.2 94/11/21 21:29:50 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.cmds,v 3.1 1995/01/28 15:46:52 dawes Exp $
  
  INCLUDES=
  {
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist:3.1
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist:1.1.1.1	Mon Jan 30 17:32:52 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist	Mon Jan 30 17:32:52 1995
***************
*** 1,4 ****
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist,v 3.0 1994/05/14 06:50:42 dawes Exp $
  # $XConsortium: Amake.srclist,v 1.2 94/11/21 21:29:50 kaleb Exp $
  
  X11R5_MIT_SERVER_DDX_X386_SUPERPROBE=
--- 1,4 ----
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Amake.srclist,v 3.1 1995/01/28 15:46:53 dawes Exp $
  # $XConsortium: Amake.srclist,v 1.2 94/11/21 21:29:50 kaleb Exp $
  
  X11R5_MIT_SERVER_DDX_X386_SUPERPROBE=
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h:3.5
*** xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h:1.1.1.1	Mon Jan 30 17:32:53 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h	Mon Jan 30 17:32:53 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: AsmMacros.h,v 1.7 95/01/25 23:14:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h,v 3.4 1994/12/17 09:58:03 dawes Exp $ */
  
  #if defined(__EMX__)
  #include <sys/hw.h>
--- 26,32 ----
   */
  
  /* $XConsortium: AsmMacros.h,v 1.7 95/01/25 23:14:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h,v 3.5 1995/01/28 15:46:54 dawes Exp $ */
  
  #if defined(__EMX__)
  #include <sys/hw.h>
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c:1.1.1.1	Mon Jan 30 17:32:53 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c	Mon Jan 30 17:32:53 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: CGA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c,v 3.1 1994/08/31 04:19:26 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: CGA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/CGA.c,v 3.2 1995/01/28 15:46:55 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c /dev/null xc/programs/Xserver/hw/xfree86/SuperProbe/ChangeLog:3.2
*** /dev/null	Mon Jan 30 17:32:54 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/ChangeLog	Mon Jan 30 17:32:54 1995
***************
*** 0 ****
--- 1,101 ----
+ Version 0.1 - March 25, 1993
+ 	- Initial delivery to XFree86 beta-team in 1.2A
+ 	- Handles ident of MDA,CGA,MCGA,EGA,VGA,Hercules, and lots of SVGA
+ 	- Handles many RAMDACs
+ 	- Requires ANSI C
+ 
+ Version 0.2 - April 17, 1993
+ 	- Delivery to XFree86 beta-team in 1.2B
+ 	- Modified to search out BIOS base address (don't assume it's at
+ 	  0xC0000).
+ 	- Add Trident 8900CL, Tseng ET4000/W32
+ 
+ Version 0.3 - May 7, 1993
+ 	- Delivery to XFree86 beta-team in 1.2C
+ 	- Allow compilation with K&R C compilers
+ 	- Add support for Minix
+ 	- Add -noprobe option to skip certain chipsets.
+ 	- Cirrus has built-in RAMDAC.  Test for it, since the RAMDAC probe
+ 	  hangs machines with Cirrus boards.
+ 	- #ifdef out C&T probe - it just seems to be TOO evil for words.
+ 
+ Version 0.4 - May 24, 1993
+ 	- Delivery to XFree86 beta team for 1.2D
+ 	- Add support for Mach
+ 	- Add Compaq QVision/1280, fix up Cirrus and NCR
+ 
+ Version 0.5 - June 1, 1993
+ 	- Final delivery for XFree86 1.3
+ 	- Change ET3000 probe
+ 	- Update docs regarding MicroChannel
+ 
+ Version 0.6 - June 28, 1993
+ 	- Redo C&T probe function
+ 
+ Version 0.7 -
+ 	- Update RAMDAC probes to check 6/8-bit wide lookup tables and to
+ 	  identify the different AT&T RAMDACs.
+ 	- Add support for 8514/A, ATI Mach8 and ATI Mach32 detection.
+ 
+ Version 0.8 - 
+ 	- Update the S3 probes with all currently-known information.
+ 	- Bug fixes from Holger Veit
+ 
+ Version 0.9 - 
+ 	- Fix coprocessor ID code.
+ 	- Add Cirrus 5428, correct Cirrus built-in RAMDACs
+ 	- Update OS_Mach.c for Mach 3.0
+ 	- Even MORE S3 rev codes
+ 
+ Version 0.91
+ 	- Add ATI Ultra/XLR (I think...)
+ 	- Update ATIMach.c to not read BIOS so an 8514 Ultra is detected.
+ 	- Add -no_bios flag to disallow BIOS reading and assume EGA/VGA
+ 	- Update Oak probe mechanism and add 057 check
+ 	- Update WD/Paradise probe to distinguish 90C2X chipsets
+ 
+ Version 0.92
+ 	- Fix broken ATIMach.c (infinite loops are a bad thing :->)
+ 	- Add probe for Bt485 RAMDAC on S3 boards
+ 	- Rearrange chipset numbering so that the Unknown values are
+ 	  always index 0.  Add support for printing out a signature for
+ 	  Unknown chipsets.
+ 
+ Version 1.0
+ 	- Add in Cirrus 62x5, 642x chipsets
+ 	- Call it "done" for XFree86 2.0
+ 
+ Version 1.1
+ 	- Add AT&T 20C505/504 checks to the RAMDAC probe
+ 	- Add Solaris x86 support (from David Holland <davidh@dorite.use.com>)
+ 	- Add -no_dac option to skip RAMDAC probe, in case it's nuking things.
+ 	- Long and short RamDac names.
+ 	- If the video BIOS can't be located, don't fail.  Assume that there's
+ 	  no EGA/VGA, and probe for old hardware.
+ 	- Put architecture in place for doing installed memory probes.
+ 
+ Version 1.2 - Jan 2, 1994
+ 	- More work on memory probes.  Add support for probing memory
+ 	  by mapping 0xA0000-0xAFFFF and switching banks.  Support
+ 	  memory probe via this mechanism for Trident and ET4000AX.
+ 	- Add probes for Trident 9200CXr, 9400CXi.
+ 	- Add support for USL-style VTs on bsd-du-jour (from J"org Wunsch).
+ 	- Add -no_mem option to skip memory probe
+ 
+ Version 2.0 - Feb 27, 1994
+ 	- Add memory probes for everything that can be accomplished by
+ 	  reading registers.  Nothing is currently using the physical
+ 	  memory probe.
+ 	- Bazillions of changes from vgadoc3.zip (thanks, Finn).  Added
+ 	  HMC, UMC, Weitek probes.  Added more chipsets for Cirrus,
+ 	  NCR, Oak, RealTek, S3, Trident, Tseng, Video7, WD.  Made some
+ 	  changes to the probes for ATI & Compaq.
+ 
+ Version 2.1 - April 13, 1994
+ 	- Small updates
+ 
+ Version 2.2 - August 28, 1994
+ 	- More small updates
+ 
+ Version 2.3 - November 18, 1994
+ 	- Add support for ATI Mach64.
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c:3.3
*** xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c:1.1.1.1	Mon Jan 30 17:32:54 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c	Mon Jan 30 17:32:54 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: ChipsTech.c,v 1.3 95/01/16 13:16:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c,v 3.2 1995/01/07 05:43:59 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: ChipsTech.c,v 1.3 95/01/16 13:16:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/ChipsTech.c,v 3.3 1995/01/28 15:46:57 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c:3.4
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c:1.1.1.1	Mon Jan 30 17:32:55 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c	Mon Jan 30 17:32:55 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Cirrus.c,v 1.4 95/01/12 19:11:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c,v 3.3 1994/12/02 05:46:23 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Cirrus.c,v 1.4 95/01/12 19:11:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Cirrus.c,v 3.4 1995/01/28 15:46:58 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c:1.1.1.1	Mon Jan 30 17:32:55 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c	Mon Jan 30 17:32:55 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Compaq.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c,v 3.1 1994/08/31 04:19:32 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Compaq.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Compaq.c,v 3.2 1995/01/28 15:46:59 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c:1.1.1.1	Mon Jan 30 17:32:55 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c	Mon Jan 30 17:32:55 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Genoa.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c,v 3.1 1994/08/31 04:19:33 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Genoa.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Genoa.c,v 3.2 1995/01/28 15:47:00 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c:1.1.1.1	Mon Jan 30 17:32:56 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c	Mon Jan 30 17:32:56 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: HMC.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c,v 3.1 1994/08/31 04:19:35 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: HMC.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/HMC.c,v 3.2 1995/01/28 15:47:01 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c:1.1.1.1	Mon Jan 30 17:32:56 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c	Mon Jan 30 17:32:56 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Herc.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c,v 3.1 1994/08/31 04:19:36 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Herc.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Herc.c,v 3.2 1995/01/28 15:47:03 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile:3.7
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile:1.1.1.1	Mon Jan 30 17:32:57 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile	Mon Jan 30 17:32:57 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:56:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile,v 3.6 1994/12/17 09:58:06 dawes Exp $
  
  #if defined(SVR3Architecture) || defined(SVR4Architecture)
  # define OSModule OS_SYSV
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:56:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile,v 3.7 1995/01/28 15:47:04 dawes Exp $
  
  #if defined(SVR3Architecture) || defined(SVR4Architecture)
  # define OSModule OS_SYSV
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c:1.1.1.1	Mon Jan 30 17:32:57 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c	Mon Jan 30 17:32:57 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: MDA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c,v 3.1 1994/08/31 04:19:38 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: MDA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MDA.c,v 3.2 1995/01/28 15:47:05 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c:1.1.1.1	Mon Jan 30 17:32:58 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c	Mon Jan 30 17:32:58 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: MX.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c,v 3.1 1994/08/31 04:19:39 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: MX.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MX.c,v 3.2 1995/01/28 15:47:06 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c:3.6
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c:1.1.1.1	Mon Jan 30 17:32:58 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c	Mon Jan 30 17:32:58 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Main.c,v 1.4 95/01/06 20:56:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c,v 3.5 1994/12/17 09:58:07 dawes Exp $ */
  
  #include "Probe.h"
  #include "PatchLevel.h"
--- 26,32 ----
   */
  
  /* $XConsortium: Main.c,v 1.4 95/01/06 20:56:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Main.c,v 3.6 1995/01/28 15:47:08 dawes Exp $ */
  
  #include "Probe.h"
  #include "PatchLevel.h"
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std:3.6
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std:1.1.1.1	Mon Jan 30 17:32:59 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std	Mon Jan 30 17:32:59 1995
***************
*** 1,5 ****
  # $XConsortium: Makefile.std,v 1.4 95/01/06 20:56:42 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std,v 3.5 1994/12/18 12:49:19 dawes Exp $
  #
  # Installation parameters
  #
--- 1,5 ----
  # $XConsortium: Makefile.std,v 1.4 95/01/06 20:56:42 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Makefile.std,v 3.6 1995/01/28 15:47:09 dawes Exp $
  #
  # Installation parameters
  #
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c:1.1.1.1	Mon Jan 30 17:32:59 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c	Mon Jan 30 17:32:59 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: MemProbe.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c,v 3.1 1994/08/31 04:19:42 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: MemProbe.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/MemProbe.c,v 3.2 1995/01/28 15:47:11 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c:1.1.1.1	Mon Jan 30 17:33:00 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c	Mon Jan 30 17:33:00 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: NCR.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c,v 3.1 1994/08/31 04:19:44 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: NCR.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/NCR.c,v 3.2 1995/01/28 15:47:12 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.4
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:1.1.1.1	Mon Jan 30 17:33:00 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c	Mon Jan 30 17:33:00 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: OS_386BSD.c,v 1.4 95/01/23 15:33:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.3 1995/01/19 05:20:38 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: OS_386BSD.c,v 1.4 95/01/23 15:33:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.4 1995/01/28 15:47:13 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c:1.1.1.1	Mon Jan 30 17:33:01 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c	Mon Jan 30 17:33:01 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: OS_Linux.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c,v 3.1 1994/08/31 04:19:47 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: OS_Linux.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Linux.c,v 3.2 1995/01/28 15:47:15 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c:1.1.1.1	Mon Jan 30 17:33:01 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c	Mon Jan 30 17:33:01 1995
***************
*** 27,33 ****
   */
  
  /* $XConsortium: OS_Mach.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c,v 3.1 1994/08/31 04:19:48 dawes Exp $ */
  
  #include "Probe.h"
  
--- 27,33 ----
   */
  
  /* $XConsortium: OS_Mach.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Mach.c,v 3.2 1995/01/28 15:47:16 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c:1.1.1.1	Mon Jan 30 17:33:02 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c	Mon Jan 30 17:33:02 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: OS_Minix.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c,v 3.1 1994/08/31 04:19:50 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: OS_Minix.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Minix.c,v 3.2 1995/01/28 15:47:17 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c:3.1
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c:1.1.1.1	Mon Jan 30 17:33:02 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c	Mon Jan 30 17:33:02 1995
***************
*** 27,33 ****
   */
  
  /* $XConsortium: OS_Os2.c,v 1.1 95/01/06 20:47:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c,v 3.0 1994/12/17 09:58:09 dawes Exp $ */
  
  
  #include "Probe.h"
--- 27,33 ----
   */
  
  /* $XConsortium: OS_Os2.c,v 1.1 95/01/06 20:47:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c,v 3.1 1995/01/28 15:47:19 dawes Exp $ */
  
  
  #include "Probe.h"
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c:3.6
*** xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c:1.1.1.1	Mon Jan 30 17:33:02 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c	Mon Jan 30 17:33:03 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: OS_SYSV.c,v 1.5 95/01/16 13:16:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c,v 3.5 1995/01/07 04:02:38 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: OS_SYSV.c,v 1.5 95/01/16 13:16:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_SYSV.c,v 3.6 1995/01/28 15:47:20 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c:1.1.1.1	Mon Jan 30 17:33:03 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c	Mon Jan 30 17:33:03 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Oak.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c,v 3.1 1994/08/31 04:19:53 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Oak.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Oak.c,v 3.2 1995/01/28 15:47:21 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h:3.3
*** xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h:1.1.1.1	Mon Jan 30 17:33:03 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h	Mon Jan 30 17:33:03 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: PatchLevel.h,v 1.4 95/01/12 19:16:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h,v 3.2 1994/11/30 20:36:13 dawes Exp $ */
  
  #define VERSION 	2
  #define PATCHLEV 	3
--- 26,32 ----
   */
  
  /* $XConsortium: PatchLevel.h,v 1.4 95/01/12 19:16:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/PatchLevel.h,v 3.3 1995/01/28 15:47:23 dawes Exp $ */
  
  #define VERSION 	2
  #define PATCHLEV 	3
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c:1.1.1.1	Mon Jan 30 17:33:04 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c	Mon Jan 30 17:33:04 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Primus.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c,v 3.1 1994/08/31 04:19:56 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Primus.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Primus.c,v 3.2 1995/01/28 15:47:24 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c:3.8
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c:1.1.1.1	Mon Jan 30 17:33:04 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c	Mon Jan 30 17:33:04 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Print.c,v 1.5 95/01/16 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c,v 3.7 1995/01/07 05:44:00 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Print.c,v 1.5 95/01/16 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c,v 3.8 1995/01/28 15:47:25 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h:3.8
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h:1.1.1.1	Mon Jan 30 17:33:05 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h	Mon Jan 30 17:33:05 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Probe.h,v 1.5 95/01/16 13:16:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h,v 3.7 1995/01/07 05:44:02 dawes Exp $ */
  
  /*
   * Includes
--- 26,32 ----
   */
  
  /* $XConsortium: Probe.h,v 1.5 95/01/16 13:16:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h,v 3.8 1995/01/28 15:47:27 dawes Exp $ */
  
  /*
   * Includes
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c:3.7
*** xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c:1.1.1.1	Mon Jan 30 17:33:06 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c	Mon Jan 30 17:33:06 1995
***************
*** 30,36 ****
   */
  
  /* $XConsortium: RamDac.c,v 1.4 95/01/12 19:19:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c,v 3.6 1994/11/30 20:36:17 dawes Exp $ */
  
  #include "Probe.h"
  
--- 30,36 ----
   */
  
  /* $XConsortium: RamDac.c,v 1.4 95/01/12 19:19:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/RamDac.c,v 3.7 1995/01/28 15:47:29 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c:1.1.1.1	Mon Jan 30 17:33:06 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c	Mon Jan 30 17:33:06 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: RealTek.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c,v 3.1 1994/08/31 04:20:03 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: RealTek.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/RealTek.c,v 3.2 1995/01/28 15:47:30 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c:3.4
*** xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c:1.1.1.1	Mon Jan 30 17:33:07 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c	Mon Jan 30 17:33:07 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: S3.c,v 1.4 95/01/12 19:30:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c,v 3.3 1994/11/06 09:50:37 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: S3.c,v 1.4 95/01/12 19:30:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c,v 3.4 1995/01/28 15:47:32 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s:3.1
*** xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s:1.1.1.1	Mon Jan 30 17:33:07 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s	Mon Jan 30 17:33:07 1995
***************
*** 16,22 ****
  /          extern void outl(int port, unsigned long value);
  /
  / $XConsortium: SolX86IO.s,v 1.2 94/11/21 21:29:50 kaleb Exp $ 
! / $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s,v 3.0 1994/05/14 06:51:16 dawes Exp $
  
  .file "SolX86IO.s"
  .text
--- 16,22 ----
  /          extern void outl(int port, unsigned long value);
  /
  / $XConsortium: SolX86IO.s,v 1.2 94/11/21 21:29:50 kaleb Exp $ 
! / $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/SolX86IO.s,v 3.1 1995/01/28 15:47:33 dawes Exp $
  
  .file "SolX86IO.s"
  .text
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man:1.1.1.1	Mon Jan 30 17:33:07 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man	Mon Jan 30 17:33:07 1995
***************
*** 1,5 ****
  .\" $XConsortium: SuperProbe.man,v 1.2 94/11/21 21:29:50 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man,v 3.1 1994/08/31 04:20:05 dawes Exp $
  .TH SuperProbe 1 "Version 2.2" ""
  .SH NAME
  SuperProbe - probe for and identify installed video hardware.
--- 1,5 ----
  .\" $XConsortium: SuperProbe.man,v 1.2 94/11/21 21:29:50 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man,v 3.2 1995/01/28 15:47:35 dawes Exp $
  .TH SuperProbe 1 "Version 2.2" ""
  .SH NAME
  SuperProbe - probe for and identify installed video hardware.
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c:1.1.1.1	Mon Jan 30 17:33:08 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c	Mon Jan 30 17:33:08 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Trident.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c,v 3.1 1994/08/31 04:20:07 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Trident.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c,v 3.2 1995/01/28 15:47:36 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c:3.3
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c:1.1.1.1	Mon Jan 30 17:33:08 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c	Mon Jan 30 17:33:08 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Tseng.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c,v 3.2 1994/09/26 15:31:01 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Tseng.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Tseng.c,v 3.3 1995/01/28 15:47:37 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c:1.1.1.1	Mon Jan 30 17:33:09 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c	Mon Jan 30 17:33:09 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: UMC.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c,v 3.1 1994/08/31 04:20:10 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: UMC.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/UMC.c,v 3.2 1995/01/28 15:47:39 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c:3.3
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c:1.1.1.1	Mon Jan 30 17:33:09 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c	Mon Jan 30 17:33:09 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Utils.c,v 1.4 95/01/12 19:32:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c,v 3.2 1994/11/30 20:36:19 dawes Exp $ */
  
  #include "Probe.h"
  #include "AsmMacros.h"
--- 26,32 ----
   */
  
  /* $XConsortium: Utils.c,v 1.4 95/01/12 19:32:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Utils.c,v 3.3 1995/01/28 15:47:40 dawes Exp $ */
  
  #include "Probe.h"
  #include "AsmMacros.h"
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c:1.1.1.1	Mon Jan 30 17:33:10 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c	Mon Jan 30 17:33:10 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: VGA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c,v 3.1 1994/08/31 04:20:12 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: VGA.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/VGA.c,v 3.2 1995/01/28 15:47:42 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c:1.1.1.1	Mon Jan 30 17:33:10 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c	Mon Jan 30 17:33:10 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Video7.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c,v 3.1 1994/08/31 04:20:14 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Video7.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Video7.c,v 3.2 1995/01/28 15:47:43 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c:1.1.1.1	Mon Jan 30 17:33:10 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c	Mon Jan 30 17:33:10 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: WD.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c,v 3.1 1994/08/31 04:20:15 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: WD.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/WD.c,v 3.2 1995/01/28 15:47:44 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c:1.1.1.1	Mon Jan 30 17:33:11 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c	Mon Jan 30 17:33:11 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Weitek.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c,v 3.1 1994/08/31 04:20:16 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Weitek.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Weitek.c,v 3.2 1995/01/28 15:47:45 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c:3.2
*** xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c:1.1.1.1	Mon Jan 30 17:33:11 1995
--- xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c	Mon Jan 30 17:33:11 1995
***************
*** 26,32 ****
   */
  
  /* $XConsortium: Yamaha.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c,v 3.1 1994/08/31 04:20:18 dawes Exp $ */
  
  #include "Probe.h"
  
--- 26,32 ----
   */
  
  /* $XConsortium: Yamaha.c,v 1.2 94/11/21 21:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/Yamaha.c,v 3.2 1995/01/28 15:47:46 dawes Exp $ */
  
  #include "Probe.h"
  
diff -c xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile:1.1.1.1	Mon Jan 30 17:33:13 1995
--- xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile	Mon Jan 30 17:33:13 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:56:44 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile,v 3.2 1994/12/26 01:08:43 dawes Exp $
  
  all::
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:56:44 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile,v 3.3 1995/01/28 15:48:03 dawes Exp $
  
  all::
  
diff -c xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub:1.1.1.1 xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub:3.1
*** xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub:1.1.1.1	Mon Jan 30 17:33:13 1995
--- xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub	Mon Jan 30 17:33:13 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile.stub,v 1.2 94/11/21 21:39:05 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub,v 3.0 1994/05/30 08:23:03 dawes Exp $
  XCOMM
  XCOMM This is an Imakefile for the stub driver.  
  XCOMM 
--- 1,5 ----
  XCOMM $XConsortium: Imakefile.stub,v 1.2 94/11/21 21:39:05 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/Imakefile.stub,v 3.1 1995/01/28 15:48:04 dawes Exp $
  XCOMM
  XCOMM This is an Imakefile for the stub driver.  
  XCOMM 
diff -c xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc:1.1.1.1 xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc:3.12
*** xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc:1.1.1.1	Mon Jan 30 17:33:15 1995
--- xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc	Mon Jan 30 17:33:15 1995
***************
*** 1047,1053 ****
       Western Digital
          (714) 932-4900
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml,v 3.4 1995/01/21 10:44:34 dawes Exp $
  
  
  
--- 1047,1054 ----
       Western Digital
          (714) 932-4900
  
!   $XConsortium: VGADriv.sgml,v 1.3 95/01/23 15:34:51 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml,v 3.5 1995/01/28 16:02:34 dawes Exp $
  
  
  
***************
*** 1054,1059 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc,v 3.10 1995/01/21 11:09:29 dawes Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc,v 3.4 1994/09/27 14:18:32 dawes Exp $
--- 1055,1058 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/VGADriver.Doc,v 3.12 1995/01/28 16:18:24 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s:3.2
*** xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s:1.1.1.1	Mon Jan 30 17:33:15 1995
--- xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s	Mon Jan 30 17:33:15 1995
***************
*** 1,5 ****
  /* $XConsortium: stub_bank.s,v 1.2 94/11/21 21:39:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s,v 3.1 1994/09/27 14:18:34 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
   *
--- 1,5 ----
  /* $XConsortium: stub_bank.s,v 1.2 94/11/21 21:39:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_bank.s,v 3.2 1995/01/28 15:48:09 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c:3.12
*** xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c:1.1.1.1	Mon Jan 30 17:33:16 1995
--- xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c	Mon Jan 30 17:33:16 1995
***************
*** 1,5 ****
  /* $XConsortium: stub_driver.c,v 1.4 95/01/16 13:16:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c,v 3.11 1995/01/10 11:33:50 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
   *
--- 1,5 ----
  /* $XConsortium: stub_driver.c,v 1.4 95/01/16 13:16:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/VGADriverDoc/stub_driver.c,v 3.12 1995/01/28 15:48:10 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c:1.1.1.1	Mon Jan 30 17:33:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c	Mon Jan 30 17:33:22 1995
***************
*** 1,5 ****
  /* $XConsortium: Bt481.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c,v 3.2 1995/01/26 02:16:43 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: Bt481.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c,v 3.3 1995/01/28 15:48:19 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h:1.1.1.1	Mon Jan 30 17:33:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h	Mon Jan 30 17:33:22 1995
***************
*** 1,5 ****
  /* $XConsortium: Bt481.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h,v 3.0 1994/06/15 15:35:50 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
--- 1,5 ----
  /* $XConsortium: Bt481.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h,v 3.1 1995/01/28 15:48:21 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c:1.1.1.1	Mon Jan 30 17:33:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c	Mon Jan 30 17:33:23 1995
***************
*** 1,5 ****
  /* $XConsortium: Bt485.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c,v 3.2 1995/01/26 02:16:46 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
--- 1,5 ----
  /* $XConsortium: Bt485.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c,v 3.3 1995/01/28 15:48:22 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h:1.1.1.1	Mon Jan 30 17:33:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h	Mon Jan 30 17:33:23 1995
***************
*** 1,5 ****
  /* $XConsortium: Bt485.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h,v 3.1 1994/09/07 15:47:44 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
--- 1,5 ----
  /* $XConsortium: Bt485.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h,v 3.2 1995/01/28 15:48:23 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile:3.9
*** xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile:1.1.1.1	Mon Jan 30 17:33:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile	Mon Jan 30 17:33:23 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:33:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile,v 3.8 1995/01/26 02:16:48 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	agx.c agxCmap.c agxCursor.c  agxInit.c vgaHW.c agxIm.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:33:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Imakefile,v 3.9 1995/01/28 15:48:24 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	agx.c agxCmap.c agxCursor.c  agxInit.c vgaHW.c agxIm.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agx.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agx.c:3.26
*** xc/programs/Xserver/hw/xfree86/accel/agx/agx.c:1.1.1.1	Mon Jan 30 17:33:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agx.c	Mon Jan 30 17:33:25 1995
***************
*** 1,5 ****
  /* $XConsortium: agx.c,v 1.7 95/01/23 15:33:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agx.c,v 3.25 1995/01/23 01:28:30 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: agx.c,v 1.7 95/01/23 15:33:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agx.c,v 3.26 1995/01/28 15:48:26 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agx.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agx.h:3.12
*** xc/programs/Xserver/hw/xfree86/accel/agx/agx.h:1.1.1.1	Mon Jan 30 17:33:25 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agx.h	Mon Jan 30 17:33:25 1995
***************
*** 1,5 ****
  /* $XConsortium: agx.h,v 1.6 95/01/23 15:33:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agx.h,v 3.10 1995/01/23 01:28:32 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
--- 1,5 ----
  /* $XConsortium: agx.h,v 1.6 95/01/23 15:33:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agx.h,v 3.12 1995/01/28 15:48:28 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c:1.1.1.1	Mon Jan 30 17:33:26 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c	Mon Jan 30 17:33:26 1995
***************
*** 1,5 ****
  /* $XConsortium: agxBCach.c,v 1.3 95/01/05 20:29:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c,v 3.6 1994/11/19 07:49:52 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxBCach.c,v 1.3 95/01/05 20:29:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.c,v 3.7 1995/01/28 15:48:30 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h:1.1.1.1	Mon Jan 30 17:33:26 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h	Mon Jan 30 17:33:26 1995
***************
*** 1,5 ****
  /* $XConsortium: agxBCach.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h,v 3.1 1994/06/26 13:04:12 dawes Exp $ */
  /*
   * Jon's cache malloc rubbish
   *
--- 1,5 ----
  /* $XConsortium: agxBCach.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBCach.h,v 3.2 1995/01/28 15:48:31 dawes Exp $ */
  /*
   * Jon's cache malloc rubbish
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c:1.1.1.1	Mon Jan 30 17:33:27 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c	Mon Jan 30 17:33:27 1995
***************
*** 1,5 ****
  /* $XConsortium: agxBStor.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c,v 3.0 1994/08/01 12:08:44 dawes Exp $ */
  /*-
   * agxbstore.c --
   *	Functions required by the backing-store implementation in MI.
--- 1,5 ----
  /* $XConsortium: agxBStor.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBStor.c,v 3.1 1995/01/28 15:48:32 dawes Exp $ */
  /*-
   * agxbstore.c --
   *	Functions required by the backing-store implementation in MI.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c:3.10
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c:1.1.1.1	Mon Jan 30 17:33:28 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c	Mon Jan 30 17:33:28 1995
***************
*** 1,5 ****
  /* $XConsortium: agxBlt.c,v 1.4 95/01/05 20:29:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c,v 3.9 1994/11/26 12:39:57 dawes Exp $ */
  /*
  Copyright 1989 by the Massachusetts Institute of Technology
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: agxBlt.c,v 1.4 95/01/05 20:29:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxBlt.c,v 3.10 1995/01/28 15:48:34 dawes Exp $ */
  /*
  Copyright 1989 by the Massachusetts Institute of Technology
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c:1.1.1.1	Mon Jan 30 17:33:28 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c	Mon Jan 30 17:33:28 1995
***************
*** 1,5 ****
  /* $XConsortium: agxCmap.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c,v 3.1 1994/09/11 00:36:40 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1994    by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxCmap.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxCmap.c,v 3.2 1995/01/28 15:48:37 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1994    by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c:1.1.1.1	Mon Jan 30 17:33:29 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c	Mon Jan 30 17:33:29 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c,v 3.1 1994/06/18 16:23:04 dawes Exp $ */
  /*
   * $XConsortium: agxCursor.c,v 1.3 95/01/12 19:36:51 kaleb Exp $
   * 
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxCursor.c,v 3.2 1995/01/28 15:48:38 dawes Exp $ */
  /*
   * $XConsortium: agxCursor.c,v 1.3 95/01/12 19:36:51 kaleb Exp $
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c:1.1.1.1	Mon Jan 30 17:33:29 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c	Mon Jan 30 17:33:29 1995
***************
*** 1,5 ****
  /* $XConsortium: agxDLine.c,v 1.2 95/01/06 20:56:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c,v 3.1 1994/12/25 12:19:12 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxDLine.c,v 1.2 95/01/06 20:56:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c,v 3.2 1995/01/28 15:48:40 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c:1.1.1.1	Mon Jan 30 17:33:30 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c	Mon Jan 30 17:33:30 1995
***************
*** 1,5 ****
  /* $XConsortium: agxDSeg.c,v 1.2 95/01/06 20:56:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c,v 3.1 1994/12/25 12:19:14 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxDSeg.c,v 1.2 95/01/06 20:56:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c,v 3.2 1995/01/28 15:48:42 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c:1.1.1.1	Mon Jan 30 17:33:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c	Mon Jan 30 17:33:31 1995
***************
*** 28,34 ****
  ********************************************************/
  
  /* $XConsortium: agxFArc.c,v 1.2 95/01/12 19:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c,v 3.1 1994/11/22 02:37:19 dawes Exp $ */
  
  #include <math.h>
  #include "X.h"
--- 28,34 ----
  ********************************************************/
  
  /* $XConsortium: agxFArc.c,v 1.2 95/01/12 19:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c,v 3.2 1995/01/28 15:48:43 dawes Exp $ */
  
  #include <math.h>
  #include "X.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c:3.10
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c:1.1.1.1	Mon Jan 30 17:33:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c	Mon Jan 30 17:33:31 1995
***************
*** 1,5 ****
  /* $XConsortium: agxFCach.c,v 1.4 95/01/23 15:33:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c,v 3.9 1995/01/23 01:28:34 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxFCach.c,v 1.4 95/01/23 15:33:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFCach.c,v 3.10 1995/01/28 15:48:45 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c:1.1.1.1	Mon Jan 30 17:33:32 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c	Mon Jan 30 17:33:32 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  /* $XConsortium: agxFPoly.c,v 1.2 95/01/12 19:39:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c,v 3.0 1994/11/19 07:50:04 dawes Exp $ */
  
  
  #include "gcstruct.h"
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: agxFPoly.c,v 1.2 95/01/12 19:39:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c,v 3.1 1995/01/28 15:48:47 dawes Exp $ */
  
  
  #include "gcstruct.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c:1.1.1.1	Mon Jan 30 17:33:33 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c	Mon Jan 30 17:33:33 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c,v 3.4 1994/11/19 07:50:06 dawes Exp $ */
  /*
   * Fill rectangles.
   */
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFRect.c,v 3.5 1995/01/28 15:48:48 dawes Exp $ */
  /*
   * Fill rectangles.
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c:1.1.1.1	Mon Jan 30 17:33:33 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c	Mon Jan 30 17:33:33 1995
***************
*** 1,5 ****
  /* $XConsortium: agxFS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c,v 3.5 1994/09/23 10:07:28 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxFS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFS.c,v 3.6 1995/01/28 15:48:50 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c:1.1.1.1	Mon Jan 30 17:33:34 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c	Mon Jan 30 17:33:34 1995
***************
*** 1,5 ****
  /* $XConsortium: agxFont.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c,v 3.0 1994/06/15 15:35:26 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxFont.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFont.c,v 3.1 1995/01/28 15:48:51 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c:1.1.1.1	Mon Jan 30 17:33:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c	Mon Jan 30 17:33:35 1995
***************
*** 1,5 ****
  /* $XConsortium: agxGS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c,v 3.2 1994/08/20 07:32:04 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxGS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxGS.c,v 3.3 1995/01/28 15:48:53 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c:1.1.1.1	Mon Jan 30 17:33:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c	Mon Jan 30 17:33:36 1995
***************
*** 1,5 ****
  /* $XConsortium: agxGtImg.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c,v 3.0 1994/09/07 15:47:23 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: agxGtImg.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxGtImg.c,v 3.1 1995/01/28 15:48:54 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c:3.13
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c:1.1.1.1	Mon Jan 30 17:33:38 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c	Mon Jan 30 17:33:38 1995
***************
*** 1,5 ****
  /* $XConsortium: agxIm.c,v 1.7 95/01/27 14:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c,v 3.12 1995/01/27 03:32:01 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxIm.c,v 1.7 95/01/27 14:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.c,v 3.13 1995/01/28 15:48:57 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h:1.1.1.1	Mon Jan 30 17:33:39 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h	Mon Jan 30 17:33:39 1995
***************
*** 1,5 ****
  /* $XConsortium: agxIm.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h,v 3.0 1994/06/15 15:35:31 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: agxIm.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxIm.h,v 3.1 1995/01/28 15:48:59 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c:3.15
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c:1.1.1.1	Mon Jan 30 17:33:40 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c	Mon Jan 30 17:33:40 1995
***************
*** 1,5 ****
  /* $XConsortium: agxInit.c,v 1.7 95/01/23 15:33:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c,v 3.14 1995/01/23 01:28:40 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: agxInit.c,v 1.7 95/01/23 15:33:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxInit.c,v 3.15 1995/01/28 15:49:02 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c:1.1.1.1	Mon Jan 30 17:33:40 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c	Mon Jan 30 17:33:41 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c,v 3.3 1994/11/19 07:50:17 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxLine.c,v 3.4 1995/01/28 15:49:04 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c:1.1.1.1	Mon Jan 30 17:33:41 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c	Mon Jan 30 17:33:41 1995
***************
*** 1,5 ****
  /* $XConsortium: agxMap.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c,v 3.0 1994/06/15 15:35:37 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
--- 1,5 ----
  /* $XConsortium: agxMap.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxMap.c,v 3.1 1995/01/28 15:49:06 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c:1.1.1.1	Mon Jan 30 17:33:41 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c	Mon Jan 30 17:33:42 1995
***************
*** 1,5 ****
  /* $XConsortium: agxPntWin.c,v 1.5 95/01/27 14:51:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c,v 3.6 1995/01/20 05:48:56 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxPntWin.c,v 1.5 95/01/27 14:51:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxPntWin.c,v 3.7 1995/01/28 15:49:07 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c:1.1.1.1	Mon Jan 30 17:33:42 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c	Mon Jan 30 17:33:42 1995
***************
*** 1,5 ****
  /* $XConsortium: agxSS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c,v 3.0 1994/06/15 15:35:38 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxSS.c,v 1.1 94/10/05 13:27:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxSS.c,v 3.1 1995/01/28 15:49:08 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c:1.1.1.1	Mon Jan 30 17:33:42 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c	Mon Jan 30 17:33:42 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c,v 3.4 1994/12/10 02:07:17 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxScrIn.c,v 3.5 1995/01/28 15:49:10 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c:1.1.1.1	Mon Jan 30 17:33:43 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c	Mon Jan 30 17:33:43 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c,v 3.4 1994/11/19 07:50:19 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxSeg.c,v 3.5 1995/01/28 15:49:11 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c:1.1.1.1	Mon Jan 30 17:33:43 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c	Mon Jan 30 17:33:44 1995
***************
*** 1,5 ****
  /* $XConsortium: agxText.c,v 1.3 95/01/05 20:30:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c,v 3.2 1994/11/19 07:50:20 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: agxText.c,v 1.3 95/01/05 20:30:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxText.c,v 3.3 1995/01/28 15:49:13 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c:1.1.1.1	Mon Jan 30 17:33:44 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c	Mon Jan 30 17:33:44 1995
***************
*** 1,5 ****
  /* $XConsortium: agxWin.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c,v 3.1 1994/09/07 15:47:36 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: agxWin.c,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxWin.c,v 3.2 1995/01/28 15:49:14 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c:1.1.1.1	Mon Jan 30 17:33:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c	Mon Jan 30 17:33:45 1995
***************
*** 1,5 ****
  /* $XConsortium: hercRamDac.c,v 1.4 95/01/26 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c,v 3.4 1995/01/26 02:16:49 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: hercRamDac.c,v 1.4 95/01/26 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.c,v 3.5 1995/01/28 15:49:16 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h:1.1.1.1	Mon Jan 30 17:33:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h	Mon Jan 30 17:33:45 1995
***************
*** 1,5 ****
  /* $XConsortium: hercRamDac.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h,v 3.0 1994/06/15 15:35:44 dawes Exp $ */
  /*
   * Copyright 1994 by Henry Worth <haw30@eng.amdahl.com>
   *
--- 1,5 ----
  /* $XConsortium: hercRamDac.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/hercRamDac.h,v 3.1 1995/01/28 15:49:17 dawes Exp $ */
  /*
   * Copyright 1994 by Henry Worth <haw30@eng.amdahl.com>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h:3.9
*** xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h:1.1.1.1	Mon Jan 30 17:33:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h	Mon Jan 30 17:33:46 1995
***************
*** 1,5 ****
  /* $XConsortium: regagx.h,v 1.4 95/01/23 15:33:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h,v 3.8 1995/01/23 01:28:45 dawes Exp $ */
  /*
   * AGXregs.h
   *
--- 1,5 ----
  /* $XConsortium: regagx.h,v 1.4 95/01/23 15:33:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/regagx.h,v 3.9 1995/01/28 15:49:19 dawes Exp $ */
  /*
   * AGXregs.h
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c:1.1.1.1	Mon Jan 30 17:33:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c	Mon Jan 30 17:33:46 1995
***************
*** 1,5 ****
  /* $XConsortium: xf861502x.c,v 1.3 95/01/05 20:30:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c,v 3.2 1994/11/30 20:37:42 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
--- 1,5 ----
  /* $XConsortium: xf861502x.c,v 1.3 95/01/05 20:30:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.c,v 3.3 1995/01/28 15:49:21 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h:1.1.1.1	Mon Jan 30 17:33:47 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h	Mon Jan 30 17:33:47 1995
***************
*** 1,5 ****
  /* $XConsortium: xf861502x.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h,v 3.0 1994/06/15 15:35:48 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
   *
--- 1,5 ----
  /* $XConsortium: xf861502x.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf861502x.h,v 3.1 1995/01/28 15:49:22 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth  <haw30@eng.amdahl.com>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c:1.1.1.1	Mon Jan 30 17:33:47 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c	Mon Jan 30 17:33:47 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86RamDac.c,v 1.3 95/01/26 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c,v 3.3 1995/01/26 02:16:52 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   * 
--- 1,5 ----
  /* $XConsortium: xf86RamDac.c,v 1.3 95/01/26 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.c,v 3.4 1995/01/28 15:49:24 dawes Exp $ */
  /*
   * Copyright 1994 by Henry A. Worth, Sunnyvale, California.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h:3.3
*** xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h:1.1.1.1	Mon Jan 30 17:33:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h	Mon Jan 30 17:33:48 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86RamDac.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h,v 3.2 1994/09/07 15:47:46 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth,  Sunnyvale, California.
--- 1,5 ----
  /* $XConsortium: xf86RamDac.h,v 1.2 94/11/21 22:06:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/xf86RamDac.h,v 3.3 1995/01/28 15:49:25 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Henry A. Worth,  Sunnyvale, California.
diff -c xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c:1.1.1.2	Mon Jan 30 17:33:50 1995
--- xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c	Mon Jan 30 17:33:51 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86bcache.c,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c,v 3.1 1994/07/15 06:57:38 dawes Exp $ */
  /*
   * Based on the S3 block allocator code in XFree86-2.0 by Jon Tombs.
   * The original copyright is reproduced below.
--- 1,5 ----
  /* $XConsortium: xf86bcache.c,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c,v 3.3 1995/01/28 16:57:41 dawes Exp $ */
  /*
   * Based on the S3 block allocator code in XFree86-2.0 by Jon Tombs.
   * The original copyright is reproduced below.
diff -c xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c:1.1.1.2	Mon Jan 30 17:33:51 1995
--- xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c	Mon Jan 30 17:33:51 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86fcache.c,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c,v 3.5 1994/11/26 12:40:20 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: xf86fcache.c,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c,v 3.7 1995/01/28 16:57:43 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h:3.5
*** xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h:1.1.1.2	Mon Jan 30 17:33:51 1995
--- xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h	Mon Jan 30 17:33:51 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86fcache.h,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h,v 3.3 1994/11/26 12:40:21 dawes Exp $ */
  /*
   * Data structures and function prototypes for the font cache.
   */
--- 1,5 ----
  /* $XConsortium: xf86fcache.h,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h,v 3.5 1995/01/28 16:57:44 dawes Exp $ */
  /*
   * Data structures and function prototypes for the font cache.
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h:1.1.1.2	Mon Jan 30 17:33:52 1995
--- xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h	Mon Jan 30 17:33:52 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86text.h,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h,v 3.0 1994/08/01 12:09:19 dawes Exp $ */
  /*
   * Function prototypes for the text output functions.
   */
--- 1,5 ----
  /* $XConsortium: xf86text.h,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h,v 3.2 1995/01/28 16:57:46 dawes Exp $ */
  /*
   * Function prototypes for the text output functions.
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile:1.1.1.1	Mon Jan 30 17:33:53 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile	Mon Jan 30 17:33:53 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/11/21 22:08:46 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile,v 3.1 1994/09/13 15:08:05 dawes Exp $
  
  #include <Server.tmpl>
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/11/21 22:08:46 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/Imakefile,v 3.2 1995/01/28 15:49:50 dawes Exp $
  
  #include <Server.tmpl>
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh:1.1.1.1	Mon Jan 30 17:33:54 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh	Mon Jan 30 17:33:54 1995
***************
*** 1,7 ****
  #!/bin/sh
  
  # $XConsortium: confw32.sh,v 1.2 94/11/21 22:08:46 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh,v 3.0 1994/09/11 00:39:40 dawes Exp $
  #
  # This script generates w32Conf.c
  #
--- 1,7 ----
  #!/bin/sh
  
  # $XConsortium: confw32.sh,v 1.2 94/11/21 22:08:46 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/confw32.sh,v 3.1 1995/01/28 15:49:52 dawes Exp $
  #
  # This script generates w32Conf.c
  #
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile:1.1.1.1	Mon Jan 30 17:33:55 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile	Mon Jan 30 17:33:55 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:31:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile,v 3.2 1994/11/19 07:50:34 dawes Exp $
  #include <Server.tmpl>
  
  SUSRCS = w32it.s w32pit.s w32line.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:31:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/Imakefile,v 3.3 1995/01/28 15:49:55 dawes Exp $
  #include <Server.tmpl>
  
  SUSRCS = w32it.s w32pit.s w32line.s
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s:1.1.1.1	Mon Jan 30 17:33:55 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s	Mon Jan 30 17:33:55 1995
***************
*** 1,5 ****
  /* $XConsortium: w32it.s,v 1.2 94/11/21 22:10:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s,v 3.1 1994/09/25 12:27:33 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32it.s,v 1.2 94/11/21 22:10:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32it.s,v 3.2 1995/01/28 15:49:56 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s:1.1.1.1	Mon Jan 30 17:33:56 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s	Mon Jan 30 17:33:56 1995
***************
*** 1,5 ****
  /* $XConsortium: w32pit.s,v 1.2 94/11/21 22:10:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s,v 3.1 1994/09/25 12:27:35 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32pit.s,v 1.2 94/11/21 22:10:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32pit.s,v 3.2 1995/01/28 15:49:57 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile:3.5
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile:1.1.1.1	Mon Jan 30 17:33:59 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile	Mon Jan 30 17:33:59 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:56:53 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile,v 3.4 1994/12/17 09:59:32 dawes Exp $
  #include <Server.tmpl>
  
  #ifndef PixelSize
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:56:53 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/Imakefile,v 3.5 1995/01/28 15:50:03 dawes Exp $
  #include <Server.tmpl>
  
  #ifndef PixelSize
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c:1.1.1.1	Mon Jan 30 17:34:00 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c	Mon Jan 30 17:34:00 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: cfb8cppl.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c,v 3.0 1994/09/11 00:41:24 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: cfb8cppl.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8cppl.c,v 3.1 1995/01/28 15:50:05 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c:1.1.1.1	Mon Jan 30 17:34:00 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c	Mon Jan 30 17:34:00 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: cfb8line.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c,v 3.0 1994/09/11 00:41:26 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: cfb8line.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfb8line.c,v 3.1 1995/01/28 15:50:06 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c:1.1.1.1	Mon Jan 30 17:34:01 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c	Mon Jan 30 17:34:01 1995
***************
*** 31,37 ****
  
  */
  /* $XConsortium: cfbbitblt.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c,v 3.0 1994/09/11 00:41:27 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
--- 31,37 ----
  
  */
  /* $XConsortium: cfbbitblt.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbbitblt.c,v 3.1 1995/01/28 15:50:08 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c:1.1.1.1	Mon Jan 30 17:34:01 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c	Mon Jan 30 17:34:02 1995
***************
*** 31,37 ****
  
  */
  /* $XConsortium: cfbblt.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c,v 3.1 1994/11/19 07:50:50 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
--- 31,37 ----
  
  */
  /* $XConsortium: cfbblt.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbblt.c,v 3.2 1995/01/28 15:50:09 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c:1.1.1.1	Mon Jan 30 17:34:02 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c	Mon Jan 30 17:34:02 1995
***************
*** 29,35 ****
  */
  
  /* $XConsortium: cfbfillrct.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c,v 3.0 1994/09/11 00:41:29 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
--- 29,35 ----
  */
  
  /* $XConsortium: cfbfillrct.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillrct.c,v 3.1 1995/01/28 15:50:11 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c:1.1.1.1	Mon Jan 30 17:34:03 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c	Mon Jan 30 17:34:03 1995
***************
*** 76,82 ****
  ******************************************************************/
  
  /* $XConsortium: cfbfillsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c,v 3.0 1994/09/11 00:41:31 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
--- 76,82 ----
  ******************************************************************/
  
  /* $XConsortium: cfbfillsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbfillsp.c,v 3.1 1995/01/28 15:50:12 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c:1.1.1.1	Mon Jan 30 17:34:04 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c	Mon Jan 30 17:34:04 1995
***************
*** 47,53 ****
  ******************************************************************/
  
  /* $XConsortium: cfbgc.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c,v 3.1 1994/11/19 07:50:53 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
--- 47,53 ----
  ******************************************************************/
  
  /* $XConsortium: cfbgc.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgc.c,v 3.2 1995/01/28 15:50:14 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c:1.1.1.1	Mon Jan 30 17:34:04 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c	Mon Jan 30 17:34:04 1995
***************
*** 1,5 ****
  /* $XConsortium: cfbgetsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c,v 3.0 1994/09/11 00:41:33 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: cfbgetsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbgetsp.c,v 3.1 1995/01/28 15:50:15 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c:1.1.1.1	Mon Jan 30 17:34:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c	Mon Jan 30 17:34:05 1995
***************
*** 1,5 ****
  /* $XConsortium: cfbglblt8.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c,v 3.0 1994/09/11 00:41:35 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: cfbglblt8.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbglblt8.c,v 3.1 1995/01/28 15:50:17 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c:1.1.1.1	Mon Jan 30 17:34:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c	Mon Jan 30 17:34:05 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: cfbply1rct.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c,v 3.0 1994/09/11 00:41:36 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: cfbply1rct.c,v 1.1 94/10/05 13:29:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbply1rct.c,v 3.1 1995/01/28 15:50:18 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c:1.1.1.1	Mon Jan 30 17:34:06 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c	Mon Jan 30 17:34:06 1995
***************
*** 1,5 ****
  /* $XConsortium: cfbpntwin.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c,v 3.1 1994/11/19 07:50:56 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: cfbpntwin.c,v 1.2 95/01/05 20:31:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpntwin.c,v 3.2 1995/01/28 15:50:19 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c:1.1.1.1	Mon Jan 30 17:34:06 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c	Mon Jan 30 17:34:06 1995
***************
*** 28,34 ****
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: cfbpush8.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c,v 3.0 1994/09/11 00:41:39 dawes Exp $ */
  
  #if PSZ == 8
  
--- 28,34 ----
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: cfbpush8.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbpush8.c,v 3.1 1995/01/28 15:50:21 dawes Exp $ */
  
  #if PSZ == 8
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c:1.1.1.1	Mon Jan 30 17:34:07 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c	Mon Jan 30 17:34:07 1995
***************
*** 1,5 ****
  /* $XConsortium: cfbsetsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c,v 3.0 1994/09/11 00:41:40 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: cfbsetsp.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsetsp.c,v 3.1 1995/01/28 15:50:22 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c:1.1.1.1	Mon Jan 30 17:34:07 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c	Mon Jan 30 17:34:07 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: cfbsolid.c,v 1.2 95/01/05 20:31:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c,v 3.1 1994/11/19 07:50:59 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: cfbsolid.c,v 1.2 95/01/05 20:31:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbsolid.c,v 3.2 1995/01/28 15:50:23 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c:1.1.1.1	Mon Jan 30 17:34:08 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c	Mon Jan 30 17:34:08 1995
***************
*** 1,5 ****
  /* $XConsortium: cfbtegblt.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c,v 3.0 1994/09/11 00:41:43 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: cfbtegblt.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtegblt.c,v 3.1 1995/01/28 15:50:25 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c:1.1.1.1	Mon Jan 30 17:34:08 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c	Mon Jan 30 17:34:08 1995
***************
*** 30,36 ****
  */
  
  /* $XConsortium: cfbtile32.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c,v 3.0 1994/09/11 00:41:44 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
--- 30,36 ----
  */
  
  /* $XConsortium: cfbtile32.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtile32.c,v 3.1 1995/01/28 15:50:26 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c:1.1.1.1	Mon Jan 30 17:34:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c	Mon Jan 30 17:34:09 1995
***************
*** 30,36 ****
  */
  
  /* $XConsortium: cfbtileodd.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c,v 3.0 1994/09/11 00:41:45 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
--- 30,36 ----
  */
  
  /* $XConsortium: cfbtileodd.c,v 1.1 94/10/05 13:29:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/cfbtileodd.c,v 3.1 1995/01/28 15:50:27 dawes Exp $ */
  
  #include "X.h"
  #include "Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c:1.1.1.1	Mon Jan 30 17:34:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c	Mon Jan 30 17:34:09 1995
***************
*** 1,5 ****
   * $XConsortium: stipple.c,v 1.2 94/11/21 22:14:00 kaleb Exp $
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c,v 3.0 1994/09/11 00:41:46 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
   * $XConsortium: stipple.c,v 1.2 94/11/21 22:14:00 kaleb Exp $
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/stipple.c,v 3.1 1995/01/28 15:50:29 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c:1.1.1.1	Mon Jan 30 17:34:10 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c	Mon Jan 30 17:34:10 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c,v 3.0 1994/09/11 00:41:47 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bres.c,v 3.1 1995/01/28 15:50:30 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c:1.1.1.1	Mon Jan 30 17:34:10 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c	Mon Jan 30 17:34:10 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c,v 3.0 1994/09/11 00:41:48 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32bresd.c,v 3.1 1995/01/28 15:50:31 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c:1.1.1.1	Mon Jan 30 17:34:11 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c	Mon Jan 30 17:34:11 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c,v 3.1 1994/11/19 07:51:01 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32fillarc.c,v 3.2 1995/01/28 15:50:33 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c:1.1.1.1	Mon Jan 30 17:34:11 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c	Mon Jan 30 17:34:11 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c,v 3.0 1994/09/11 00:41:51 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32hrzvert.c,v 3.1 1995/01/28 15:50:34 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c:1.1.1.1	Mon Jan 30 17:34:12 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c	Mon Jan 30 17:34:12 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c,v 3.1 1994/11/19 07:51:06 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32line.c,v 3.2 1995/01/28 15:50:35 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c:1.1.1.1	Mon Jan 30 17:34:12 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c	Mon Jan 30 17:34:12 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c,v 3.1 1994/11/22 02:38:15 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c,v 3.2 1995/01/28 15:50:37 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c:1.1.1.1	Mon Jan 30 17:34:13 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c	Mon Jan 30 17:34:13 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c,v 3.5 1994/12/25 12:19:31 dawes Exp $ */
  /*
   * Fill 32 bit stippled rectangles for 8 bit frame buffers
   */
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32rctstp8.c,v 3.6 1995/01/28 15:50:38 dawes Exp $ */
  /*
   * Fill 32 bit stippled rectangles for 8 bit frame buffers
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c:1.1.1.1	Mon Jan 30 17:34:13 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c	Mon Jan 30 17:34:13 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c,v 3.2 1994/09/25 12:27:50 dawes Exp $ */
  /*
   * TEGblt - ImageText expanded glyph fonts only.  For
   * 8 bit displays, in Copy mode with no clipping.
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32teblt8.c,v 3.3 1995/01/28 15:50:40 dawes Exp $ */
  /*
   * TEGblt - ImageText expanded glyph fonts only.  For
   * 8 bit displays, in Copy mode with no clipping.
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c:1.1.1.1	Mon Jan 30 17:34:14 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c	Mon Jan 30 17:34:14 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c,v 3.1 1994/11/19 07:51:14 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32zerarc.c,v 3.2 1995/01/28 15:50:41 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile:1.1.1.1	Mon Jan 30 17:34:16 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile	Mon Jan 30 17:34:16 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:37:42 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile,v 3.5 1994/11/19 07:52:04 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaBank.s et4_bank.s w32vars.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:37:42 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/Imakefile,v 3.6 1995/01/28 15:50:54 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaBank.s et4_bank.s w32vars.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c:1.1.1.1	Mon Jan 30 17:34:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c	Mon Jan 30 17:34:17 1995
***************
*** 1,5 ****
  /* $XConsortium: dummy.c,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c,v 3.1 1994/09/22 15:48:21 dawes Exp $ */
  /*
   * cfbfuncs.c
   *
--- 1,5 ----
  /* $XConsortium: dummy.c,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/dummy.c,v 3.2 1995/01/28 15:50:56 dawes Exp $ */
  /*
   * cfbfuncs.c
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c:1.1.1.1	Mon Jan 30 17:34:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c	Mon Jan 30 17:34:17 1995
***************
*** 1,6 ****
  /* $XConsortium: et4000w32.c,v 1.4 95/01/16 13:16:26 kaleb Exp $ */
  /*
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c,v 3.6 1995/01/10 10:20:43 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /* $XConsortium: et4000w32.c,v 1.4 95/01/16 13:16:26 kaleb Exp $ */
  /*
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/et4000w32.c,v 3.7 1995/01/28 15:50:58 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h:1.1.1.1	Mon Jan 30 17:34:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h	Mon Jan 30 17:34:18 1995
***************
*** 1,5 ****
  /* $XConsortium: gglbox.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h,v 3.1 1994/11/19 07:52:13 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: gglbox.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/gglbox.h,v 3.2 1995/01/28 15:50:59 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h:1.1.1.1	Mon Jan 30 17:34:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h	Mon Jan 30 17:34:18 1995
***************
*** 1,5 ****
  /* $XConsortium: ggldraw.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h,v 3.0 1994/09/11 00:42:16 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: ggldraw.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ggldraw.h,v 3.1 1995/01/28 15:51:00 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c:1.1.1.1	Mon Jan 30 17:34:19 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c	Mon Jan 30 17:34:19 1995
***************
*** 1,5 ****
  /* $XConsortium: ramdac.c,v 1.4 95/01/06 20:56:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c,v 3.4 1994/12/29 09:44:29 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: ramdac.c,v 1.4 95/01/06 20:56:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/ramdac.c,v 3.5 1995/01/28 15:51:01 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c:3.11
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c:1.1.1.1	Mon Jan 30 17:34:19 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c	Mon Jan 30 17:34:19 1995
***************
*** 1,5 ****
  /* $XConsortium: vga.c,v 1.6 95/01/23 15:33:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c,v 3.10 1995/01/20 05:18:58 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vga.c,v 1.6 95/01/23 15:33:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vga.c,v 3.11 1995/01/28 15:51:03 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c:1.1.1.1	Mon Jan 30 17:34:20 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c	Mon Jan 30 17:34:20 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaCmap.c,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c,v 3.3 1994/09/27 10:28:30 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vgaCmap.c,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/vgaCmap.c,v 3.4 1995/01/28 15:51:05 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h:3.5
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h:1.1.1.1	Mon Jan 30 17:34:20 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h	Mon Jan 30 17:34:20 1995
***************
*** 1,5 ****
  /* $XConsortium: w32.h,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h,v 3.4 1995/01/27 02:32:03 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32.h,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32.h,v 3.5 1995/01/28 15:51:06 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h:3.3
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h:1.1.1.1	Mon Jan 30 17:34:21 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h	Mon Jan 30 17:34:21 1995
***************
*** 1,5 ****
  /* $XConsortium: w32blt.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h,v 3.2 1994/11/19 07:52:33 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32blt.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32blt.h,v 3.3 1995/01/28 15:51:07 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h:3.4
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h:1.1.1.1	Mon Jan 30 17:34:21 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h	Mon Jan 30 17:34:21 1995
***************
*** 1,5 ****
  /* $XConsortium: w32box.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h,v 3.3 1994/11/19 07:52:36 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32box.h,v 1.3 95/01/05 20:37:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32box.h,v 3.4 1995/01/28 15:51:09 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h:1.1.1.1	Mon Jan 30 17:34:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h	Mon Jan 30 17:34:22 1995
***************
*** 1,5 ****
  /* $XConsortium: w32funcs.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h,v 3.0 1994/09/11 00:42:23 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: w32funcs.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32funcs.h,v 3.1 1995/01/28 15:51:10 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h:3.4
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h:1.1.1.1	Mon Jan 30 17:34:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h	Mon Jan 30 17:34:22 1995
***************
*** 1,5 ****
  /* $XConsortium: w32itext.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h,v 3.3 1994/09/25 12:28:09 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32itext.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32itext.h,v 3.4 1995/01/28 15:51:12 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h:1.1.1.1	Mon Jan 30 17:34:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h	Mon Jan 30 17:34:23 1995
***************
*** 1,5 ****
  /* $XConsortium: w32map.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h,v 3.0 1994/09/11 00:42:25 dawes Exp $ */
  /*
   *
  Copyright (c) 1991  X Consortium
--- 1,5 ----
  /* $XConsortium: w32map.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32map.h,v 3.1 1995/01/28 15:51:13 dawes Exp $ */
  /*
   *
  Copyright (c) 1991  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h:3.4
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h:1.1.1.1	Mon Jan 30 17:34:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h	Mon Jan 30 17:34:23 1995
***************
*** 1,5 ****
  /* $XConsortium: w32stip.h,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h,v 3.3 1995/01/27 02:32:08 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32stip.h,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32stip.h,v 3.4 1995/01/28 15:51:14 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c:1.1.1.1	Mon Jan 30 17:34:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c	Mon Jan 30 17:34:24 1995
***************
*** 1,5 ****
  /* $XConsortium: w32vars.c,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c,v 3.4 1995/01/27 02:32:12 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32vars.c,v 1.4 95/01/27 15:36:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32vars.c,v 3.5 1995/01/28 15:51:15 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h:1.1.1.1	Mon Jan 30 17:34:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h	Mon Jan 30 17:34:24 1995
***************
*** 1,5 ****
  /* $XConsortium: w32version.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h,v 3.0 1994/09/11 00:42:29 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: w32version.h,v 1.2 94/11/21 22:31:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/w32/w32version.h,v 3.1 1995/01/28 15:51:17 dawes Exp $ */
  /*******************************************************************************
                          Copyright 1994 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h:1.1.1.2	Mon Jan 30 17:34:29 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h	Mon Jan 30 17:34:29 1995
***************
*** 1,5 ****
  /* $XConsortium: 8514cach.h,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h,v 3.1 1994/09/07 15:48:24 dawes Exp $ */
  void ibm8514GlyphWrite(
  #if NeedFunctionPrototypes
      int /*x*/,
--- 1,5 ----
  /* $XConsortium: 8514cach.h,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h,v 3.2 1995/01/28 15:51:27 dawes Exp $ */
  void ibm8514GlyphWrite(
  #if NeedFunctionPrototypes
      int /*x*/,
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile:1.1.1.2	Mon Jan 30 17:34:29 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile	Mon Jan 30 17:34:29 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:34:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile,v 3.1 1995/01/26 02:17:17 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	ibm8514.c cmap.c gc.c fs.c ss.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:34:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile,v 3.3 1995/01/28 16:58:01 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	ibm8514.c cmap.c gc.c fs.c ss.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c:1.1.1.2	Mon Jan 30 17:34:30 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c	Mon Jan 30 17:34:30 1995
***************
*** 1,5 ****
  /* $XConsortium: blt.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c,v 3.0 1994/06/06 06:44:14 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: blt.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c,v 3.1 1995/01/28 15:51:30 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c:1.1.1.2	Mon Jan 30 17:34:30 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c	Mon Jan 30 17:34:30 1995
***************
*** 1,5 ****
  /* $XConsortium: fc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c,v 3.1 1994/08/01 12:09:37 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: fc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c,v 3.2 1995/01/28 15:51:32 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c:1.1.1.2	Mon Jan 30 17:34:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c	Mon Jan 30 17:34:31 1995
***************
*** 1,5 ****
  /* $XConsortium: fcach.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c,v 3.3 1995/01/26 02:17:18 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: fcach.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c,v 3.4 1995/01/28 15:51:33 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c:1.1.1.2	Mon Jan 30 17:34:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c	Mon Jan 30 17:34:31 1995
***************
*** 1,5 ****
  /* $XConsortium: frect.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c,v 3.1 1994/11/26 12:40:53 dawes Exp $ */
  /*
   * Fill rectangles.
   */
--- 1,5 ----
  /* $XConsortium: frect.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c,v 3.2 1995/01/28 15:51:35 dawes Exp $ */
  /*
   * Fill rectangles.
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c:1.1.1.2	Mon Jan 30 17:34:32 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c	Mon Jan 30 17:34:32 1995
***************
*** 1,5 ****
  /* $XConsortium: fs.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c,v 3.1 1994/08/01 12:09:38 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: fs.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c,v 3.2 1995/01/28 15:51:37 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c:1.1.1.2	Mon Jan 30 17:34:32 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c	Mon Jan 30 17:34:33 1995
***************
*** 1,5 ****
  /* $XConsortium: gc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c,v 3.1 1994/09/07 15:48:26 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: gc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c,v 3.2 1995/01/28 15:51:38 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c:1.1.1.2	Mon Jan 30 17:34:33 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c	Mon Jan 30 17:34:33 1995
***************
*** 1,5 ****
  /* $XConsortium: gtimg.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c,v 3.0 1994/07/24 11:43:19 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: gtimg.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c,v 3.1 1995/01/28 15:51:40 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c:3.14
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c:1.1.1.2	Mon Jan 30 17:34:34 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c	Mon Jan 30 17:34:34 1995
***************
*** 1,5 ****
  /* $XConsortium: ibm8514.c,v 1.6 95/01/26 15:34:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c,v 3.12 1995/01/26 02:17:19 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: ibm8514.c,v 1.6 95/01/26 15:34:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c,v 3.14 1995/01/28 16:58:04 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h:3.6
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h:1.1.1.2	Mon Jan 30 17:34:34 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h	Mon Jan 30 17:34:34 1995
***************
*** 1,5 ****
  /* $XConsortium: ibm8514.h,v 1.6 95/01/16 13:16:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h,v 3.4 1995/01/15 10:30:33 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: ibm8514.h,v 1.6 95/01/16 13:16:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h,v 3.6 1995/01/28 16:58:06 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c:1.1.1.2	Mon Jan 30 17:34:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c	Mon Jan 30 17:34:35 1995
***************
*** 1,5 ****
  /* $XConsortium: im.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c,v 3.4 1995/01/26 02:17:26 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: im.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c,v 3.5 1995/01/28 15:51:45 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c:1.1.1.2	Mon Jan 30 17:34:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c	Mon Jan 30 17:34:35 1995
***************
*** 1,5 ****
  /* $XConsortium: init.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c,v 3.1 1994/08/01 13:18:07 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
--- 1,5 ----
  /* $XConsortium: init.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c,v 3.2 1995/01/28 15:51:47 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c:1.1.1.2	Mon Jan 30 17:34:36 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c	Mon Jan 30 17:34:36 1995
***************
*** 1,5 ****
  /* $XConsortium: line.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c,v 3.0 1994/06/06 06:44:16 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: line.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c,v 3.1 1995/01/28 15:51:48 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c:1.1.1.2	Mon Jan 30 17:34:36 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c	Mon Jan 30 17:34:36 1995
***************
*** 1,5 ****
  /* $XConsortium: scrin.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c,v 3.1 1994/12/10 03:00:01 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: scrin.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c,v 3.2 1995/01/28 15:51:50 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c:1.1.1.2	Mon Jan 30 17:34:37 1995
--- xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c	Mon Jan 30 17:34:37 1995
***************
*** 1,5 ****
  /* $XConsortium: win.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c,v 3.1 1994/09/07 16:19:12 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: win.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c,v 3.2 1995/01/28 15:51:51 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile:3.8
*** xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile:1.1.1.2	Mon Jan 30 17:34:42 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile	Mon Jan 30 17:34:42 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:00 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile,v 3.6 1994/12/17 10:05:00 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mach32.c mach32cmap.c mach32gc.c mach32fs.c mach32ss.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:00 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile,v 3.8 1995/01/28 16:58:18 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mach32.c mach32cmap.c mach32gc.c mach32fs.c mach32ss.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c:1.1.1.2	Mon Jan 30 17:34:43 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c	Mon Jan 30 17:34:43 1995
***************
*** 1,5 ****
  /* $XConsortium: ativga.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c,v 3.0 1994/05/08 06:21:25 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
--- 1,5 ----
  /* $XConsortium: ativga.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c,v 3.2 1995/01/28 16:58:20 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c:3.30
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c:1.1.1.2	Mon Jan 30 17:34:44 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c	Mon Jan 30 17:34:44 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32.c,v 1.5 95/01/16 13:16:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c,v 3.28 1995/01/15 10:30:52 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach32.c,v 1.5 95/01/16 13:16:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c,v 3.30 1995/01/28 16:58:23 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h:3.11
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h:1.1.1.2	Mon Jan 30 17:34:44 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h	Mon Jan 30 17:34:44 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32.h,v 1.5 95/01/16 13:16:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h,v 3.9 1995/01/15 10:30:54 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach32.h,v 1.5 95/01/16 13:16:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h,v 3.11 1995/01/28 16:58:27 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c:1.1.1.1	Mon Jan 30 17:34:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c	Mon Jan 30 17:34:45 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32bc.c,v 1.2 94/11/21 22:34:06 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c,v 3.3 1994/09/11 00:48:43 dawes Exp $$ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * 
--- 1,5 ----
  /* $XConsortium: mach32bc.c,v 1.2 94/11/21 22:34:06 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bc.c,v 3.4 1995/01/28 15:52:09 dawes Exp $$ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c:1.1.1.2	Mon Jan 30 17:34:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c	Mon Jan 30 17:34:46 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32blt.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c,v 3.5 1994/11/26 12:41:41 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32blt.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c,v 3.7 1995/01/28 16:58:30 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c:1.1.1.2	Mon Jan 30 17:34:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c	Mon Jan 30 17:34:46 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32bstor.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c,v 3.1 1994/07/15 06:58:05 dawes Exp $ */
  /*-
   * mach32bstore.c --
   *	Functions required by the backing-store implementation in MI.
--- 1,5 ----
  /* $XConsortium: mach32bstor.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c,v 3.3 1995/01/28 16:58:35 dawes Exp $ */
  /*-
   * mach32bstore.c --
   *	Functions required by the backing-store implementation in MI.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c:1.1.1.2	Mon Jan 30 17:34:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c	Mon Jan 30 17:34:47 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32cmap.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c,v 3.0 1994/09/11 00:48:46 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach32cmap.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c,v 3.2 1995/01/28 16:58:39 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c:1.1.1.2	Mon Jan 30 17:34:47 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c	Mon Jan 30 17:34:47 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: mach32curs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c,v 3.1 1994/09/11 00:48:48 dawes Exp $
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
--- 1,6 ----
  /*
   * $XConsortium: mach32curs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c,v 3.3 1995/01/28 16:58:41 dawes Exp $
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c:1.1.1.2	Mon Jan 30 17:34:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c	Mon Jan 30 17:34:48 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32dline.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c,v 3.3 1994/09/11 00:48:51 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32dline.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c,v 3.5 1995/01/28 16:58:44 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c:1.1.1.2	Mon Jan 30 17:34:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c	Mon Jan 30 17:34:48 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32dseg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c,v 3.4 1994/09/11 00:48:52 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32dseg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c,v 3.6 1995/01/28 16:58:47 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c:3.8
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c:1.1.1.2	Mon Jan 30 17:34:49 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c	Mon Jan 30 17:34:49 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32fcach.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c,v 3.6 1994/09/11 00:48:53 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach32fcach.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c,v 3.8 1995/01/28 16:58:50 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c:1.1.1.2	Mon Jan 30 17:34:49 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c	Mon Jan 30 17:34:49 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32font.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c,v 3.1 1994/08/31 06:19:43 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach32font.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c,v 3.3 1995/01/28 16:58:52 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c:3.8
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c:1.1.1.2	Mon Jan 30 17:34:50 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c	Mon Jan 30 17:34:50 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32frect.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c,v 3.6 1994/11/26 12:41:43 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32frect.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c,v 3.8 1995/01/28 16:58:55 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c:1.1.1.2	Mon Jan 30 17:34:51 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c	Mon Jan 30 17:34:51 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32fs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c,v 3.5 1994/09/11 00:48:56 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32fs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c,v 3.7 1995/01/28 16:58:58 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c:1.1.1.2	Mon Jan 30 17:34:52 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c	Mon Jan 30 17:34:52 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32gc.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c,v 3.4 1994/09/11 00:48:58 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32gc.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c,v 3.6 1995/01/28 16:59:02 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c:1.1.1.2	Mon Jan 30 17:34:52 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c	Mon Jan 30 17:34:52 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32gs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c,v 3.1 1994/07/15 06:58:14 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32gs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c,v 3.3 1995/01/28 16:59:06 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c:1.1.1.2	Mon Jan 30 17:34:53 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c	Mon Jan 30 17:34:53 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32gtimg.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c,v 3.2 1994/07/24 11:43:32 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: mach32gtimg.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c,v 3.4 1995/01/28 16:59:08 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c:1.1.1.2	Mon Jan 30 17:34:54 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c	Mon Jan 30 17:34:54 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32im.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c,v 3.5 1994/11/26 12:41:45 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach32im.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c,v 3.7 1995/01/28 16:59:11 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c:3.8
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c:1.1.1.2	Mon Jan 30 17:34:54 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c	Mon Jan 30 17:34:54 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32init.c,v 1.4 95/01/06 20:57:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c,v 3.6 1994/12/25 12:23:21 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
--- 1,5 ----
  /* $XConsortium: mach32init.c,v 1.4 95/01/06 20:57:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c,v 3.8 1995/01/28 16:59:14 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c:1.1.1.2	Mon Jan 30 17:34:55 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c	Mon Jan 30 17:34:55 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32line.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c,v 3.1 1994/09/11 00:49:03 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32line.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c,v 3.3 1995/01/28 16:59:17 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c:1.1.1.2	Mon Jan 30 17:34:55 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c	Mon Jan 30 17:34:55 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32mem.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c,v 3.1 1994/09/07 16:19:52 dawes Exp $ */
  /*
   * Copyright 1993 ATI
   *
--- 1,5 ----
  /* $XConsortium: mach32mem.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c,v 3.3 1995/01/28 16:59:19 dawes Exp $ */
  /*
   * Copyright 1993 ATI
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c:1.1.1.2	Mon Jan 30 17:34:56 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c	Mon Jan 30 17:34:56 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32plypt.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c,v 3.2 1994/09/11 00:49:04 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32plypt.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c,v 3.4 1995/01/28 16:59:21 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c:1.1.1.2	Mon Jan 30 17:34:56 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c	Mon Jan 30 17:34:56 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32pntwn.c,v 1.4 95/01/23 15:33:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c,v 3.4 1995/01/20 05:45:44 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32pntwn.c,v 1.4 95/01/23 15:33:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c,v 3.6 1995/01/28 16:59:24 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c:1.1.1.2	Mon Jan 30 17:34:57 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c	Mon Jan 30 17:34:57 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32scrin.c,v 1.4 95/01/06 20:57:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c,v 3.5 1994/12/10 02:07:52 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach32scrin.c,v 1.4 95/01/06 20:57:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c,v 3.7 1995/01/28 16:59:27 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c:1.1.1.2	Mon Jan 30 17:34:57 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c	Mon Jan 30 17:34:58 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32seg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c,v 3.1 1994/09/11 00:49:07 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32seg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c,v 3.3 1995/01/28 16:59:30 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c:1.1.1.2	Mon Jan 30 17:34:58 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c	Mon Jan 30 17:34:58 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32ss.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c,v 3.1 1994/07/15 06:58:19 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32ss.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c,v 3.3 1995/01/28 16:59:32 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c:1.1.1.2	Mon Jan 30 17:34:59 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c	Mon Jan 30 17:34:59 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32text.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c,v 3.5 1994/09/11 00:49:09 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach32text.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c,v 3.7 1995/01/28 16:59:35 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c:1.1.1.2	Mon Jan 30 17:34:59 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c	Mon Jan 30 17:34:59 1995
***************
*** 1,5 ****
  /* $XConsortium: mach32win.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c,v 3.3 1994/09/11 00:49:10 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach32win.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c,v 3.5 1995/01/28 16:59:40 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h:1.1.1.2	Mon Jan 30 17:35:00 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h	Mon Jan 30 17:35:00 1995
***************
*** 1,5 ****
  /* $XConsortium: regmach32.h,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h,v 3.2 1994/06/01 03:18:22 dawes Exp $ */
  /* regmach32.h
   *
   * Written by Jake Richter
--- 1,5 ----
  /* $XConsortium: regmach32.h,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h,v 3.4 1995/01/28 16:59:43 dawes Exp $ */
  /* regmach32.h
   *
   * Written by Jake Richter
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile:1.1.1.1	Mon Jan 30 17:35:04 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile	Mon Jan 30 17:35:04 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/14 15:04:34 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile,v 3.1 1994/11/27 07:04:42 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ativga.c mach64.c mach64blt.c mach64bstor.c mach64cmap.c mach64curs.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/14 15:04:34 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile,v 3.2 1995/01/28 15:53:06 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ativga.c mach64.c mach64blt.c mach64bstor.c mach64cmap.c mach64curs.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c:1.1.1.1	Mon Jan 30 17:35:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c	Mon Jan 30 17:35:05 1995
***************
*** 1,5 ****
  /* $XConsortium: ativga.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c,v 3.0 1994/11/26 12:42:34 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
--- 1,5 ----
  /* $XConsortium: ativga.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c,v 3.1 1995/01/28 15:53:07 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h:1.1.1.1	Mon Jan 30 17:35:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h	Mon Jan 30 17:35:05 1995
***************
*** 1,5 ****
  /* $XConsortium: ativga.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h,v 3.0 1994/11/26 12:42:35 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
--- 1,5 ----
  /* $XConsortium: ativga.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h,v 3.1 1995/01/28 15:53:09 dawes Exp $ */
  /***************************************************************************
   * Start of VGA font saving and restoration code.
   * Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c:1.1.1.1	Mon Jan 30 17:35:06 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c	Mon Jan 30 17:35:06 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64.c,v 1.4 95/01/23 15:33:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c,v 3.6 1995/01/21 07:15:01 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach64.c,v 1.4 95/01/23 15:33:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c,v 3.7 1995/01/28 15:53:10 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h:3.5
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h:1.1.1.1	Mon Jan 30 17:35:06 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h	Mon Jan 30 17:35:07 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64.h,v 1.2 95/01/16 13:16:32 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h,v 3.4 1995/01/15 10:31:09 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64.h,v 1.2 95/01/16 13:16:32 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h,v 3.5 1995/01/28 15:53:12 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c:1.1.1.1	Mon Jan 30 17:35:07 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c	Mon Jan 30 17:35:07 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64blt.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c,v 3.1 1994/12/05 03:45:40 dawes Exp $ */
  /*
   * Copyright 1989 by the Massachusetts Institute of Technology
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach64blt.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c,v 3.2 1995/01/28 15:53:14 dawes Exp $ */
  /*
   * Copyright 1989 by the Massachusetts Institute of Technology
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c:1.1.1.1	Mon Jan 30 17:35:08 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c	Mon Jan 30 17:35:08 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64bstor.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c,v 3.0 1994/11/26 12:42:41 dawes Exp $ */
  /*-
   * mach64bstore.c --
   *	Functions required by the backing-store implementation in MI.
--- 1,5 ----
  /* $XConsortium: mach64bstor.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c,v 3.1 1995/01/28 15:53:16 dawes Exp $ */
  /*-
   * mach64bstore.c --
   *	Functions required by the backing-store implementation in MI.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c:1.1.1.1	Mon Jan 30 17:35:08 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c	Mon Jan 30 17:35:08 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64cmap.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c,v 3.0 1994/11/26 12:42:42 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach64cmap.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c,v 3.1 1995/01/28 15:53:17 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c:1.1.1.1	Mon Jan 30 17:35:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c	Mon Jan 30 17:35:09 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64curs.c,v 1.2 95/01/12 20:21:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c,v 3.0 1994/11/26 12:42:43 dawes Exp $ */
  /*
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
--- 1,5 ----
  /* $XConsortium: mach64curs.c,v 1.2 95/01/12 20:21:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c,v 3.1 1995/01/28 15:53:18 dawes Exp $ */
  /*
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c:1.1.1.1	Mon Jan 30 17:35:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c	Mon Jan 30 17:35:09 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64fcach.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c,v 3.0 1994/11/26 12:42:44 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64fcach.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c,v 3.1 1995/01/28 15:53:20 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c:1.1.1.1	Mon Jan 30 17:35:10 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c	Mon Jan 30 17:35:10 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64font.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c,v 3.0 1994/11/26 12:42:45 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64font.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c,v 3.1 1995/01/28 15:53:21 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c:1.1.1.1	Mon Jan 30 17:35:10 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c	Mon Jan 30 17:35:11 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64frect.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c,v 3.1 1994/11/27 07:04:47 dawes Exp $ */
  /*
   * Copyright 1989 by the Massachusetts Institute of Technology
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach64frect.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c,v 3.2 1995/01/28 15:53:22 dawes Exp $ */
  /*
   * Copyright 1989 by the Massachusetts Institute of Technology
   * Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c:1.1.1.1	Mon Jan 30 17:35:11 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c	Mon Jan 30 17:35:11 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64fs.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c,v 3.0 1994/11/26 12:42:48 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: mach64fs.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c,v 3.1 1995/01/28 15:53:24 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c:1.1.1.1	Mon Jan 30 17:35:12 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c	Mon Jan 30 17:35:12 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64gc.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c,v 3.1 1994/12/05 03:45:42 dawes Exp $ */
  /***********************************************************
  Copyright (c) 1987  X Consortium
  
--- 1,5 ----
  /* $XConsortium: mach64gc.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c,v 3.2 1995/01/28 15:53:26 dawes Exp $ */
  /***********************************************************
  Copyright (c) 1987  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c:1.1.1.1	Mon Jan 30 17:35:12 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c	Mon Jan 30 17:35:13 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64im.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c,v 3.1 1994/12/05 03:45:44 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64im.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c,v 3.2 1995/01/28 15:53:27 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h:1.1.1.1	Mon Jan 30 17:35:13 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h	Mon Jan 30 17:35:13 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64im.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h,v 3.2 1994/12/05 03:45:45 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64im.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h,v 3.3 1995/01/28 15:53:29 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c:1.1.1.1	Mon Jan 30 17:35:13 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c	Mon Jan 30 17:35:14 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64init.c,v 1.3 95/01/16 13:16:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c,v 3.2 1995/01/15 10:31:10 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
--- 1,5 ----
  /* $XConsortium: mach64init.c,v 1.3 95/01/16 13:16:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c,v 3.3 1995/01/28 15:53:30 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c:1.1.1.1	Mon Jan 30 17:35:14 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c	Mon Jan 30 17:35:14 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64line.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c,v 3.0 1994/11/26 12:42:54 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: mach64line.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c,v 3.1 1995/01/28 15:53:31 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c:1.1.1.1	Mon Jan 30 17:35:14 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c	Mon Jan 30 17:35:14 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64orect.c,v 1.2 95/01/16 13:16:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c,v 3.1 1995/01/15 10:31:12 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: mach64orect.c,v 1.2 95/01/16 13:16:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c,v 3.2 1995/01/28 15:53:33 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c:1.1.1.1	Mon Jan 30 17:35:15 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c	Mon Jan 30 17:35:15 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64pcach.c,v 1.2 95/01/16 13:16:35 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c,v 3.3 1995/01/15 10:31:13 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64pcach.c,v 1.2 95/01/16 13:16:35 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c,v 3.4 1995/01/28 15:53:34 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c:1.1.1.1	Mon Jan 30 17:35:16 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c	Mon Jan 30 17:35:16 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64pntwn.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c,v 3.0 1994/11/26 12:42:58 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: mach64pntwn.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c,v 3.1 1995/01/28 15:53:36 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c:1.1.1.1	Mon Jan 30 17:35:16 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c	Mon Jan 30 17:35:16 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64scrin.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c,v 3.0 1994/11/26 12:42:59 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: mach64scrin.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c,v 3.1 1995/01/28 15:53:37 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c:1.1.1.1	Mon Jan 30 17:35:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c	Mon Jan 30 17:35:17 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64seg.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c,v 3.0 1994/11/26 12:43:00 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: mach64seg.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c,v 3.1 1995/01/28 15:53:38 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c:1.1.1.1	Mon Jan 30 17:35:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c	Mon Jan 30 17:35:17 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64text.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c,v 3.1 1994/12/05 03:45:48 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64text.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c,v 3.2 1995/01/28 15:53:40 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c:1.1.1.1	Mon Jan 30 17:35:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c	Mon Jan 30 17:35:17 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64util.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c,v 3.0 1994/11/26 12:43:02 dawes Exp $ */
  /*
   * Copyright 1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach64util.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c,v 3.1 1995/01/28 15:53:41 dawes Exp $ */
  /*
   * Copyright 1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c:1.1.1.1	Mon Jan 30 17:35:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c	Mon Jan 30 17:35:18 1995
***************
*** 1,5 ****
  /* $XConsortium: mach64win.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c,v 3.0 1994/11/26 12:43:03 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: mach64win.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c,v 3.1 1995/01/28 15:53:42 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h:1.1.1.1	Mon Jan 30 17:35:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h	Mon Jan 30 17:35:18 1995
***************
*** 1,5 ****
  /* $XConsortium: regmach64.h,v 1.2 95/01/16 13:16:36 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h,v 3.1 1995/01/15 10:31:15 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: regmach64.h,v 1.2 95/01/16 13:16:36 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h,v 3.2 1995/01/28 15:53:43 dawes Exp $ */
  /*
   * Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile:1.1.1.2	Mon Jan 30 17:35:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile	Mon Jan 30 17:35:22 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:01:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile,v 3.1 1994/08/01 12:11:42 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mach8.c mach8cmap.c mach8gc.c mach8fs.c mach8ss.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:01:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile,v 3.3 1995/01/28 17:00:15 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mach8.c mach8cmap.c mach8gc.c mach8fs.c mach8ss.c \
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c:3.17
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c:1.1.1.2	Mon Jan 30 17:35:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c	Mon Jan 30 17:35:23 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8.c,v 1.7 95/01/16 13:16:36 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c,v 3.15 1995/01/15 10:31:37 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: mach8.c,v 1.7 95/01/16 13:16:36 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c,v 3.17 1995/01/28 17:00:18 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h:3.6
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h:1.1.1.2	Mon Jan 30 17:35:23 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h	Mon Jan 30 17:35:23 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8.h,v 1.6 95/01/16 13:16:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h,v 3.4 1995/01/15 10:31:38 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach8.h,v 1.6 95/01/16 13:16:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h,v 3.6 1995/01/28 17:00:21 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c:1.1.1.2	Mon Jan 30 17:35:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c	Mon Jan 30 17:35:24 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8blt.c,v 1.6 95/01/12 20:20:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c,v 3.2 1994/11/26 12:43:25 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: mach8blt.c,v 1.6 95/01/12 20:20:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c,v 3.4 1995/01/28 17:00:24 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h:1.1.1.2	Mon Jan 30 17:35:25 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h	Mon Jan 30 17:35:25 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8cache.h,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h,v 3.2 1994/09/07 15:50:07 dawes Exp $ */
  void mach8GlyphWrite(
  #if NeedFunctionPrototypes
      int /*x*/,
--- 1,5 ----
  /* $XConsortium: mach8cache.h,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h,v 3.4 1995/01/28 17:00:27 dawes Exp $ */
  void mach8GlyphWrite(
  #if NeedFunctionPrototypes
      int /*x*/,
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c:1.1.1.2	Mon Jan 30 17:35:25 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c	Mon Jan 30 17:35:25 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8fc.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c,v 3.1 1994/08/01 12:11:12 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: mach8fc.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c,v 3.3 1995/01/28 17:00:29 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c:1.1.1.2	Mon Jan 30 17:35:25 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c	Mon Jan 30 17:35:25 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8fcach.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c,v 3.2 1994/09/07 15:50:08 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach8fcach.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c,v 3.4 1995/01/28 17:00:31 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c:1.1.1.2	Mon Jan 30 17:35:26 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c	Mon Jan 30 17:35:26 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8frect.c,v 1.6 95/01/12 20:19:35 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c,v 3.1 1994/11/26 12:43:26 dawes Exp $ */
  /*
   * Fill rectangles.
   */
--- 1,5 ----
  /* $XConsortium: mach8frect.c,v 1.6 95/01/12 20:19:35 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c,v 3.3 1995/01/28 17:00:34 dawes Exp $ */
  /*
   * Fill rectangles.
   */
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c:1.1.1.2	Mon Jan 30 17:35:27 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c	Mon Jan 30 17:35:27 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8fs.c,v 1.4 95/01/05 20:28:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c,v 3.1 1994/11/26 12:43:28 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: mach8fs.c,v 1.4 95/01/05 20:28:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c,v 3.3 1995/01/28 17:00:38 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c:1.1.1.2	Mon Jan 30 17:35:27 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c	Mon Jan 30 17:35:28 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8gc.c,v 1.3 95/01/05 22:39:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c,v 3.0 1994/11/26 12:43:30 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach8gc.c,v 1.3 95/01/05 22:39:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c,v 3.2 1995/01/28 17:00:42 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c:1.1.1.2	Mon Jan 30 17:35:28 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c	Mon Jan 30 17:35:28 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8gtimg.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c,v 3.0 1994/07/24 11:46:17 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: mach8gtimg.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c,v 3.2 1995/01/28 17:00:45 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c:1.1.1.2	Mon Jan 30 17:35:28 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c	Mon Jan 30 17:35:29 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8im.c,v 1.6 95/01/06 20:57:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c,v 3.4 1994/12/10 02:08:11 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: mach8im.c,v 1.6 95/01/06 20:57:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c,v 3.6 1995/01/28 17:00:48 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c:1.1.1.2	Mon Jan 30 17:35:29 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c	Mon Jan 30 17:35:29 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8init.c,v 1.3 95/01/06 20:57:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c,v 3.2 1994/12/11 10:52:47 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
--- 1,5 ----
  /* $XConsortium: mach8init.c,v 1.3 95/01/06 20:57:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c,v 3.4 1995/01/28 17:00:51 dawes Exp $ */
  /*
   * Written by Jake Richter
   * Copyright (c) 1989, 1990 Panacea Inc., Londonderry, NH - All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c:1.1.1.2	Mon Jan 30 17:35:30 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c	Mon Jan 30 17:35:30 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8scrin.c,v 1.4 95/01/16 20:07:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c,v 3.1 1994/12/10 03:00:30 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: mach8scrin.c,v 1.4 95/01/16 20:07:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c,v 3.3 1995/01/28 17:00:54 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c:1.1.1.2	Mon Jan 30 17:35:30 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c	Mon Jan 30 17:35:30 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8seg.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c,v 3.0 1994/06/06 06:46:45 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach8seg.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c,v 3.2 1995/01/28 17:00:56 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c:1.1.1.2	Mon Jan 30 17:35:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c	Mon Jan 30 17:35:31 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8text.c,v 1.3 95/01/05 20:28:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c,v 3.1 1994/11/27 08:22:05 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: mach8text.c,v 1.3 95/01/05 20:28:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c,v 3.3 1995/01/28 17:01:00 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c:1.1.1.2	Mon Jan 30 17:35:31 1995
--- xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c	Mon Jan 30 17:35:31 1995
***************
*** 1,5 ****
  /* $XConsortium: mach8win.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c,v 3.0 1994/05/31 08:04:46 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: mach8win.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c,v 3.2 1995/01/28 17:01:03 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c:1.1.1.1	Mon Jan 30 17:35:34 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c	Mon Jan 30 17:35:35 1995
***************
*** 1,5 ****
  /* $XConsortium: I2061Acal.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c,v 3.1 1994/09/07 15:50:41 dawes Exp $ */
  /* Id: ICD2061Acal.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
  /* Based on the number 9 Inc code */
  /* Copyright (c) 1992, Number Nine Computer Corp.  All Rights Reserved.
--- 1,5 ----
  /* $XConsortium: I2061Acal.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c,v 3.2 1995/01/28 15:54:34 dawes Exp $ */
  /* Id: ICD2061Acal.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
  /* Based on the number 9 Inc code */
  /* Copyright (c) 1992, Number Nine Computer Corp.  All Rights Reserved.
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c:1.1.1.1	Mon Jan 30 17:35:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c	Mon Jan 30 17:35:35 1995
***************
*** 1,5 ****
  /* $XConsortium: I2061Aset.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c,v 3.1 1994/09/07 15:50:42 dawes Exp $ */
  /* Id: ICD2061Aset.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
  /* Based on the number 9 Inc code */
  /* Copyright (c) 1992, Number Nine Computer Corp.  All Rights Reserved. 
--- 1,5 ----
  /* $XConsortium: I2061Aset.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c,v 3.2 1995/01/28 15:54:37 dawes Exp $ */
  /* Id: ICD2061Aset.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
  /* Based on the number 9 Inc code */
  /* Copyright (c) 1992, Number Nine Computer Corp.  All Rights Reserved. 
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h:1.1.1.1	Mon Jan 30 17:35:35 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h	Mon Jan 30 17:35:35 1995
***************
*** 1,5 ****
  /* $XConsortium: ICD2061A.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h,v 3.1 1994/09/07 15:50:40 dawes Exp $ */
  /* Id: ICD2061A.h,v 4.0 1994/05/28 01:24:17 nygren Exp */
  #ifndef DEBUG
  /* #define DEBUG */
--- 1,5 ----
  /* $XConsortium: ICD2061A.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/ICD2061A.h,v 3.2 1995/01/28 15:54:38 dawes Exp $ */
  /* Id: ICD2061A.h,v 4.0 1994/05/28 01:24:17 nygren Exp */
  #ifndef DEBUG
  /* #define DEBUG */
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile:3.9
*** xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile:1.1.1.1	Mon Jan 30 17:35:36 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile	Mon Jan 30 17:35:36 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:34:53 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile,v 3.8 1995/01/26 02:17:55 dawes Exp $
  XCOMM Id: Imakefile,v 4.0 1994/05/28 01:24:17 nygren Exp
  
  #include <Server.tmpl>
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:34:53 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/Imakefile,v 3.9 1995/01/28 15:54:40 dawes Exp $
  XCOMM Id: Imakefile,v 4.0 1994/05/28 01:24:17 nygren Exp
  
  #include <Server.tmpl>
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c:3.24
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c:1.1.1.1	Mon Jan 30 17:35:37 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c	Mon Jan 30 17:35:37 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000.c,v 1.6 95/01/16 13:16:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c,v 3.23 1995/01/15 10:31:55 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1994 by Erik Nygren <nygren@mit.edu>
--- 1,5 ----
  /* $XConsortium: p9000.c,v 1.6 95/01/16 13:16:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c,v 3.24 1995/01/28 15:54:41 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * Copyright 1994 by Erik Nygren <nygren@mit.edu>
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h:3.11
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h:1.1.1.1	Mon Jan 30 17:35:37 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h	Mon Jan 30 17:35:37 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000.h,v 1.5 95/01/16 13:16:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h,v 3.9 1995/01/15 10:31:57 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Erik Nygren <nygren@mit.edu>.
--- 1,5 ----
  /* $XConsortium: p9000.h,v 1.5 95/01/16 13:16:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.h,v 3.11 1995/01/28 15:54:43 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * Copyright 1994 by Erik Nygren <nygren@mit.edu>.
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c:1.1.1.1	Mon Jan 30 17:35:38 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c	Mon Jan 30 17:35:38 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000Bt485.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c,v 3.3 1994/08/31 04:23:00 dawes Exp $ */
  /*
   * Copyright 1993 By David Wexelblat <dwex@aib.com>
   *
--- 1,5 ----
  /* $XConsortium: p9000Bt485.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.c,v 3.4 1995/01/28 15:54:44 dawes Exp $ */
  /*
   * Copyright 1993 By David Wexelblat <dwex@aib.com>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h:1.1.1.1	Mon Jan 30 17:35:38 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h	Mon Jan 30 17:35:38 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000Bt485.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h,v 3.1 1994/09/17 13:46:01 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: p9000Bt485.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000Bt485.h,v 3.2 1995/01/28 15:54:46 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c:1.1.1.1	Mon Jan 30 17:35:39 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c	Mon Jan 30 17:35:39 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000BtCurs.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c,v 3.4 1994/09/17 13:46:02 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: p9000BtCurs.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000BtCurs.c,v 3.5 1995/01/28 15:54:48 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c:1.1.1.1	Mon Jan 30 17:35:39 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c	Mon Jan 30 17:35:40 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000blt.c,v 1.6 95/01/16 13:16:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c,v 3.6 1995/01/15 10:31:58 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: p9000blt.c,v 1.6 95/01/16 13:16:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000blt.c,v 3.7 1995/01/28 15:54:50 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c:1.1.1.1	Mon Jan 30 17:35:40 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c	Mon Jan 30 17:35:40 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000cmap.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c,v 3.2 1994/09/17 13:46:04 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: p9000cmap.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000cmap.c,v 3.3 1995/01/28 15:54:51 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c:1.1.1.1	Mon Jan 30 17:35:40 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c	Mon Jan 30 17:35:41 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000curs.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c,v 3.0 1994/05/29 02:05:38 dawes Exp $ */
  /*
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
--- 1,5 ----
  /* $XConsortium: p9000curs.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.c,v 3.1 1995/01/28 15:54:53 dawes Exp $ */
  /*
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h:3.1
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h:1.1.1.1	Mon Jan 30 17:35:41 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h	Mon Jan 30 17:35:41 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000curs.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h,v 3.0 1994/05/29 02:05:39 dawes Exp $ */
  
  extern Bool p9000BlockCursor;
  extern Bool p9000ReloadCursor;
--- 1,5 ----
  /* $XConsortium: p9000curs.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000curs.h,v 3.1 1995/01/28 15:54:54 dawes Exp $ */
  
  extern Bool p9000BlockCursor;
  extern Bool p9000ReloadCursor;
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c:1.1.1.1	Mon Jan 30 17:35:42 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c	Mon Jan 30 17:35:42 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000gc.c,v 1.3 95/01/16 13:16:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c,v 3.2 1995/01/15 10:32:00 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: p9000gc.c,v 1.3 95/01/16 13:16:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000gc.c,v 3.3 1995/01/28 15:54:55 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c:1.1.1.1	Mon Jan 30 17:35:43 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c	Mon Jan 30 17:35:43 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000im.c,v 1.5 95/01/05 20:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c,v 3.4 1994/11/26 12:44:20 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: p9000im.c,v 1.5 95/01/05 20:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000im.c,v 3.5 1995/01/28 15:54:57 dawes Exp $ */
  /*
   * Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c:3.9
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c:1.1.1.1	Mon Jan 30 17:35:43 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c	Mon Jan 30 17:35:43 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000init.c,v 1.6 95/01/16 13:16:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c,v 3.7 1995/01/15 10:32:02 dawes Exp $ */
  /*
   * Copyright 1994 Erik Nygren (nygren@mit.edu)
   *
--- 1,5 ----
  /* $XConsortium: p9000init.c,v 1.6 95/01/16 13:16:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000init.c,v 3.9 1995/01/28 15:54:59 dawes Exp $ */
  /*
   * Copyright 1994 Erik Nygren (nygren@mit.edu)
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c:1.1.1.1	Mon Jan 30 17:35:44 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c	Mon Jan 30 17:35:44 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000line.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c,v 3.0 1995/01/15 10:32:03 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: p9000line.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c,v 3.1 1995/01/28 15:55:00 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c:1.1.1.1	Mon Jan 30 17:35:44 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c	Mon Jan 30 17:35:44 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000orchid.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c,v 3.2 1994/09/07 15:50:46 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
--- 1,5 ----
  /* $XConsortium: p9000orchid.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.c,v 3.3 1995/01/28 15:55:02 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h:1.1.1.1	Mon Jan 30 17:35:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h	Mon Jan 30 17:35:45 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000orchid.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h,v 3.1 1994/09/07 15:50:49 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
--- 1,5 ----
  /* $XConsortium: p9000orchid.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000orchid.h,v 3.2 1995/01/28 15:55:03 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h:3.8
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h:1.1.1.1	Mon Jan 30 17:35:45 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h	Mon Jan 30 17:35:45 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000reg.h,v 1.4 95/01/16 13:16:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h,v 3.7 1995/01/15 10:32:04 dawes Exp $ */
  /* p9000reg.h
   *
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
--- 1,5 ----
  /* $XConsortium: p9000reg.h,v 1.4 95/01/16 13:16:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000reg.h,v 3.8 1995/01/28 15:55:04 dawes Exp $ */
  /* p9000reg.h
   *
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c:1.1.1.1	Mon Jan 30 17:35:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c	Mon Jan 30 17:35:46 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000scrin.c,v 1.3 95/01/06 20:57:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c,v 3.6 1994/12/10 02:08:51 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
--- 1,5 ----
  /* $XConsortium: p9000scrin.c,v 1.3 95/01/06 20:57:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c,v 3.7 1995/01/28 15:55:06 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  Copyright 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c:3.1
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c:1.1.1.1	Mon Jan 30 17:35:46 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c	Mon Jan 30 17:35:46 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000seg.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c,v 3.0 1995/01/15 10:32:05 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: p9000seg.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c,v 3.1 1995/01/28 15:55:07 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c:1.1.1.1	Mon Jan 30 17:35:47 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c	Mon Jan 30 17:35:47 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000vga.c,v 1.3 95/01/05 20:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c,v 3.6 1994/11/30 20:40:00 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
--- 1,5 ----
  /* $XConsortium: p9000vga.c,v 1.3 95/01/05 20:38:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000vga.c,v 3.7 1995/01/28 15:55:09 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c:1.1.1.1	Mon Jan 30 17:35:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c	Mon Jan 30 17:35:48 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000viper.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c,v 3.6 1994/09/07 15:50:53 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
--- 1,5 ----
  /* $XConsortium: p9000viper.c,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.c,v 3.7 1995/01/28 15:55:10 dawes Exp $ */
  /*
   * Copyright 1994, Erik Nygren (nygren@mit.edu)
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h:3.5
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h:1.1.1.1	Mon Jan 30 17:35:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h	Mon Jan 30 17:35:48 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000viper.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h,v 3.4 1994/09/11 00:50:27 dawes Exp $ */
  /*
   * Written by Erik Nygren
   *
--- 1,5 ----
  /* $XConsortium: p9000viper.h,v 1.2 94/11/21 22:38:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000viper.h,v 3.5 1995/01/28 15:55:12 dawes Exp $ */
  /*
   * Written by Erik Nygren
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c:3.2
*** xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c:1.1.1.1	Mon Jan 30 17:35:48 1995
--- xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c	Mon Jan 30 17:35:49 1995
***************
*** 1,5 ****
  /* $XConsortium: p9000win.c,v 1.3 95/01/16 13:16:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c,v 3.1 1995/01/15 10:32:06 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: p9000win.c,v 1.3 95/01/16 13:16:44 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000win.c,v 3.2 1995/01/28 15:55:13 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile:3.9
*** xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile:1.1.1.2	Mon Jan 30 17:35:54 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile	Mon Jan 30 17:35:54 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile,v 3.7 1994/12/17 10:05:29 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile,v 3.9 1995/01/28 17:01:28 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h:3.12
*** xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h:1.1.1.2	Mon Jan 30 17:35:55 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h	Mon Jan 30 17:35:55 1995
***************
*** 1,5 ****
  /* $XConsortium: regs3.h,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h,v 3.10 1994/11/06 09:50:57 dawes Exp $ */
  /*
   * regs3.h
   * 
--- 1,5 ----
  /* $XConsortium: regs3.h,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h,v 3.12 1995/01/28 17:01:30 dawes Exp $ */
  /*
   * regs3.h
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3.c:3.72
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3.c:1.1.1.2	Mon Jan 30 17:35:57 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3.c	Mon Jan 30 17:35:58 1995
***************
*** 1,5 ****
  /* $XConsortium: s3.c,v 1.8 95/01/25 00:44:45 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.c,v 3.69 1995/01/23 01:29:21 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
--- 1,5 ----
  /* $XConsortium: s3.c,v 1.8 95/01/25 00:44:45 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.c,v 3.72 1995/01/28 17:01:34 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3.h:3.20
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3.h:1.1.1.2	Mon Jan 30 17:35:58 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3.h	Mon Jan 30 17:35:59 1995
***************
*** 1,5 ****
  /* $XConsortium: s3.h,v 1.8 95/01/27 14:45:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.h,v 3.18 1995/01/20 04:20:29 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
--- 1,5 ----
  /* $XConsortium: s3.h,v 1.8 95/01/27 14:45:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.h,v 3.20 1995/01/28 17:01:37 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c:3.8
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c:1.1.1.2	Mon Jan 30 17:35:59 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c	Mon Jan 30 17:35:59 1995
***************
*** 1,5 ****
  /* $XConsortium: s3BtCursor.c,v 1.4 95/01/16 13:16:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c,v 3.6 1995/01/12 12:03:06 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: s3BtCursor.c,v 1.4 95/01/16 13:16:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c,v 3.8 1995/01/28 17:01:39 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c:3.15
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c:1.1.1.2	Mon Jan 30 17:36:00 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c	Mon Jan 30 17:36:00 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: s3Cursor.c,v 1.5 95/01/23 15:33:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c,v 3.13 1995/01/21 14:07:34 dawes Exp $
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
--- 1,6 ----
  /*
   * $XConsortium: s3Cursor.c,v 1.5 95/01/23 15:33:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c,v 3.15 1995/01/28 17:01:40 dawes Exp $
   * 
   * Copyright 1991 MIPS Computer Systems, Inc.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c:1.1.1.1	Mon Jan 30 17:36:00 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c	Mon Jan 30 17:36:00 1995
***************
*** 1,5 ****
  /* $XConsortium: s3ELSA.c,v 1.2 94/11/21 22:50:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c,v 3.5 1994/09/14 10:40:10 dawes Exp $ */
  /* 
   * s3ELSA.c 
   * 
--- 1,5 ----
  /* $XConsortium: s3ELSA.c,v 1.2 94/11/21 22:50:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.c,v 3.6 1995/01/28 15:55:42 dawes Exp $ */
  /* 
   * s3ELSA.c 
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h:3.2
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h:1.1.1.1	Mon Jan 30 17:36:01 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h	Mon Jan 30 17:36:01 1995
***************
*** 1,5 ****
  /* $XConsortium: s3ELSA.h,v 1.2 94/11/21 22:50:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h,v 3.1 1994/09/08 14:26:47 dawes Exp $ */
  
  #ifndef _S3ELSA_H_
  #define _S3ELSA_H_
--- 1,5 ----
  /* $XConsortium: s3ELSA.h,v 1.2 94/11/21 22:50:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ELSA.h,v 3.2 1995/01/28 15:55:43 dawes Exp $ */
  
  #ifndef _S3ELSA_H_
  #define _S3ELSA_H_
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h:3.12
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h:1.1.1.2	Mon Jan 30 17:36:01 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h	Mon Jan 30 17:36:01 1995
***************
*** 1,5 ****
  /* $XConsortium: s3Ti3020.h,v 1.5 95/01/26 15:35:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h,v 3.10 1995/01/26 02:18:20 dawes Exp $ */
  /*
   * Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
   *
--- 1,5 ----
  /* $XConsortium: s3Ti3020.h,v 1.5 95/01/26 15:35:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h,v 3.12 1995/01/28 17:01:42 dawes Exp $ */
  /*
   * Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c:1.1.1.2	Mon Jan 30 17:36:02 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c	Mon Jan 30 17:36:02 1995
***************
*** 1,5 ****
  /* $XConsortium: s3TiCursor.c,v 1.4 95/01/26 15:35:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c,v 3.5 1995/01/26 02:18:22 dawes Exp $ */
  /*
   * Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
   *
--- 1,5 ----
  /* $XConsortium: s3TiCursor.c,v 1.4 95/01/26 15:35:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c,v 3.7 1995/01/28 17:01:43 dawes Exp $ */
  /*
   * Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c:1.1.1.2	Mon Jan 30 17:36:02 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c	Mon Jan 30 17:36:03 1995
***************
*** 1,5 ****
  /* $XConsortium: s3bcach.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c,v 3.5 1994/09/07 15:51:14 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * 
--- 1,5 ----
  /* $XConsortium: s3bcach.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c,v 3.7 1995/01/28 17:01:46 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Tombs. Oxford University
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c:3.10
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c:1.1.1.2	Mon Jan 30 17:36:03 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c	Mon Jan 30 17:36:03 1995
***************
*** 1,5 ****
  /* $XConsortium: s3blt.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c,v 3.8 1994/11/26 12:44:47 dawes Exp $ */
  /*
  
  Copyright (c) 1998  X Consortium
--- 1,5 ----
  /* $XConsortium: s3blt.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c,v 3.10 1995/01/28 17:01:48 dawes Exp $ */
  /*
  
  Copyright (c) 1998  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c:1.1.1.2	Mon Jan 30 17:36:04 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c	Mon Jan 30 17:36:04 1995
***************
*** 1,5 ****
  /* $XConsortium: s3bstor.c,v 1.3 95/01/16 13:16:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c,v 3.5 1995/01/14 10:47:18 dawes Exp $ */
  /*-
   * s3bstore.c --
   *	Functions required by the backing-store implementation in MI.
--- 1,5 ----
  /* $XConsortium: s3bstor.c,v 1.3 95/01/16 13:16:51 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c,v 3.7 1995/01/28 17:01:49 dawes Exp $ */
  /*-
   * s3bstore.c --
   *	Functions required by the backing-store implementation in MI.
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c:1.1.1.2	Mon Jan 30 17:36:04 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c	Mon Jan 30 17:36:04 1995
***************
*** 1,5 ****
  /* $XConsortium: s3cmap.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c,v 3.1 1994/08/20 07:33:50 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
--- 1,5 ----
  /* $XConsortium: s3cmap.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c,v 3.3 1995/01/28 17:01:51 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c:1.1.1.2	Mon Jan 30 17:36:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c	Mon Jan 30 17:36:05 1995
***************
*** 1,5 ****
  /* $XConsortium: s3dline.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c,v 3.3 1994/09/26 15:31:42 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3dline.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c,v 3.5 1995/01/28 17:01:52 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c:1.1.1.2	Mon Jan 30 17:36:05 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c	Mon Jan 30 17:36:06 1995
***************
*** 1,5 ****
  /* $XConsortium: s3dseg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c,v 3.3 1994/09/26 15:31:44 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3dseg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c,v 3.5 1995/01/28 17:01:54 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c:3.15
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c:1.1.1.2	Mon Jan 30 17:36:06 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c	Mon Jan 30 17:36:06 1995
***************
*** 1,5 ****
  /* $XConsortium: s3fcach.c,v 1.4 95/01/23 15:33:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c,v 3.13 1995/01/21 13:04:19 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: s3fcach.c,v 1.4 95/01/23 15:33:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c,v 3.15 1995/01/28 17:01:56 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c:3.3
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c:1.1.1.2	Mon Jan 30 17:36:07 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c	Mon Jan 30 17:36:07 1995
***************
*** 1,5 ****
  /* $XConsortium: s3font.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c,v 3.1 1994/08/01 13:19:36 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: s3font.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c,v 3.3 1995/01/28 17:01:57 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c:1.1.1.2	Mon Jan 30 17:36:07 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c	Mon Jan 30 17:36:07 1995
***************
*** 1,5 ****
  /* $XConsortium: s3frect.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c,v 3.3 1994/08/20 07:33:58 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: s3frect.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c,v 3.5 1995/01/28 17:01:59 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c:1.1.1.2	Mon Jan 30 17:36:08 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c	Mon Jan 30 17:36:08 1995
***************
*** 1,5 ****
  /* $XConsortium: s3fs.c,v 1.4 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c,v 3.3 1994/08/20 07:34:00 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: s3fs.c,v 1.4 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c,v 3.5 1995/01/28 17:02:01 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c:1.1.1.2	Mon Jan 30 17:36:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c	Mon Jan 30 17:36:09 1995
***************
*** 1,5 ****
  /* $XConsortium: s3gc.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c,v 3.3 1994/11/26 12:44:49 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3gc.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c,v 3.5 1995/01/28 17:02:03 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c:1.1.1.1	Mon Jan 30 17:36:09 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c	Mon Jan 30 17:36:10 1995
***************
*** 1,5 ****
  /* $XConsortium: s3gc16.c,v 1.2 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c,v 3.4 1994/11/26 12:44:51 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3gc16.c,v 1.2 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc16.c,v 3.5 1995/01/28 15:56:07 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c:1.1.1.1	Mon Jan 30 17:36:10 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c	Mon Jan 30 17:36:10 1995
***************
*** 1,5 ****
  /* $XConsortium: s3gc32.c,v 1.2 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c,v 3.3 1994/11/26 12:44:53 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3gc32.c,v 1.2 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc32.c,v 3.4 1995/01/28 15:56:09 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c:1.1.1.2	Mon Jan 30 17:36:11 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c	Mon Jan 30 17:36:11 1995
***************
*** 1,5 ****
  /* $XConsortium: s3gs.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c,v 3.4 1994/11/26 12:44:54 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3gs.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c,v 3.6 1995/01/28 17:02:05 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c:1.1.1.2	Mon Jan 30 17:36:11 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c	Mon Jan 30 17:36:11 1995
***************
*** 1,5 ****
  /* $XConsortium: s3gtimg.c,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c,v 3.4 1994/08/20 07:34:09 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: s3gtimg.c,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c,v 3.7 1995/01/28 17:02:07 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c:3.14
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c:1.1.1.2	Mon Jan 30 17:36:12 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c	Mon Jan 30 17:36:12 1995
***************
*** 1,5 ****
  /* $XConsortium: s3im.c,v 1.6 95/01/06 20:57:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c,v 3.12 1995/01/02 04:52:11 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: s3im.c,v 1.6 95/01/06 20:57:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c,v 3.14 1995/01/28 17:02:09 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c:3.53
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c:1.1.1.2	Mon Jan 30 17:36:14 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c	Mon Jan 30 17:36:15 1995
***************
*** 1,5 ****
  /* $XConsortium: s3init.c,v 1.6 95/01/23 15:34:00 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c,v 3.51 1995/01/23 01:29:26 dawes Exp $ */
  /*
   * Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc.,
   * Londonderry, NH - All Rights Reserved
--- 1,5 ----
  /* $XConsortium: s3init.c,v 1.6 95/01/23 15:34:00 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c,v 3.53 1995/01/28 17:02:14 dawes Exp $ */
  /*
   * Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc.,
   * Londonderry, NH - All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c:1.1.1.2	Mon Jan 30 17:36:16 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c	Mon Jan 30 17:36:16 1995
***************
*** 1,5 ****
  /* $XConsortium: s3line.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c,v 3.3 1994/09/26 15:31:50 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3line.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c,v 3.5 1995/01/28 17:02:17 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h:1.1.1.2	Mon Jan 30 17:36:16 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h	Mon Jan 30 17:36:16 1995
***************
*** 1,5 ****
  /* $XConsortium: s3linear.h,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h,v 3.3 1994/08/20 07:34:19 dawes Exp $ */
  /*
   * s3EnableLinear() and s3DisableLinear() are wrappers to surround
   * any function call that is going to access the video ram through
--- 1,5 ----
  /* $XConsortium: s3linear.h,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h,v 3.5 1995/01/28 17:02:19 dawes Exp $ */
  /*
   * s3EnableLinear() and s3DisableLinear() are wrappers to surround
   * any function call that is going to access the video ram through
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c:3.23
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c:1.1.1.2	Mon Jan 30 17:36:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c	Mon Jan 30 17:36:17 1995
***************
*** 1,6 ****
  
  /* $XConsortium: s3misc.c,v 1.6 95/01/23 15:34:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c,v 3.22 1995/01/23 01:29:30 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
--- 1,6 ----
  
  /* $XConsortium: s3misc.c,v 1.6 95/01/23 15:34:03 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c,v 3.23 1995/01/28 15:56:25 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h:3.6
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h:1.1.1.2	Mon Jan 30 17:36:17 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h	Mon Jan 30 17:36:17 1995
***************
*** 1,5 ****
  /* $XConsortium: s3name.h,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h,v 3.4 1994/09/22 15:50:07 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
--- 1,5 ----
  /* $XConsortium: s3name.h,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h,v 3.6 1995/01/28 17:02:20 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c:1.1.1.2	Mon Jan 30 17:36:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c	Mon Jan 30 17:36:18 1995
***************
*** 1,5 ****
  /* $XConsortium: s3plypt.c,v 1.4 95/01/13 19:09:26 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c,v 3.2 1994/08/20 07:34:22 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: s3plypt.c,v 1.4 95/01/13 19:09:26 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c,v 3.4 1995/01/28 17:02:22 dawes Exp $ */
  /************************************************************
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c:1.1.1.2	Mon Jan 30 17:36:18 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c	Mon Jan 30 17:36:18 1995
***************
*** 1,5 ****
  /* $XConsortium: s3scrin.c,v 1.4 95/01/16 20:07:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c,v 3.4 1994/09/24 15:12:54 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: s3scrin.c,v 1.4 95/01/16 20:07:23 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c,v 3.7 1995/01/28 17:15:18 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c:1.1.1.2	Mon Jan 30 17:36:19 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c	Mon Jan 30 17:36:19 1995
***************
*** 1,5 ****
  /* $XConsortium: s3seg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c,v 3.3 1994/09/26 15:31:51 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3seg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c,v 3.5 1995/01/28 17:02:26 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c:3.5
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c:1.1.1.2	Mon Jan 30 17:36:19 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c	Mon Jan 30 17:36:20 1995
***************
*** 1,5 ****
  /* $XConsortium: s3ss.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c,v 3.3 1994/08/20 07:34:27 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3ss.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c,v 3.5 1995/01/28 17:02:28 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c:3.9
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c:1.1.1.2	Mon Jan 30 17:36:20 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c	Mon Jan 30 17:36:20 1995
***************
*** 1,5 ****
  /* $XConsortium: s3text.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c,v 3.7 1994/09/08 14:26:54 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
--- 1,5 ----
  /* $XConsortium: s3text.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c,v 3.9 1995/01/28 17:02:30 dawes Exp $ */
  /*
   * Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
   * 
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c:3.6
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c:1.1.1.2	Mon Jan 30 17:36:21 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c	Mon Jan 30 17:36:21 1995
***************
*** 1,5 ****
  /* $XConsortium: s3win.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c,v 3.4 1994/08/20 07:34:31 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: s3win.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c,v 3.6 1995/01/28 17:02:32 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile:1.1.1.2	Mon Jan 30 17:36:22 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile	Mon Jan 30 17:36:22 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:57:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile,v 3.0 1994/12/25 12:25:21 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:57:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile,v 3.2 1995/01/28 17:02:45 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile:1.1.1.2	Mon Jan 30 17:36:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile	Mon Jan 30 17:36:24 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:11:02 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile,v 3.1 1994/08/01 12:13:47 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mmio_928.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:11:02 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile,v 3.3 1995/01/28 17:02:49 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mmio_928.c
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c:3.7
*** xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c:1.1.1.2	Mon Jan 30 17:36:24 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c	Mon Jan 30 17:36:24 1995
***************
*** 1,5 ****
  /* $XConsortium: mmio_928.c,v 1.3 95/01/16 13:16:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c,v 3.5 1995/01/10 11:18:24 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
--- 1,5 ----
  /* $XConsortium: mmio_928.c,v 1.3 95/01/16 13:16:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c,v 3.7 1995/01/28 17:02:51 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile:1.1.1.2	Mon Jan 30 17:36:25 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile	Mon Jan 30 17:36:25 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:12:09 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile,v 3.0 1994/08/01 12:13:13 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = s3_generic.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:12:09 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile,v 3.2 1995/01/28 17:02:54 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = s3_generic.c
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c:3.4
*** xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c:1.1.1.2	Mon Jan 30 17:36:26 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c	Mon Jan 30 17:36:26 1995
***************
*** 1,5 ****
  /* $XConsortium: s3_generic.c,v 1.3 95/01/16 13:16:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c,v 3.2 1995/01/10 10:55:15 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
--- 1,5 ----
  /* $XConsortium: s3_generic.c,v 1.3 95/01/16 13:16:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c,v 3.4 1995/01/28 17:02:55 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
diff -c xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile:1.1.1.2	Mon Jan 30 17:36:27 1995
--- xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile	Mon Jan 30 17:36:27 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:13:35 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile,v 3.4 1994/09/22 15:50:18 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	s3misc.c s3cmap.c s3gc.c s3gc16.c s3gc32.c s3fs.c s3ss.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:13:35 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile,v 3.6 1995/01/28 17:03:00 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	s3misc.c s3cmap.c s3gc.c s3gc16.c s3gc32.c s3fs.c s3ss.c \
diff -c xc/programs/Xserver/hw/xfree86/common/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/Imakefile:3.16
*** xc/programs/Xserver/hw/xfree86/common/Imakefile:1.1.1.2	Mon Jan 30 17:36:39 1995
--- xc/programs/Xserver/hw/xfree86/common/Imakefile	Mon Jan 30 17:36:39 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:36:06 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.14 1995/01/26 02:18:43 dawes Exp $
  #include <Server.tmpl>
  
  #ifdef i386MachArchitecture
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:36:06 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.16 1995/01/28 17:03:06 dawes Exp $
  #include <Server.tmpl>
  
  #ifdef i386MachArchitecture
diff -c xc/programs/Xserver/hw/xfree86/common/Mach32.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/Mach32.c:3.4
*** xc/programs/Xserver/hw/xfree86/common/Mach32.c:1.1.1.2	Mon Jan 30 17:36:39 1995
--- xc/programs/Xserver/hw/xfree86/common/Mach32.c	Mon Jan 30 17:36:39 1995
***************
*** 1,5 ****
  /* $XConsortium: Mach32.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach32.c,v 3.3 1994/09/17 13:46:26 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: Mach32.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach32.c,v 3.4 1995/01/28 15:57:13 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/Mach64.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/common/Mach64.c:3.1
*** xc/programs/Xserver/hw/xfree86/common/Mach64.c:1.1.1.1	Mon Jan 30 17:36:40 1995
--- xc/programs/Xserver/hw/xfree86/common/Mach64.c	Mon Jan 30 17:36:40 1995
***************
*** 1,5 ****
  /* $XConsortium: Mach64.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach64.c,v 3.0 1994/11/27 20:42:39 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: Mach64.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach64.c,v 3.1 1995/01/28 15:57:14 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/Mach8.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/Mach8.c:3.3
*** xc/programs/Xserver/hw/xfree86/common/Mach8.c:1.1.1.2	Mon Jan 30 17:36:40 1995
--- xc/programs/Xserver/hw/xfree86/common/Mach8.c	Mon Jan 30 17:36:40 1995
***************
*** 1,5 ****
  /* $XConsortium: Mach8.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach8.c,v 3.2 1994/09/07 15:51:41 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: Mach8.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach8.c,v 3.3 1995/01/28 15:57:15 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/XF86_8514.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/XF86_8514.c:3.4
*** xc/programs/Xserver/hw/xfree86/common/XF86_8514.c:1.1.1.2	Mon Jan 30 17:36:41 1995
--- xc/programs/Xserver/hw/xfree86/common/XF86_8514.c	Mon Jan 30 17:36:41 1995
***************
*** 1,5 ****
  /* $XConsortium: XF86_8514.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_8514.c,v 3.2 1994/09/07 15:51:38 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: XF86_8514.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_8514.c,v 3.4 1995/01/28 17:03:08 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c:3.6
*** xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c:1.1.1.2	Mon Jan 30 17:36:41 1995
--- xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c	Mon Jan 30 17:36:41 1995
***************
*** 1,5 ****
  /* $XConsortium: XF86_Mono.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c,v 3.4 1994/09/07 15:51:42 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: XF86_Mono.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c,v 3.6 1995/01/28 17:03:09 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/XF86_S3.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/XF86_S3.c:3.9
*** xc/programs/Xserver/hw/xfree86/common/XF86_S3.c:1.1.1.2	Mon Jan 30 17:36:42 1995
--- xc/programs/Xserver/hw/xfree86/common/XF86_S3.c	Mon Jan 30 17:36:42 1995
***************
*** 1,5 ****
  /* $XConsortium: XF86_S3.c,v 1.3 95/01/05 20:39:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_S3.c,v 3.7 1994/12/05 04:06:50 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: XF86_S3.c,v 1.3 95/01/05 20:39:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_S3.c,v 3.9 1995/01/28 17:03:10 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c:3.6
*** xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c:1.1.1.2	Mon Jan 30 17:36:42 1995
--- xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c	Mon Jan 30 17:36:42 1995
***************
*** 1,5 ****
  /* $XConsortium: XF86_SVGA.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c,v 3.4 1994/09/07 15:51:45 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: XF86_SVGA.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c,v 3.6 1995/01/28 17:03:11 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c:3.5
*** xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c:1.1.1.2	Mon Jan 30 17:36:43 1995
--- xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c	Mon Jan 30 17:36:43 1995
***************
*** 1,5 ****
  /* $XConsortium: XF86_VGA16.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c,v 3.3 1994/09/07 15:51:46 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
--- 1,5 ----
  /* $XConsortium: XF86_VGA16.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c,v 3.5 1995/01/28 17:03:12 dawes Exp $ */
  #include "X.h"
  #include "os.h"
  
diff -c xc/programs/Xserver/hw/xfree86/common/atKeynames.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/atKeynames.h:3.3
*** xc/programs/Xserver/hw/xfree86/common/atKeynames.h:1.1.1.2	Mon Jan 30 17:36:44 1995
--- xc/programs/Xserver/hw/xfree86/common/atKeynames.h	Mon Jan 30 17:36:44 1995
***************
*** 1,5 ****
  /* $XConsortium: atKeynames.h,v 1.6 95/01/13 19:19:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.1 1994/12/11 10:54:28 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: atKeynames.h,v 1.6 95/01/13 19:19:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.3 1995/01/28 17:03:14 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/compiler.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/compiler.h:3.3
*** xc/programs/Xserver/hw/xfree86/common/compiler.h:1.1.1.2	Mon Jan 30 17:36:47 1995
--- xc/programs/Xserver/hw/xfree86/common/compiler.h	Mon Jan 30 17:36:47 1995
***************
*** 1,5 ****
  /* $XConsortium: compiler.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.1 1994/07/24 11:49:16 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: compiler.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.3 1995/01/28 17:03:15 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86.h:3.15
*** xc/programs/Xserver/hw/xfree86/common/xf86.h:1.1.1.2	Mon Jan 30 17:36:47 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86.h	Mon Jan 30 17:36:47 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86.h,v 1.5 95/01/16 13:16:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.13 1995/01/10 10:23:38 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86.h,v 1.5 95/01/16 13:16:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.15 1995/01/28 17:03:16 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Config.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Config.c:3.36
*** xc/programs/Xserver/hw/xfree86/common/xf86Config.c:1.1.1.2	Mon Jan 30 17:36:49 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c	Mon Jan 30 17:36:50 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: xf86Config.c,v 1.6 95/01/16 13:16:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.34 1995/01/11 03:50:32 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /*
   * $XConsortium: xf86Config.c,v 1.6 95/01/16 13:16:57 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.36 1995/01/28 17:03:20 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:3.5
*** xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:1.1.1.2	Mon Jan 30 17:36:50 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c	Mon Jan 30 17:36:50 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Cursor.c,v 1.3 95/01/06 20:57:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.3 1994/12/11 10:54:36 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Cursor.c,v 1.3 95/01/06 20:57:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.5 1995/01/28 17:03:22 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Events.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Events.c:3.10
*** xc/programs/Xserver/hw/xfree86/common/xf86Events.c:1.1.1.2	Mon Jan 30 17:36:51 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c	Mon Jan 30 17:36:51 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Events.c,v 1.11 95/01/16 13:16:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.8 1995/01/11 03:50:36 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Events.c,v 1.11 95/01/16 13:16:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.10 1995/01/28 17:03:24 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Init.c:3.16
*** xc/programs/Xserver/hw/xfree86/common/xf86Init.c:1.1.1.2	Mon Jan 30 17:36:52 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c	Mon Jan 30 17:36:52 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: xf86Init.c,v 1.8 95/01/16 13:17:00 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.14 1995/01/07 04:07:28 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /*
   * $XConsortium: xf86Init.c,v 1.8 95/01/16 13:17:00 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.16 1995/01/28 17:03:26 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
***************
*** 182,187 ****
--- 182,188 ----
      {
        extern void AbortDDX();
        xf86VTSema = FALSE;
+       OsCleanup();
        AbortDDX();
        fflush(stderr);
        exit(0);
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Io.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Io.c:3.5
*** xc/programs/Xserver/hw/xfree86/common/xf86Io.c:1.1.1.2	Mon Jan 30 17:36:53 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Io.c	Mon Jan 30 17:36:53 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Io.c,v 1.6 95/01/16 20:07:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.3 1994/12/17 10:06:11 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Io.c,v 1.6 95/01/16 20:07:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.5 1995/01/28 17:03:28 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c:3.6
*** xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c:1.1.1.2	Mon Jan 30 17:36:53 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c	Mon Jan 30 17:36:53 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Kbd.c,v 1.6 95/01/23 15:34:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.4 1995/01/21 07:15:47 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Kbd.c,v 1.6 95/01/23 15:34:04 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.6 1995/01/28 17:03:30 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:3.5
*** xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:1.1.1.2	Mon Jan 30 17:36:54 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c	Mon Jan 30 17:36:54 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86KbdBSD.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.4 1995/01/10 10:23:50 dawes Exp $ */
  /*
   * Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk)
   * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
--- 1,5 ----
  /* $XConsortium: xf86KbdBSD.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.5 1995/01/28 15:57:40 dawes Exp $ */
  /*
   * Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk)
   * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff -c xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c:3.5
*** xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c:1.1.1.2	Mon Jan 30 17:36:55 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c	Mon Jan 30 17:36:55 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86KbdLnx.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.4 1994/12/11 10:54:45 dawes Exp $ */
  /*
   * Linux version of keymapping setup. The kernel (since 0.99.14) has support
   * for fully remapping the keyboard, but there are some differences between
--- 1,5 ----
  /* $XConsortium: xf86KbdLnx.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.5 1995/01/28 15:57:41 dawes Exp $ */
  /*
   * Linux version of keymapping setup. The kernel (since 0.99.14) has support
   * for fully remapping the keyboard, but there are some differences between
diff -c xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c:3.4
*** xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c:1.1.1.2	Mon Jan 30 17:36:55 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c	Mon Jan 30 17:36:55 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86KbdMach.c,v 1.6 95/01/13 19:20:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.2 1994/12/11 10:54:40 dawes Exp $ */
  /*
   *****************************************************************************
   * HISTORY
--- 1,5 ----
  /* $XConsortium: xf86KbdMach.c,v 1.6 95/01/13 19:20:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.4 1995/01/28 17:03:31 dawes Exp $ */
  /*
   *****************************************************************************
   * HISTORY
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h:3.5
*** xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h:1.1.1.2	Mon Jan 30 17:36:56 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h	Mon Jan 30 17:36:56 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Keymap.h,v 1.8 95/01/23 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.3 1995/01/23 01:29:46 dawes Exp $ */
  /*
   * For Scancodes see notes in atKeynames.h  !!!!
   */
--- 1,5 ----
  /* $XConsortium: xf86Keymap.h,v 1.8 95/01/23 15:34:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.5 1995/01/28 17:03:33 dawes Exp $ */
  /*
   * For Scancodes see notes in atKeynames.h  !!!!
   */
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Lock.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/common/xf86Lock.c:3.2
*** xc/programs/Xserver/hw/xfree86/common/xf86Lock.c:1.1.1.1	Mon Jan 30 17:36:56 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Lock.c	Mon Jan 30 17:36:56 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Lock.c,v 1.3 95/01/06 21:01:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Lock.c,v 3.1 1994/12/29 10:07:30 dawes Exp $ */
  
  /*
   * Explicit support for a server lock file like the ones used for UUCP.
--- 1,5 ----
  /* $XConsortium: xf86Lock.c,v 1.3 95/01/06 21:01:52 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Lock.c,v 3.2 1995/01/28 15:57:46 dawes Exp $ */
  
  /*
   * Explicit support for a server lock file like the ones used for UUCP.
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:3.7
*** xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:1.1.1.2	Mon Jan 30 17:36:57 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Priv.h	Mon Jan 30 17:36:57 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Priv.h,v 1.5 95/01/16 13:17:01 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.5 1995/01/11 03:50:38 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Priv.h,v 1.5 95/01/16 13:17:01 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.7 1995/01/28 17:03:35 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86Procs.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86Procs.h:3.2
*** xc/programs/Xserver/hw/xfree86/common/xf86Procs.h:1.1.1.2	Mon Jan 30 17:36:57 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86Procs.h	Mon Jan 30 17:36:57 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86Procs.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Procs.h,v 3.0 1994/06/19 11:05:34 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86Procs.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Procs.h,v 3.2 1995/01/28 17:03:36 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common/xf86_Config.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86_Config.h:3.21
*** xc/programs/Xserver/hw/xfree86/common/xf86_Config.h:1.1.1.2	Mon Jan 30 17:36:58 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86_Config.h	Mon Jan 30 17:36:58 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_Config.h,v 1.5 95/01/16 13:17:02 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Config.h,v 3.19 1995/01/11 03:50:39 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: xf86_Config.h,v 1.5 95/01/16 13:17:02 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Config.h,v 3.21 1995/01/28 17:03:38 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c:3.2
*** xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c:1.1.1.2	Mon Jan 30 17:36:59 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c	Mon Jan 30 17:36:59 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_Mouse.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c,v 3.0 1994/09/23 10:13:17 dawes Exp $ */
  /*
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
--- 1,5 ----
  /* $XConsortium: xf86_Mouse.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c,v 3.2 1995/01/28 17:03:40 dawes Exp $ */
  /*
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff -c xc/programs/Xserver/hw/xfree86/common/xf86_Option.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common/xf86_Option.h:3.22
*** xc/programs/Xserver/hw/xfree86/common/xf86_Option.h:1.1.1.2	Mon Jan 30 17:36:59 1995
--- xc/programs/Xserver/hw/xfree86/common/xf86_Option.h	Mon Jan 30 17:36:59 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_Option.h,v 1.6 95/01/23 15:34:06 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Option.h,v 3.20 1995/01/20 04:21:00 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: xf86_Option.h,v 1.6 95/01/23 15:34:06 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Option.h,v 3.22 1995/01/28 17:03:41 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c:3.2
*** xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c:1.1.1.1	Mon Jan 30 17:37:02 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c	Mon Jan 30 17:37:02 1995
***************
*** 1,5 ****
  /* $XConsortium: Ch8391clk.c,v 1.1 95/01/23 15:03:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c,v 3.1 1995/01/21 14:07:57 dawes Exp $ */
  /*
   * Copyright 1995 The XFree86 Project, Inc
   *
--- 1,5 ----
  /* $XConsortium: Ch8391clk.c,v 1.1 95/01/23 15:03:54 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c,v 3.2 1995/01/28 15:58:06 dawes Exp $ */
  /*
   * Copyright 1995 The XFree86 Project, Inc
   *
diff -c xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c:3.5
*** xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c:1.1.1.1	Mon Jan 30 17:37:03 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c	Mon Jan 30 17:37:03 1995
***************
*** 1,5 ****
  /* $XConsortium: CirrusClk.c,v 1.4 95/01/27 14:46:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c,v 3.4 1995/01/15 10:33:34 dawes Exp $ */
  
  /*
   * Programming of the built-in Cirrus clock generator.
--- 1,5 ----
  /* $XConsortium: CirrusClk.c,v 1.4 95/01/27 14:46:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c,v 3.5 1995/01/28 15:58:08 dawes Exp $ */
  
  /*
   * Programming of the built-in Cirrus clock generator.
diff -c xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h:3.1
*** xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h:1.1.1.1	Mon Jan 30 17:37:03 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h	Mon Jan 30 17:37:03 1995
***************
*** 1,5 ****
  /* $XConsortium: CirrusClk.h,v 1.2 95/01/27 14:46:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h,v 3.0 1994/10/20 06:09:42 dawes Exp $ */
  
  int CirrusFindClock( 
  #if NeedFunctionPrototypes
--- 1,5 ----
  /* $XConsortium: CirrusClk.h,v 1.2 95/01/27 14:46:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h,v 3.1 1995/01/28 15:58:09 dawes Exp $ */
  
  int CirrusFindClock( 
  #if NeedFunctionPrototypes
diff -c xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c:3.4
*** xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c:1.1.1.2	Mon Jan 30 17:37:03 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c	Mon Jan 30 17:37:04 1995
***************
*** 1,5 ****
  /* $XConsortium: I2061Aalt.c,v 1.1 95/01/26 15:25:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c,v 3.3 1995/01/20 04:21:16 dawes Exp $ */
  
  /*
   * This code is derived from code available from the STB bulletin board
--- 1,5 ----
  /* $XConsortium: I2061Aalt.c,v 1.1 95/01/26 15:25:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c,v 3.4 1995/01/28 15:58:11 dawes Exp $ */
  
  /*
   * This code is derived from code available from the STB bulletin board
diff -c xc/programs/Xserver/hw/xfree86/common_hw/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/common_hw/Imakefile:3.9
*** xc/programs/Xserver/hw/xfree86/common_hw/Imakefile:1.1.1.2	Mon Jan 30 17:37:05 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/Imakefile	Mon Jan 30 17:37:05 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.6 95/01/26 15:36:36 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Imakefile,v 3.7 1995/01/26 02:18:59 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = I2061Acal.c I2061Aset.c I2061Aalt.c xf86_ClkPr.c BUSmemcpy.s \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.6 95/01/26 15:36:36 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Imakefile,v 3.9 1995/01/28 17:03:52 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = I2061Acal.c I2061Aset.c I2061Aalt.c xf86_ClkPr.c BUSmemcpy.s \
diff -c xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c:3.3
*** xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c:1.1.1.2	Mon Jan 30 17:37:06 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c	Mon Jan 30 17:37:06 1995
***************
*** 1,5 ****
  /* $XConsortium: SC11412.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c,v 3.1 1994/11/05 23:44:05 dawes Exp $ */
  
  /* Norbert Distler ndistler@physik.tu-muenchen.de  */
  
--- 1,5 ----
  /* $XConsortium: SC11412.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c,v 3.3 1995/01/28 17:03:54 dawes Exp $ */
  
  /* Norbert Distler ndistler@physik.tu-muenchen.de  */
  
diff -c xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c:3.5
*** xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c:1.1.1.2	Mon Jan 30 17:37:07 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c	Mon Jan 30 17:37:07 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_ClkPr.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c,v 3.3 1994/11/26 12:45:59 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: xf86_ClkPr.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c,v 3.5 1995/01/28 17:03:55 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h:3.9
*** xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h:1.1.1.2	Mon Jan 30 17:37:08 1995
--- xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h	Mon Jan 30 17:37:08 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_HWlib.h,v 1.5 95/01/23 15:34:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h,v 3.7 1995/01/21 14:07:59 dawes Exp $ */
  /*
   * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: xf86_HWlib.h,v 1.5 95/01/23 15:34:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h,v 3.9 1995/01/28 17:03:57 dawes Exp $ */
  /*
   * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/doc/AccelCards:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/AccelCards:3.3
*** xc/programs/Xserver/hw/xfree86/doc/AccelCards:1.1.1.1	Mon Jan 30 17:37:12 1995
--- xc/programs/Xserver/hw/xfree86/doc/AccelCards	Mon Jan 30 17:37:12 1995
***************
*** 1692,1695 ****
  
  
  $XConsortium: AccelCards,v 1.2 94/11/21 21:48:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/AccelCards,v 3.2 1994/09/26 15:32:54 dawes Exp $
--- 1692,1695 ----
  
  
  $XConsortium: AccelCards,v 1.2 94/11/21 21:48:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/AccelCards,v 3.3 1995/01/28 15:58:25 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT:3.6
*** xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT:1.1.1.1	Mon Jan 30 17:37:13 1995
--- xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT	Mon Jan 30 17:37:13 1995
***************
*** 32,38 ****
    written authorization from the XFree86 Project.
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.2 1995/01/08 07:00:02 dawes Exp $
  
  
  
--- 32,39 ----
    written authorization from the XFree86 Project.
  
  
!   $XConsortium: CPYRIGHT.sgml,v 1.2 95/01/16 13:17:39 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.3 1995/01/28 16:01:20 dawes Exp $
  
  
  
***************
*** 64,68 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT,v 3.5 1995/01/15 10:58:08 dawes Exp $
--- 65,68 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/COPYRIGHT,v 3.6 1995/01/28 16:19:27 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/Devices:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Devices:3.8
*** xc/programs/Xserver/hw/xfree86/doc/Devices:1.1.1.1	Mon Jan 30 17:37:13 1995
--- xc/programs/Xserver/hw/xfree86/doc/Devices	Mon Jan 30 17:37:14 1995
***************
*** 607,611 ****
  EndSection
  
  
! # $XFree86: xc/programs/Xserver/hw/xfree86/doc/Devices,v 3.7 1995/01/22 03:06:13 dawes Exp $
  $XConsortium: Devices,v 1.6 95/01/23 15:34:12 kaleb Exp $
--- 607,611 ----
  EndSection
  
  
! # $XFree86: xc/programs/Xserver/hw/xfree86/doc/Devices,v 3.8 1995/01/28 15:58:29 dawes Exp $
  $XConsortium: Devices,v 1.6 95/01/23 15:34:12 kaleb Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/INSTALL:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/INSTALL:3.12
*** xc/programs/Xserver/hw/xfree86/doc/INSTALL:1.1.1.1	Mon Jan 30 17:37:14 1995
--- xc/programs/Xserver/hw/xfree86/doc/INSTALL	Mon Jan 30 17:37:14 1995
***************
*** 220,226 ****
       5. If you want to be able to format the XFree86 documentation
          (which is now in LinuxDoc/SGML form), you will need to get and
          install linuxdoc-sgml-1.1.tar.gz plus the patches which can be
!         found on ftp.xfree86.org:/pub/XFree86/3.1.1/LinuxDoc
          (ftp://ftp.xfree86.org/pub/XFree86/3.1.1/Linuxdoc).  Check in
          the xf86site.def file and uncomment the appropriate Linuxdoc
          options.
--- 220,226 ----
       5. If you want to be able to format the XFree86 documentation
          (which is now in LinuxDoc/SGML form), you will need to get and
          install linuxdoc-sgml-1.1.tar.gz plus the patches which can be
!         found on ftp.xfree86.org:/pub/XFree86/3.1.1/Linuxdoc
          (ftp://ftp.xfree86.org/pub/XFree86/3.1.1/Linuxdoc).  Check in
          the xf86site.def file and uncomment the appropriate Linuxdoc
          options.
***************
*** 311,317 ****
    For details of how to do this, please refer to the README.LinkKit
    (LinkKit.html) file.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml,v 3.5 1995/01/25 11:51:33 dawes Exp $
  
  
  
--- 311,318 ----
    For details of how to do this, please refer to the README.LinkKit
    (LinkKit.html) file.
  
!   $XConsortium: INSTALL.sgml,v 1.4 95/01/27 16:14:24 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml,v 3.7 1995/01/30 03:37:10 dawes Exp $
  
  
  
***************
*** 328,333 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/INSTALL,v 3.9 1995/01/25 11:55:16 dawes Exp $
! $XConsortium: INSTALL,v 1.7 95/01/27 15:58:06 kaleb Exp $
--- 329,332 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/INSTALL,v 3.12 1995/01/30 03:40:06 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.14
*** xc/programs/Xserver/hw/xfree86/doc/Imakefile:1.1.1.1	Mon Jan 30 17:37:15 1995
--- xc/programs/Xserver/hw/xfree86/doc/Imakefile	Mon Jan 30 17:37:15 1995
***************
*** 1,10 ****
  XCOMM $XConsortium: Imakefile,v 1.6 95/01/23 15:34:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.13 1995/01/19 05:21:11 dawes Exp $
  
  #include <Server.tmpl>
- #if 0
  #include <lnxdoc.rules>
- #endif
  
  #if HasLinuxDoc || InstallJapaneseDocs
  #define IHaveSubdirs
--- 1,8 ----
  XCOMM $XConsortium: Imakefile,v 1.6 95/01/23 15:34:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.14 1995/01/28 15:58:34 dawes Exp $
  
  #include <Server.tmpl>
  #include <lnxdoc.rules>
  
  #if HasLinuxDoc || InstallJapaneseDocs
  #define IHaveSubdirs
***************
*** 17,23 ****
  #if InstallJapaneseDocs
  JAPANESEDIR = Japanese
  #endif
- 
  
  SUBDIRS = $(SGMLDIR) $(JAPANESEDIR)
  
--- 15,20 ----
diff -c xc/programs/Xserver/hw/xfree86/doc/Monitors:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Monitors:3.8
*** xc/programs/Xserver/hw/xfree86/doc/Monitors:1.1.1.1	Mon Jan 30 17:37:16 1995
--- xc/programs/Xserver/hw/xfree86/doc/Monitors	Mon Jan 30 17:37:16 1995
***************
*** 998,1002 ****
      ModeLine "640x480"  28  640  664  728  792 480 484 490 505
  EndSection
  
! # $XFree86: xc/programs/Xserver/hw/xfree86/doc/Monitors,v 3.7 1995/01/25 10:49:48 dawes Exp $
  # $XConsortium: Monitors,v 1.7 95/01/27 15:58:08 kaleb Exp $
--- 998,1002 ----
      ModeLine "640x480"  28  640  664  728  792 480 484 490 505
  EndSection
  
! # $XFree86: xc/programs/Xserver/hw/xfree86/doc/Monitors,v 3.8 1995/01/28 15:58:36 dawes Exp $
  # $XConsortium: Monitors,v 1.7 95/01/27 15:58:08 kaleb Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD:3.12
*** xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD:1.1.1.1	Mon Jan 30 17:37:17 1995
--- xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD	Mon Jan 30 17:37:17 1995
***************
*** 90,96 ****
             1-bit monochrome for VGA, Super-VGA, Hercules, and others.
  
  
!         X311P900.tgz
             8, 16, and 24-bit color for Weitek P9000 boards (Diamond
             Viper).
  
--- 90,96 ----
             1-bit monochrome for VGA, Super-VGA, Hercules, and others.
  
  
!         X311P9K.tgz
             8, 16, and 24-bit color for Weitek P9000 boards (Diamond
             Viper).
  
***************
*** 609,615 ****
       o  Orest Zborowski, Simon Cooper and Dirk Hohndel for ideas from
          the Linux distribution.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.8 1995/01/21 10:44:19 dawes Exp $
  
  
  
--- 609,616 ----
       o  Orest Zborowski, Simon Cooper and Dirk Hohndel for ideas from
          the Linux distribution.
  
!   $XConsortium: FreeBSD.sgml,v 1.3 95/01/23 15:34:41 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.10 1995/01/28 16:01:28 dawes Exp $
  
  
  
***************
*** 658,663 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD,v 3.10 1995/01/21 11:10:01 dawes Exp $
! $XConsortium: READ.FreeBSD,v 1.6 95/01/23 15:34:17 kaleb Exp $
--- 659,662 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/READ.FreeBSD,v 3.12 1995/01/28 16:19:37 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README:3.25
*** xc/programs/Xserver/hw/xfree86/doc/README:1.1.1.1	Mon Jan 30 17:37:18 1995
--- xc/programs/Xserver/hw/xfree86/doc/README	Mon Jan 30 17:37:19 1995
***************
*** 997,1003 ****
    archive, and which compile-time option selections were made when
    building the distribution.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.16 1995/01/25 11:51:37 dawes Exp $
  
  
  
--- 997,1004 ----
    archive, and which compile-time option selections were made when
    building the distribution.
  
!   $XConsortium: README.sgml,v 1.4 95/01/27 16:14:29 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.17 1995/01/28 16:02:13 dawes Exp $
  
  
  
***************
*** 1054,1059 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.23 1995/01/25 11:55:20 dawes Exp $
! $XConsortium: README,v 1.8 95/01/27 15:58:22 kaleb Exp $
--- 1055,1058 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.25 1995/01/28 16:19:43 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Bsdi:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Bsdi:3.12
*** xc/programs/Xserver/hw/xfree86/doc/README.Bsdi:1.1.1.1	Mon Jan 30 17:37:19 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Bsdi	Mon Jan 30 17:37:19 1995
***************
*** 1,6 ****
    README for XFree86 3.1.1 on BSD/386 1.1
    Hans Nasten
!   21 January 1995
  
    1.  What and Where is XFree86?
  
--- 1,6 ----
    README for XFree86 3.1.1 on BSD/386 1.1
    Hans Nasten
!   27 January 1995
  
    1.  What and Where is XFree86?
  
***************
*** 41,51 ****
  
    3.  Installing the Binaries
  
!   The binary distribution is composed of a number of tar archives which
!   contains the executables, servers, fonts, libraries, include files,
!   man pages, config files, and the server link kit. All tar archives
!   should be extracted as root with / as the default directory. The full
!   distribution takes over 40MB of disk space.
  
    Note that many clients were moved from the X11R6 distribution to the
    `contrib' area. However, they are still distributed with the XFree86
--- 41,52 ----
  
    3.  Installing the Binaries
  
!   The binary distribution is composed of a number of gzipped tar
!   archives which contains the executables, servers, fonts, libraries,
!   include files, man pages, config files, and the server link kit. All
!   tar archives should be extracted as root with / as the default
!   directory. The full distribution takes over 40MB of disk space.  The
!   file names are converted to be compatible with CD-rom conventions.
  
    Note that many clients were moved from the X11R6 distribution to the
    `contrib' area. However, they are still distributed with the XFree86
***************
*** 55,120 ****
  
       REQUIRED:
  
!         xf86-doc.tar.gz
             READMEs and XFree86 specific man pages.
  
!         xf86-bin.tar.gz
             all of the executable X client applications.
  
!         xf86-fonts.tar.gz
             all fonts
! 
!         xf86-lib.tar.gz
             data files needed at runtime
  
       Choose at least one of the following to match your hardware:
  
!         XF86_SVGA.gz
             the 8-bit pseudo-color X server for Super VGA cards
  
!         XF86_VGA16.gz
             the 4-bit pseudo-color X server for VGA & SVGA cards.
  
!         XF86_Mono.gz
             the Monochrome X Server
  
!         XF86_8514.gz
             the X server for IBM 8514/A and compatible boards
  
!         XF86_AGX.gz
             the X server for AGX boards
  
!         XF86_Mach8.gz
             the X server for ATI Mach8 boards
  
!         XF86_Mach32.gz
             the X server for ATI Mach32 boards
  
!         XF86_Mach64.gz
             the X server for ATI Mach64 boards
  
!         XF86_P9000.gz
             the X server for P9000 based boards
  
!         XF86_S3.gz
             the X server for S3 based boards
  
!         XF86_W32.gz
             the X server for ET4000/W32 based boards
  
       OPTIONAL:
  
!         xf86-fs.tar.gz
             the font server with man pages.
  
!         xf86-prog.tar.gz
             the include/X11 header files and static libraries needed only
             for compiling other X applications
  
!         xf86-man.tar.gz
             all man pages
  
!         xf86-linkkit.tar.gz
             the server reconfiguration kit.
  
    If this is your first time, then you should be able to safely install
--- 56,120 ----
  
       REQUIRED:
  
!         X311doc.tgz
             READMEs and XFree86 specific man pages.
  
!         X311bin.tgz
             all of the executable X client applications.
  
!         X311fnts.tgz
             all fonts
!         X311lib.tgz
             data files needed at runtime
  
       Choose at least one of the following to match your hardware:
  
!         X311SVGA.tgz
             the 8-bit pseudo-color X server for Super VGA cards
  
!         X311VG16.tgz
             the 4-bit pseudo-color X server for VGA & SVGA cards.
  
!         X311Mono.tgz
             the Monochrome X Server
  
!         X3118514.tgz
             the X server for IBM 8514/A and compatible boards
  
!         X311AGX.tgz
             the X server for AGX boards
  
!         X311Ma8.tgz
             the X server for ATI Mach8 boards
  
!         X311Ma32.tgz
             the X server for ATI Mach32 boards
  
!         X311Ma64.tgz
             the X server for ATI Mach64 boards
  
!         X311P9K.tgz
             the X server for P9000 based boards
  
!         X311S3.tgz
             the X server for S3 based boards
  
!         X311W32.tgz
             the X server for ET4000/W32 based boards
  
       OPTIONAL:
  
!         X311fsrv.tgz
             the font server with man pages.
  
!         X311prog.tgz
             the include/X11 header files and static libraries needed only
             for compiling other X applications
  
!         X311man.tgz
             all man pages
  
!         X311link.tgz
             the server reconfiguration kit.
  
    If this is your first time, then you should be able to safely install
***************
*** 349,356 ****
      #endif
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml,v 3.7 1995/01/22 03:06:27 dawes Exp $
! 
  
  
  
--- 349,356 ----
      #endif
  
  
!   $XConsortium: Bsdi.sgml,v 1.3 95/01/23 15:34:39 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml,v 3.9 1995/01/28 16:01:18 dawes Exp $
  
  
  
***************
*** 395,399 ****
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Bsdi,v 3.10 1995/01/22 03:19:24 dawes Exp $
! $XConsortium: README.Bsdi,v 1.7 95/01/23 15:34:21 kaleb Exp $
--- 395,398 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Bsdi,v 3.12 1995/01/28 16:19:47 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Config:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Config:3.9
*** xc/programs/Xserver/hw/xfree86/doc/README.Config:1.1.1.1	Mon Jan 30 17:37:21 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Config	Mon Jan 30 17:37:21 1995
***************
*** 526,532 ****
  
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml,v 3.4 1995/01/21 07:16:30 dawes Exp $
  
  
  
--- 526,533 ----
  
  
  
!   $XConsortium: Config.sgml,v 1.3 95/01/23 15:34:40 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml,v 3.5 1995/01/28 16:01:22 dawes Exp $
  
  
  
***************
*** 592,597 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Config,v 3.7 1995/01/21 11:10:08 dawes Exp $
! $XConsortium: README.Config,v 1.6 95/01/23 15:34:23 kaleb Exp $
--- 593,596 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Config,v 3.9 1995/01/28 16:19:53 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Linux:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Linux:3.9
*** xc/programs/Xserver/hw/xfree86/doc/README.Linux:1.1.1.1	Mon Jan 30 17:37:22 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Linux	Mon Jan 30 17:37:22 1995
***************
*** 172,178 ****
    comp.windows.x.i386unix newsgroup. Questions or comments about Linux
    support or the Linux distribution should be made to orestz@eskimo.com.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml,v 3.4 1995/01/23 01:30:03 dawes Exp $
  
  
  
--- 172,179 ----
    comp.windows.x.i386unix newsgroup. Questions or comments about Linux
    support or the Linux distribution should be made to orestz@eskimo.com.
  
!   $XConsortium: Linux.sgml,v 1.2 95/01/23 15:34:44 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml,v 3.5 1995/01/28 16:01:43 dawes Exp $
  
  
  
***************
*** 196,201 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Linux,v 3.7 1995/01/23 02:01:21 dawes Exp $
! $XConsortium: README.Linux,v 1.7 95/01/23 15:34:24 kaleb Exp $
--- 197,200 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Linux,v 3.9 1995/01/28 16:19:58 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Mach:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Mach:3.8
*** xc/programs/Xserver/hw/xfree86/doc/README.Mach:1.1.1.1	Mon Jan 30 17:37:22 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Mach	Mon Jan 30 17:37:22 1995
***************
*** 190,201 ****
    necessary for Mach is that the X servers be able to open /dev/iopl for
    read/write.  There are many ways to achieve this effect.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml,v 3.3 1995/01/25 11:08:48 dawes Exp $
  
  
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Mach,v 3.6 1995/01/25 11:15:40 dawes Exp $
! $XConsortium: README.Mach,v 1.7 95/01/27 15:58:09 kaleb Exp $
--- 190,200 ----
    necessary for Mach is that the X servers be able to open /dev/iopl for
    read/write.  There are many ways to achieve this effect.
  
!   $XConsortium: Mach.sgml,v 1.3 95/01/27 16:14:25 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml,v 3.4 1995/01/28 16:01:49 dawes Exp $
  
  
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Mach,v 3.8 1995/01/28 16:20:01 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.17
*** xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:1.1.1.1	Mon Jan 30 17:37:23 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.NetBSD	Mon Jan 30 17:37:23 1995
***************
*** 111,117 ****
          X311mc64
             the X server for ATI Mach64 graphics boards
  
!         X311p900
             the X server for P9000 based boards
  
          X311s3
--- 111,117 ----
          X311mc64
             the X server for ATI Mach64 graphics boards
  
!         X311p9k
             the X server for P9000 based boards
  
          X311s3
***************
*** 679,685 ****
       o  Rod Grimes and Jack Velte of Walnut Creek Cdrom for use of their
          machines in preparing the FreeBSD binary release.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.8 1995/01/27 10:31:27 dawes Exp $
  
  
  
--- 679,686 ----
       o  Rod Grimes and Jack Velte of Walnut Creek Cdrom for use of their
          machines in preparing the FreeBSD binary release.
  
!   $XConsortium: NetBSD.sgml,v 1.4 95/01/27 16:14:26 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.10 1995/01/28 16:01:56 dawes Exp $
  
  
  
***************
*** 724,729 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.15 1995/01/27 10:56:33 dawes Exp $
! $XConsortium: README.NetBSD,v 1.8 95/01/27 15:58:11 kaleb Exp $
--- 725,728 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.17 1995/01/28 16:20:04 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Oak:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Oak:3.3
*** xc/programs/Xserver/hw/xfree86/doc/README.Oak:1.1.1.1	Mon Jan 30 17:37:24 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Oak	Mon Jan 30 17:37:24 1995
***************
*** 107,113 ****
  
    GOOD LUCK!!!!
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml,v 3.2 1995/01/21 07:16:36 dawes Exp $
  
  
  
--- 107,114 ----
  
    GOOD LUCK!!!!
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml,v 3.3 1995/01/28 16:02:01 dawes Exp $
!   $XConsortium: Oak.sgml,v 1.1 95/01/23 15:05:36 kaleb Exp $
  
  
  
***************
*** 130,135 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Oak,v 3.1 1995/01/21 11:10:15 dawes Exp $
! $XConsortium: README.Oak,v 1.1 95/01/23 15:04:38 kaleb Exp $
--- 131,134 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Oak,v 3.3 1995/01/28 16:20:08 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.P9000:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.P9000:3.18
*** xc/programs/Xserver/hw/xfree86/doc/README.P9000:1.1.1.1	Mon Jan 30 17:37:25 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.P9000	Mon Jan 30 17:37:25 1995
***************
*** 1,10 ****
    XFree86 3.1.1 P9000 Server Release Notes
    Erik Nygren (nygren@mit.edu)
!   1995 January 15
  
    1.  Change Log
  
  
       1995.01.15:
  
          o  Fixed problem with line capping in accelerated line drawing.
--- 1,15 ----
    XFree86 3.1.1 P9000 Server Release Notes
    Erik Nygren (nygren@mit.edu)
!   1995 January 29
  
    1.  Change Log
  
  
+      1995.01.29:
+ 
+         o  Updated P9000.sgml to mention using Robin's scanpci rather
+            than PCIDUMP.EXE.
+ 
       1995.01.15:
  
          o  Fixed problem with line capping in accelerated line drawing.
***************
*** 179,196 ****
  
    This should now work, thanks to help from Bob Hollinger and Matt
    Thomas.  You may to specify the chipset "viperpci" in your XF86Config
!   file.  You'll also need to specify an IOBase and a MemBase.  You can
!   obtain these values with PCIDUMP.EXE.  This program may be obtained by
!   sending email to xserver@summit.novell.com with the two lines:
!   send
!   *p9k
! 
!   You should run this program and change these values after you add more
!   PCI cards or move existing cards to different slots.  According to
!   David DeWolfe (SXDJD@orca.alaska.edu), you need to run PCIDUMP.EXE
!   after a clean boot to DOS (with no AUTOEXEC.BAT or CONFIG.SYS).  This
!   may be accomplished by holding down the SHIFT key while DOS is boot-
!   ing.
  
    Eventually we would like to autodetect the IOBase and memBase, but
    this doesn't yet work.
--- 184,212 ----
  
    This should now work, thanks to help from Bob Hollinger and Matt
    Thomas.  You may to specify the chipset "viperpci" in your XF86Config
!   file.  You'll also need to specify an IOBase and a memBase.  These
!   values may be obtained by running the scanpci program available via
!   anonymous ftp from ftp.xfree86.org:/pub/XFree86/3.1.1/ScanPCI
!   (ftp://ftp.xfree86.org/pub/XFree86/3.1.1/ScanPCI) Part of the output
!   of this program will look like:
! 
! 
! 
! 
! 
! 
! 
!   pci slot at 0xce00, vendor 0x100e device 0x9001
!    Diamond Viper/PCI
!     STATUS    0x0400  COMMAND 0x0003
!     CLASS     0x03 0x00 0x00  REVISION 0x03
!     BASE0     0xa0000000  addr 0xa0000000  MEM
!     BASE1     0x0000e001  addr 0x0000e000  I/O
!     BASEROM   0xff800000  addr 0xff800000  not-decode-enabled
! 
! 
!   In this case, you would specify 0xe000 as the IOBase and 0xa0000000 as
!   the memBase.
  
    Eventually we would like to autodetect the IOBase and memBase, but
    this doesn't yet work.
***************
*** 312,318 ****
  
    The current supported keywords in the Device section of the XF86Config
    file are:
- 
       VideoRAM
          1024 or 2048  (use 2048 for ``3MB'' Orchid P9000's)
  
--- 328,333 ----
***************
*** 328,333 ****
--- 343,349 ----
          Orchid P9000:
             0xC0000000 or 0xD0000000 or 0xE0000000 (this MUST be set to
             correspond to the jumpers)
+ 
          Viper PCI:
             any value corresponding to the output of PCIDUMP.EXE
  
***************
*** 378,399 ****
          24 or 32:
             use 32 bits per pixel (sparse 24 bpp) for up to 16 million
             colors
- 
       Weight
          555 or 565 if Depth is 15 or 16.  Otherwise this is ignored.
          These are the Red, Green, and Blue bits per pixel (default=565)
  
    Here's a portion of a sample XF86Config file for the Viper VLB:
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
    Section "Device"
        Identifier "ViperVLB"
        VendorName "Diamond"
--- 394,404 ----
***************
*** 455,465 ****
  
    During the course of the next few months, people will be working on
    acceleration, etc.  Please send any patches to me (nygren@mit.edu).
  
-   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml,v 3.7 1995/01/25 11:08:51 dawes Exp $
  
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.P9000,v 3.15 1995/01/25 11:15:45 dawes Exp $
! $XConsortium: README.P9000,v 1.7 95/01/27 15:58:13 kaleb Exp $
--- 460,530 ----
  
    During the course of the next few months, people will be working on
    acceleration, etc.  Please send any patches to me (nygren@mit.edu).
+   $XConsortium: P9000.sgml,v 1.4 95/01/27 16:14:28 kaleb Exp $
+   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml,v 3.9 1995/01/29 10:45:34 dawes Exp $
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.P9000,v 3.18 1995/01/29 10:47:43 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.S3:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.S3:3.22
*** xc/programs/Xserver/hw/xfree86/doc/README.S3:1.1.1.1	Mon Jan 30 17:37:26 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.S3	Mon Jan 30 17:37:26 1995
***************
*** 510,517 ****
    ______________________________________________________________________
  
  
  
-   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml,v 3.11 1995/01/26 02:19:15 dawes Exp $
  
  
  
--- 510,518 ----
    ______________________________________________________________________
  
  
+   $XConsortium: S3.sgml,v 1.6 95/01/27 16:14:30 kaleb Exp $
+   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml,v 3.12 1995/01/28 16:02:17 dawes Exp $
  
  
  
  
***************
*** 526,531 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.S3,v 3.20 1995/01/26 04:28:10 dawes Exp $
! $XConsortium: README.S3,v 1.8 95/01/27 15:58:15 kaleb Exp $
--- 527,530 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.S3,v 3.22 1995/01/28 16:20:16 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.SCO:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.SCO:3.10
*** xc/programs/Xserver/hw/xfree86/doc/README.SCO:1.1.1.1	Mon Jan 30 17:37:27 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.SCO	Mon Jan 30 17:37:27 1995
***************
*** 679,685 ****
    an ftp site for the binary distribution.
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.5 1995/01/25 11:08:52 dawes Exp $
  
  
  
--- 679,686 ----
    an ftp site for the binary distribution.
  
  
!   $XConsortium: SCO.sgml,v 1.4 95/01/27 16:14:31 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.6 1995/01/28 16:02:21 dawes Exp $
  
  
  
***************
*** 724,729 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SCO,v 3.8 1995/01/25 11:15:50 dawes Exp $
! $XConsortium: README.SCO,v 1.8 95/01/27 15:58:16 kaleb Exp $
--- 725,728 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SCO,v 3.10 1995/01/28 16:20:22 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.SOLX86:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.SOLX86:3.6
*** xc/programs/Xserver/hw/xfree86/doc/README.SOLX86:1.1.1.1	Mon Jan 30 17:37:28 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.SOLX86	Mon Jan 30 17:37:28 1995
***************
*** 328,334 ****
  
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml,v 3.2 1995/01/15 10:34:23 dawes Exp $
  
  
  
--- 328,335 ----
  
  
  
!   $XConsortium: SOLX86.sgml,v 1.2 95/01/16 13:17:48 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml,v 3.3 1995/01/28 16:02:26 dawes Exp $
  
  
  
***************
*** 394,399 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SOLX86,v 3.4 1995/01/15 10:58:55 dawes Exp $
! $XConsortium: README.SOLX86,v 1.5 95/01/16 13:17:24 kaleb Exp $
--- 395,398 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SOLX86,v 3.6 1995/01/28 16:20:25 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.SVR4:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.SVR4:3.7
*** xc/programs/Xserver/hw/xfree86/doc/README.SVR4:1.1.1.1	Mon Jan 30 17:37:29 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.SVR4	Mon Jan 30 17:37:29 1995
***************
*** 447,453 ****
    information.
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml,v 3.2 1995/01/15 10:34:24 dawes Exp $
  
  
  
--- 447,454 ----
    information.
  
  
!   $XConsortium: SVR4.sgml,v 1.2 95/01/16 13:17:49 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml,v 3.3 1995/01/28 16:02:30 dawes Exp $
  
  
  
***************
*** 460,465 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SVR4,v 3.5 1995/01/15 10:58:59 dawes Exp $
! $XConsortium: README.SVR4,v 1.6 95/01/16 13:17:25 kaleb Exp $
--- 461,464 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SVR4,v 3.7 1995/01/28 16:20:30 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.Video7:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.Video7:3.6
*** xc/programs/Xserver/hw/xfree86/doc/README.Video7:1.1.1.1	Mon Jan 30 17:37:29 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.Video7	Mon Jan 30 17:37:29 1995
***************
*** 128,136 ****
  
  
  
-   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml,v 3.1 1994/12/26 11:03:40 dawes Exp $
  
  
  
  
  
--- 128,137 ----
  
  
  
  
  
+   $XConsortium: Video7.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
+   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml,v 3.2 1995/01/28 16:02:44 dawes Exp $
  
  
  
***************
*** 196,201 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Video7,v 3.4 1995/01/15 10:59:01 dawes Exp $
! $XConsortium: README.Video7,v 1.5 95/01/16 13:17:26 kaleb Exp $
--- 197,200 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Video7,v 3.6 1995/01/28 16:20:34 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.W32:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.W32:3.9
*** xc/programs/Xserver/hw/xfree86/doc/README.W32:1.1.1.1	Mon Jan 30 17:37:30 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.W32	Mon Jan 30 17:37:30 1995
***************
*** 88,94 ****
          ljo@ljo-slip.DIALIN.CWRU.Edu (L Jonas Olsson)
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml,v 3.2 1995/01/20 05:21:46 dawes Exp $
  
  
  
--- 88,95 ----
          ljo@ljo-slip.DIALIN.CWRU.Edu (L Jonas Olsson)
  
  
!   $XConsortium: W32.sgml,v 1.2 95/01/23 15:34:55 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml,v 3.3 1995/01/28 16:02:47 dawes Exp $
  
  
  
***************
*** 130,135 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.W32,v 3.7 1995/01/20 06:21:56 dawes Exp $
! $XConsortium: README.W32,v 1.7 95/01/23 15:34:32 kaleb Exp $
--- 131,134 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.W32,v 3.9 1995/01/28 16:20:36 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.WstDig:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.WstDig:3.7
*** xc/programs/Xserver/hw/xfree86/doc/README.WstDig:1.1.1.1	Mon Jan 30 17:37:30 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.WstDig	Mon Jan 30 17:37:30 1995
***************
*** 49,55 ****
    clocks detected by the server show a very low last clock (under
    28Mhz), then this option is likely needed.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml,v 3.1 1995/01/11 09:47:54 dawes Exp $
  
  
  
--- 49,56 ----
    clocks detected by the server show a very low last clock (under
    28Mhz), then this option is likely needed.
  
!   $XConsortium: WstDig.sgml,v 1.2 95/01/16 13:17:51 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml,v 3.2 1995/01/28 16:02:50 dawes Exp $
  
  
  
***************
*** 64,69 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.WstDig,v 3.5 1995/01/15 10:59:05 dawes Exp $
! $XConsortium: README.WstDig,v 1.5 95/01/16 13:17:27 kaleb Exp $
--- 65,68 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.WstDig,v 3.7 1995/01/28 16:20:38 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.agx:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.agx:3.19
*** xc/programs/Xserver/hw/xfree86/doc/README.agx:1.1.1.1	Mon Jan 30 17:37:31 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.agx	Mon Jan 30 17:37:31 1995
***************
*** 512,519 ****
    XGA-2.
  
  
  
-   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml,v 3.6 1995/01/25 11:08:57 dawes Exp $
  
  
  
--- 512,520 ----
    XGA-2.
  
  
+   $XConsortium: agx.sgml,v 1.4 95/01/27 16:14:35 kaleb Exp $
+   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml,v 3.7 1995/01/28 16:02:54 dawes Exp $
  
  
  
  
***************
*** 526,531 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.agx,v 3.17 1995/01/25 11:15:54 dawes Exp $
! $XConsortium: README.agx,v 1.8 95/01/27 15:58:18 kaleb Exp $
--- 527,530 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.agx,v 3.19 1995/01/28 16:20:42 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.ati:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.ati:3.11
*** xc/programs/Xserver/hw/xfree86/doc/README.ati:1.1.1.1	Mon Jan 30 17:37:32 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.ati	Mon Jan 30 17:37:32 1995
***************
*** 1,4 ****
- $XConsortium: README.ati,v 1.6 95/01/16 13:17:29 kaleb Exp $
    ATI boards README
    Marc Aurele La France
    1 January 1995
--- 1,3 ----
***************
*** 255,261 ****
    France, tsi@ualberta.ca
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.2 1995/01/04 04:40:33 dawes Exp $
  
  
  
--- 254,261 ----
    France, tsi@ualberta.ca
  
  
!   $XConsortium: ati.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.3 1995/01/28 16:02:58 dawes Exp $
  
  
  
***************
*** 263,268 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.9 1995/01/15 10:59:15 dawes Exp $
! $XConsortium: README.ati,v 1.6 95/01/16 13:17:29 kaleb Exp $
--- 263,266 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.11 1995/01/28 16:20:47 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.cirrus:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.cirrus:3.16
*** xc/programs/Xserver/hw/xfree86/doc/README.cirrus:1.1.1.1	Mon Jan 30 17:37:33 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.cirrus	Mon Jan 30 17:37:34 1995
***************
*** 679,685 ****
  
       o  Support for the CL6440 in the ``cl64xx'' driver.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml,v 3.8 1995/01/27 04:51:53 dawes Exp $
  
  
  
--- 679,686 ----
  
       o  Support for the CL6440 in the ``cl64xx'' driver.
  
!   $XConsortium: cirrus.sgml,v 1.4 95/01/27 16:14:36 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml,v 3.9 1995/01/28 16:03:03 dawes Exp $
  
  
  
***************
*** 724,729 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cirrus,v 3.14 1995/01/27 10:30:37 dawes Exp $
! $XConsortium: README.cirrus,v 1.8 95/01/27 15:58:20 kaleb Exp $
--- 725,728 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cirrus,v 3.16 1995/01/28 16:20:51 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.clkprog:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.clkprog:3.7
*** xc/programs/Xserver/hw/xfree86/doc/README.clkprog:1.1.1.1	Mon Jan 30 17:37:34 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.clkprog	Mon Jan 30 17:37:34 1995
***************
*** 72,78 ****
    The idea of using an external clock program was suggested by Frank
    Klemm <pfk@rz.uni-jena.de>
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml,v 3.1 1995/01/04 04:40:36 dawes Exp $
  
  
  
--- 72,79 ----
    The idea of using an external clock program was suggested by Frank
    Klemm <pfk@rz.uni-jena.de>
  
!   $XConsortium: clkprog.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml,v 3.2 1995/01/28 16:03:06 dawes Exp $
  
  
  
***************
*** 130,135 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.clkprog,v 3.5 1995/01/15 10:59:23 dawes Exp $
! $XConsortium: README.clkprog,v 1.5 95/01/16 13:17:32 kaleb Exp $
--- 131,134 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.clkprog,v 3.7 1995/01/28 16:20:55 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.isc:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.isc:3.9
*** xc/programs/Xserver/hw/xfree86/doc/README.isc:1.1.1.1	Mon Jan 30 17:37:35 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.isc	Mon Jan 30 17:37:35 1995
***************
*** 351,357 ****
    to all who contribute to this excellent piece of free software.
  
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.3 1995/01/27 04:51:55 dawes Exp $
  
  
  
--- 351,358 ----
    to all who contribute to this excellent piece of free software.
  
  
!   $XConsortium: isc.sgml,v 1.2 95/01/27 16:14:38 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.4 1995/01/28 16:03:10 dawes Exp $
  
  
  
***************
*** 394,399 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.7 1995/01/27 10:30:40 dawes Exp $
! $XConsortium: README.isc,v 1.5 95/01/27 15:58:21 kaleb Exp $
--- 395,398 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.9 1995/01/28 16:20:58 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.trident:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.trident:3.7
*** xc/programs/Xserver/hw/xfree86/doc/README.trident:1.1.1.1	Mon Jan 30 17:37:36 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.trident	Mon Jan 30 17:37:36 1995
***************
*** 87,93 ****
    prepared for this phenomenon to occur, and have the board
    documentation handy.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.0 1994/12/20 11:33:47 dawes Exp $
  
  
  
--- 87,94 ----
    prepared for this phenomenon to occur, and have the board
    documentation handy.
  
!   $XConsortium: trident.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.1 1995/01/28 16:03:14 dawes Exp $
  
  
  
***************
*** 130,135 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.trident,v 3.5 1995/01/15 10:59:28 dawes Exp $
! $XConsortium: README.trident,v 1.5 95/01/16 13:17:33 kaleb Exp $
--- 131,134 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.trident,v 3.7 1995/01/28 16:21:01 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/README.tseng:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/README.tseng:3.8
*** xc/programs/Xserver/hw/xfree86/doc/README.tseng:1.1.1.1	Mon Jan 30 17:37:36 1995
--- xc/programs/Xserver/hw/xfree86/doc/README.tseng	Mon Jan 30 17:37:36 1995
***************
*** 49,55 ****
    default, hence the flag has been removed.  Hopefully the past text-
    restoration problems are alleviated in XFree86 2.0.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml,v 3.3 1995/01/21 10:44:40 dawes Exp $
  
  
  
--- 49,56 ----
    default, hence the flag has been removed.  Hopefully the past text-
    restoration problems are alleviated in XFree86 2.0.
  
!   $XConsortium: tseng.sgml,v 1.2 95/01/23 15:34:58 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml,v 3.4 1995/01/28 16:03:19 dawes Exp $
  
  
  
***************
*** 64,69 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.tseng,v 3.6 1995/01/21 11:10:28 dawes Exp $
! $XConsortium: README.tseng,v 1.6 95/01/23 15:34:35 kaleb Exp $
--- 65,68 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/README.tseng,v 3.8 1995/01/28 16:21:03 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/ServersOnly:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/ServersOnly:3.1
*** xc/programs/Xserver/hw/xfree86/doc/ServersOnly:1.1.1.1	Mon Jan 30 17:37:37 1995
--- xc/programs/Xserver/hw/xfree86/doc/ServersOnly	Mon Jan 30 17:37:37 1995
***************
*** 48,51 ****
  
  
  $XConsortium: ServersOnly,v 1.2 94/11/21 21:48:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/ServersOnly,v 3.0 1994/07/24 11:50:20 dawes Exp $
--- 48,51 ----
  
  
  $XConsortium: ServersOnly,v 1.2 94/11/21 21:48:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/ServersOnly,v 3.1 1995/01/28 15:59:43 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc:3.7
*** xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc:1.1.1.1	Mon Jan 30 17:37:38 1995
--- xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc	Mon Jan 30 17:37:39 1995
***************
*** 1229,1235 ****
    Finally, remember that increasing either frame length will decrease
    your refresh rate, and vice-versa.
  
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml,v 3.4 1995/01/25 11:08:55 dawes Exp $
  
  
  
--- 1229,1236 ----
    Finally, remember that increasing either frame length will decrease
    your refresh rate, and vice-versa.
  
!   $XConsortium: VidModes.sgml,v 1.3 95/01/27 16:14:33 kaleb Exp $
!   Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml,v 3.5 1995/01/28 16:02:40 dawes Exp $
  
  
  
***************
*** 1252,1257 ****
  
  
  
! 
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc,v 3.5 1995/01/25 11:16:01 dawes Exp $
! $XConsortium: VideoModes.doc,v 1.7 95/01/27 15:58:25 kaleb Exp $
--- 1253,1256 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoModes.doc,v 3.7 1995/01/28 16:21:12 dawes Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/modeDB.txt:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/modeDB.txt:3.5
*** xc/programs/Xserver/hw/xfree86/doc/modeDB.txt:1.1.1.1	Mon Jan 30 17:37:40 1995
--- xc/programs/Xserver/hw/xfree86/doc/modeDB.txt	Mon Jan 30 17:37:41 1995
***************
*** 1,5 ****
  #  $XConsortium: modeDB.txt,v 1.4 95/01/16 13:17:36 kaleb Exp $
! #  $XFree86: xc/programs/Xserver/hw/xfree86/doc/modeDB.txt,v 3.4 1995/01/10 10:26:11 dawes Exp $
  #
  # XFree86/X386 Mode database
  # Compiled by David Wexelblat [dwex@xfree86.org]
--- 1,5 ----
  #  $XConsortium: modeDB.txt,v 1.4 95/01/16 13:17:36 kaleb Exp $
! #  $XFree86: xc/programs/Xserver/hw/xfree86/doc/modeDB.txt,v 3.5 1995/01/28 16:00:12 dawes Exp $
  #
  # XFree86/X386 Mode database
  # Compiled by David Wexelblat [dwex@xfree86.org]
diff -c xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL:3.1
*** xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL:1.1.1.1	Mon Jan 30 17:37:43 1995
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL	Mon Jan 30 17:37:43 1995
***************
*** 292,296 ****
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL,v 3.0 1995/01/12 12:03:50 dawes Exp $
  $XConsortium: INSTALL,v 1.1 95/01/16 12:30:46 kaleb Exp $
--- 292,296 ----
  
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL,v 3.1 1995/01/28 16:00:38 dawes Exp $
  $XConsortium: INSTALL,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile:1.1.1.1	Mon Jan 30 17:37:43 1995
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile	Mon Jan 30 17:37:44 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/16 12:30:46 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.0 1995/01/12 12:03:51 dawes Exp $
  
  #include <Server.tmpl>
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/16 12:30:46 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.1 1995/01/28 16:00:43 dawes Exp $
  
  #include <Server.tmpl>
  
diff -c xc/programs/Xserver/hw/xfree86/doc/Japanese/README:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Japanese/README:3.1
*** xc/programs/Xserver/hw/xfree86/doc/Japanese/README:1.1.1.1	Mon Jan 30 17:37:44 1995
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/README	Mon Jan 30 17:37:44 1995
***************
*** 547,552 ****
  
  1994$@G/(J 10$@7n(J 2$@F|(J
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README,v 3.0 1995/01/12 12:03:53 dawes Exp $
  $XConsortium: README,v 1.1 95/01/16 12:30:46 kaleb Exp $
  
--- 547,552 ----
  
  1994$@G/(J 10$@7n(J 2$@F|(J
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README,v 3.1 1995/01/28 16:00:47 dawes Exp $
  $XConsortium: README,v 1.1 95/01/16 12:30:46 kaleb Exp $
  
diff -c xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config:3.1
*** xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config:1.1.1.1	Mon Jan 30 17:37:45 1995
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config	Mon Jan 30 17:37:45 1995
***************
*** 491,495 ****
   "1280x1024"  135     1280 1312 1456 1712   1024 1027 1030 1064
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config,v 3.0 1995/01/12 12:03:54 dawes Exp $
  $XConsortium: README.Config,v 1.1 95/01/16 12:30:46 kaleb Exp $
--- 491,495 ----
   "1280x1024"  135     1280 1312 1456 1712   1024 1027 1030 1064
  
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config,v 3.1 1995/01/28 16:00:53 dawes Exp $
  $XConsortium: README.Config,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff -c xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux:3.1
*** xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux:1.1.1.1	Mon Jan 30 17:37:46 1995
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux	Mon Jan 30 17:37:46 1995
***************
*** 180,185 ****
  $@%k!<%W$KEj9F$7$F2<$5$$!#(JLinux $@$N%5%]!<%H$d(J Linux $@$NG[IUJ*$K4X$9$k<ALd$d%3%a(J
  $@%s%H$O(J orestz@eskimo.com $@$G9T$J$o$l$F$$$^$9!#(J
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux,v 3.0 1995/01/12 12:03:55 dawes Exp $
  $XConsortium: README.Linux,v 1.1 95/01/16 12:30:46 kaleb Exp $
  
--- 180,185 ----
  $@%k!<%W$KEj9F$7$F2<$5$$!#(JLinux $@$N%5%]!<%H$d(J Linux $@$NG[IUJ*$K4X$9$k<ALd$d%3%a(J
  $@%s%H$O(J orestz@eskimo.com $@$G9T$J$o$l$F$$$^$9!#(J
  
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux,v 3.1 1995/01/28 16:00:58 dawes Exp $
  $XConsortium: README.Linux,v 1.1 95/01/16 12:30:46 kaleb Exp $
  
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml:3.9
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml:1.1.1.1	Mon Jan 30 17:37:50 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml	Mon Jan 30 17:37:51 1995
***************
*** 4,10 ****
   
  <title> README for XFree86 3.1.1 on BSD/386 1.1
  <author> Hans Nasten
! <date> 21 January 1995
  <toc>
  
  <sect> What and Where is XFree86? <p>
--- 4,10 ----
   
  <title> README for XFree86 3.1.1 on BSD/386 1.1
  <author> Hans Nasten
! <date> 27 January 1995
  <toc>
  
  <sect> What and Where is XFree86? <p>
***************
*** 44,55 ****
  if you have comments or suggestions about this file and we'll revise it.
  
  <sect> Installing the Binaries <p>
! The binary distribution is composed of a number of tar archives
  which contains the executables, servers, fonts, libraries, include files,
  man pages, config files, and the server link kit. All tar archives should
  be extracted as root with <tt>/</tt> as the default directory. The full
! distribution
! takes over 40MB of disk space.
  
  Note that many clients were moved from the X11R6 distribution to the
  `contrib' area. However, they are still distributed with the
--- 44,55 ----
  if you have comments or suggestions about this file and we'll revise it.
  
  <sect> Installing the Binaries <p>
! The binary distribution is composed of a number of gzipped tar archives
  which contains the executables, servers, fonts, libraries, include files,
  man pages, config files, and the server link kit. All tar archives should
  be extracted as root with <tt>/</tt> as the default directory. The full
! distribution takes over 40MB of disk space.
! The file names are converted to be compatible with CD-rom conventions.
  
  Note that many clients were moved from the X11R6 distribution to the
  `contrib' area. However, they are still distributed with the
***************
*** 59,91 ****
  <descrip>
  <tag>REQUIRED:</tag>
      <descrip>
!     <tag/xf86-doc.tar.gz/       READMEs and XFree86 specific man pages.
!     <tag/xf86-bin.tar.gz/       all of the executable X client applications.
!     <tag/xf86-fonts.tar.gz/     all fonts
!     <tag/xf86-lib.tar.gz/       data files needed at runtime
      </descrip>
  <tag>Choose at least one of the following to match your hardware:</tag>
      <descrip>
!     <tag/XF86_SVGA.gz/    the 8-bit pseudo-color X server for Super VGA cards
!     <tag/XF86_VGA16.gz/   the 4-bit pseudo-color X server for VGA &amp;
  			  SVGA cards.
!     <tag/XF86_Mono.gz/    the Monochrome X Server
!     <tag/XF86_8514.gz/    the X server for IBM 8514/A and compatible boards
!     <tag/XF86_AGX.gz/     the X server for AGX boards
!     <tag/XF86_Mach8.gz/   the X server for ATI Mach8 boards
!     <tag/XF86_Mach32.gz/  the X server for ATI Mach32 boards
!     <tag/XF86_Mach64.gz/  the X server for ATI Mach64 boards
!     <tag/XF86_P9000.gz/   the X server for P9000 based boards
!     <tag/XF86_S3.gz/      the X server for S3 based boards
!     <tag/XF86_W32.gz/     the X server for ET4000/W32 based boards
      </descrip>
  <tag/OPTIONAL:</tag>
      <descrip>
!     <tag/xf86-fs.tar.gz/        the font server with man pages.
!     <tag/xf86-prog.tar.gz/      the <tt>include/X11</tt> header files and
  	static libraries needed only for compiling other X applications
!     <tag/xf86-man.tar.gz/       all man pages
!     <tag/xf86-linkkit.tar.gz/   the server reconfiguration kit.
      </descrip>
  </descrip>
  If this is your first time, then you should be able to safely
--- 59,91 ----
  <descrip>
  <tag>REQUIRED:</tag>
      <descrip>
!     <tag/X311doc.tgz/     READMEs and XFree86 specific man pages.
!     <tag/X311bin.tgz/     all of the executable X client applications.
!     <tag/X311fnts.tgz/    all fonts
!     <tag/X311lib.tgz/     data files needed at runtime
      </descrip>
  <tag>Choose at least one of the following to match your hardware:</tag>
      <descrip>
!     <tag/X311SVGA.tgz/    the 8-bit pseudo-color X server for Super VGA cards
!     <tag/X311VG16.tgz/    the 4-bit pseudo-color X server for VGA &amp;
  			  SVGA cards.
!     <tag/X311Mono.tgz/    the Monochrome X Server
!     <tag/X3118514.tgz/    the X server for IBM 8514/A and compatible boards
!     <tag/X311AGX.tgz/     the X server for AGX boards
!     <tag/X311Ma8.tgz/     the X server for ATI Mach8 boards
!     <tag/X311Ma32.tgz/    the X server for ATI Mach32 boards
!     <tag/X311Ma64.tgz/    the X server for ATI Mach64 boards
!     <tag/X311P9K.tgz/     the X server for P9000 based boards
!     <tag/X311S3.tgz/      the X server for S3 based boards
!     <tag/X311W32.tgz/     the X server for ET4000/W32 based boards
      </descrip>
  <tag/OPTIONAL:</tag>
      <descrip>
!     <tag/X311fsrv.tgz/    the font server with man pages.
!     <tag/X311prog.tgz/    the <tt>include/X11</tt> header files and
  	static libraries needed only for compiling other X applications
!     <tag/X311man.tgz/     all man pages
!     <tag/X311link.tgz/    the server reconfiguration kit.
      </descrip>
  </descrip>
  If this is your first time, then you should be able to safely
***************
*** 310,316 ****
  
  <verb>
  $XConsortium: Bsdi.sgml,v 1.3 95/01/23 15:34:39 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml,v 3.7 1995/01/22 03:06:27 dawes Exp $
  </verb>
  
  </article>
--- 310,316 ----
  
  <verb>
  $XConsortium: Bsdi.sgml,v 1.3 95/01/23 15:34:39 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml,v 3.9 1995/01/28 16:01:18 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml:1.1.1.1	Mon Jan 30 17:37:51 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml	Mon Jan 30 17:37:51 1995
***************
*** 33,39 ****
  
  <verb>
  $XConsortium: CPYRIGHT.sgml,v 1.2 95/01/16 13:17:39 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.2 1995/01/08 07:00:02 dawes Exp $
  </verb>
  
  </article>
--- 33,39 ----
  
  <verb>
  $XConsortium: CPYRIGHT.sgml,v 1.2 95/01/16 13:17:39 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.3 1995/01/28 16:01:20 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml:3.5
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml:1.1.1.1	Mon Jan 30 17:37:52 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml	Mon Jan 30 17:37:52 1995
***************
*** 520,526 ****
  
  <verb>
  $XConsortium: Config.sgml,v 1.3 95/01/23 15:34:40 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml,v 3.4 1995/01/21 07:16:30 dawes Exp $
  </verb>
  
  </article>
--- 520,526 ----
  
  <verb>
  $XConsortium: Config.sgml,v 1.3 95/01/23 15:34:40 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml,v 3.5 1995/01/28 16:01:22 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml:3.2
*** xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml:1.1.1.1	Mon Jan 30 17:37:52 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml	Mon Jan 30 17:37:53 1995
***************
*** 69,75 ****
  </itemize>
  
  <verb>
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml,v 3.1 1995/01/25 11:08:44 dawes Exp $
  $XConsortium: DocIndex.sgml,v 1.2 95/01/27 16:14:23 kaleb Exp $
  </verb>
  
--- 69,75 ----
  </itemize>
  
  <verb>
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml,v 3.2 1995/01/28 16:01:25 dawes Exp $
  $XConsortium: DocIndex.sgml,v 1.2 95/01/27 16:14:23 kaleb Exp $
  </verb>
  
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:3.10
*** xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:1.1.1.1	Mon Jan 30 17:37:53 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml	Mon Jan 30 17:37:53 1995
***************
*** 90,96 ****
  <tag/X311Mono.tgz/
       1-bit monochrome for VGA, Super-VGA, Hercules, and others.
  
! <tag/X311P900.tgz/
       8, 16, and 24-bit color for Weitek P9000 boards (Diamond Viper).
  
  <tag/X311S3.tgz/
--- 90,96 ----
  <tag/X311Mono.tgz/
       1-bit monochrome for VGA, Super-VGA, Hercules, and others.
  
! <tag/X311P9K.tgz/
       8, 16, and 24-bit color for Weitek P9000 boards (Diamond Viper).
  
  <tag/X311S3.tgz/
***************
*** 564,577 ****
  <item> <bf/Amancio Hasty/ for 386BSD kernel and S3 chipset support.
  <item> <bf/David Greenman, Nate Williams, Jordan Hubbard/ for FreeBSD
         kernel support.  
! <item> <bf/Rod Grimes/, <bf/Jordan Hubbard/ and <bf/Jack Velte/ for 
         the use of Walnut Creek Cdrom's hardware. 
! <item> <bf/Orest Zborowski/, <bf/Simon Cooper/ and <bf/Dirk Hohndel/ for ideas from the Linux README.
  </itemize>
  
  <verb>
  $XConsortium: FreeBSD.sgml,v 1.3 95/01/23 15:34:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.8 1995/01/21 10:44:19 dawes Exp $
  </verb>
  
  </article>
--- 564,577 ----
  <item> <bf/Amancio Hasty/ for 386BSD kernel and S3 chipset support.
  <item> <bf/David Greenman, Nate Williams, Jordan Hubbard/ for FreeBSD
         kernel support.  
! <item> <bf/Rod Grimes/, <bf/Jordan Hubbard/ and <bf/Jack Velte/ for
         the use of Walnut Creek Cdrom's hardware. 
! <item> <bf/Orest Zborowski/, <bf/Simon Cooper/ and <bf/Dirk Hohndel/ for ideas from the Linux distribution.
  </itemize>
  
  <verb>
  $XConsortium: FreeBSD.sgml,v 1.3 95/01/23 15:34:41 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.10 1995/01/28 16:01:28 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml:3.7
*** xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml:1.1.1.1	Mon Jan 30 17:37:54 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml	Mon Jan 30 17:37:54 1995
***************
*** 206,212 ****
  <item> If you want to be able to format the XFree86 documentation
     (which is now in LinuxDoc/SGML form), you will need to get and install
     linuxdoc-sgml-1.1.tar.gz plus the patches which can be found on
!    <url name="ftp.xfree86.org:/pub/XFree86/3.1.1/LinuxDoc"
      url="ftp://ftp.xfree86.org/pub/XFree86/3.1.1/Linuxdoc">.  Check
     in the <tt/xf86site.def/ file and uncomment the appropriate Linuxdoc
     options.
--- 206,212 ----
  <item> If you want to be able to format the XFree86 documentation
     (which is now in LinuxDoc/SGML form), you will need to get and install
     linuxdoc-sgml-1.1.tar.gz plus the patches which can be found on
!    <url name="ftp.xfree86.org:/pub/XFree86/3.1.1/Linuxdoc"
      url="ftp://ftp.xfree86.org/pub/XFree86/3.1.1/Linuxdoc">.  Check
     in the <tt/xf86site.def/ file and uncomment the appropriate Linuxdoc
     options.
***************
*** 290,301 ****
  <p>
    If you have installed the server Binary LinkKit, it is possible to
  reconfigure the drivers and some of the extensions in the servers.  For
! details of how to do this, please refer to the <url url="LinKit.html"
  name="README.LinkKit"> file.
  
  <verb>
  $XConsortium: INSTALL.sgml,v 1.4 95/01/27 16:14:24 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml,v 3.5 1995/01/25 11:51:33 dawes Exp $
  </verb>
  
  </article>
--- 290,301 ----
  <p>
    If you have installed the server Binary LinkKit, it is possible to
  reconfigure the drivers and some of the extensions in the servers.  For
! details of how to do this, please refer to the <url url="LinkKit.html"
  name="README.LinkKit"> file.
  
  <verb>
  $XConsortium: INSTALL.sgml,v 1.4 95/01/27 16:14:24 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml,v 3.7 1995/01/30 03:37:10 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.5
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:1.1.1.1	Mon Jan 30 17:37:54 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile	Mon Jan 30 17:37:54 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/23 15:34:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.4 1995/01/19 05:22:47 dawes Exp $
  
  #include <Server.tmpl>
  #include <lnxdoc.rules>
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/23 15:34:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.5 1995/01/28 16:01:33 dawes Exp $
  
  #include <Server.tmpl>
  #include <lnxdoc.rules>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml:1.1.1.1	Mon Jan 30 17:37:55 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml	Mon Jan 30 17:37:55 1995
***************
*** 106,117 ****
  
  <item> It is possible to see which drivers are included in the Xserver by
     running it with the `<tt>-showconfig</tt>' flag.  To check which extensions
!    are included, start the Xserver wand run `<tt>xdpyinfo</tt>'.
  </enum>
  
  <verb>
  $XConsortium: LinkKit.sgml,v 1.2 95/01/16 13:17:43 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml,v 3.2 1995/01/14 10:47:43 dawes Exp $
  </verb>
  
  </article>
--- 106,117 ----
  
  <item> It is possible to see which drivers are included in the Xserver by
     running it with the `<tt>-showconfig</tt>' flag.  To check which extensions
!    are included, start the Xserver and run `<tt>xdpyinfo</tt>'.
  </enum>
  
  <verb>
  $XConsortium: LinkKit.sgml,v 1.2 95/01/16 13:17:43 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml,v 3.3 1995/01/28 16:01:36 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml:3.5
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml:1.1.1.1	Mon Jan 30 17:37:55 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml	Mon Jan 30 17:37:55 1995
***************
*** 176,182 ****
  
  <verb>
  $XConsortium: Linux.sgml,v 1.2 95/01/23 15:34:44 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml,v 3.4 1995/01/23 01:30:03 dawes Exp $
  </verb>
  
  </article>
--- 176,182 ----
  
  <verb>
  $XConsortium: Linux.sgml,v 1.2 95/01/23 15:34:44 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml,v 3.5 1995/01/28 16:01:43 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml:3.4
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml:1.1.1.1	Mon Jan 30 17:37:56 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml	Mon Jan 30 17:37:56 1995
***************
*** 172,178 ****
  
  <verb>
  $XConsortium: Mach.sgml,v 1.3 95/01/27 16:14:25 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml,v 3.3 1995/01/25 11:08:48 dawes Exp $
  </verb>
  
  </article>
--- 172,178 ----
  
  <verb>
  $XConsortium: Mach.sgml,v 1.3 95/01/27 16:14:25 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml,v 3.4 1995/01/28 16:01:49 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.10
*** xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:1.1.1.1	Mon Jan 30 17:37:57 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml	Mon Jan 30 17:37:57 1995
***************
*** 98,104 ****
      <tag/X311mc8/ the X server for ATI Mach8 graphics boards
      <tag/X311mc32/ the X server for ATI Mach32 graphics boards
      <tag/X311mc64/ the X server for ATI Mach64 graphics boards
!     <tag/X311p900/	the X server for P9000 based boards
      <tag/X311s3/ 	the X server for S3 based boards
      <tag/X311w32/	the X server for et4000w32 based boards
      </descrip>
--- 98,104 ----
      <tag/X311mc8/ the X server for ATI Mach8 graphics boards
      <tag/X311mc32/ the X server for ATI Mach32 graphics boards
      <tag/X311mc64/ the X server for ATI Mach64 graphics boards
!     <tag/X311p9k/	the X server for P9000 based boards
      <tag/X311s3/ 	the X server for S3 based boards
      <tag/X311w32/	the X server for et4000w32 based boards
      </descrip>
***************
*** 619,625 ****
  
  <verb>
  $XConsortium: NetBSD.sgml,v 1.4 95/01/27 16:14:26 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.8 1995/01/27 10:31:27 dawes Exp $
  </verb>
  
  </article>
--- 619,625 ----
  
  <verb>
  $XConsortium: NetBSD.sgml,v 1.4 95/01/27 16:14:26 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.10 1995/01/28 16:01:56 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml:1.1.1.1	Mon Jan 30 17:37:57 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml	Mon Jan 30 17:37:57 1995
***************
*** 119,125 ****
      GOOD LUCK!!!!
  
  <verb>
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml,v 3.2 1995/01/21 07:16:36 dawes Exp $
  $XConsortium: Oak.sgml,v 1.1 95/01/23 15:05:36 kaleb Exp $
  </verb>
  
--- 119,125 ----
      GOOD LUCK!!!!
  
  <verb>
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml,v 3.3 1995/01/28 16:02:01 dawes Exp $
  $XConsortium: Oak.sgml,v 1.1 95/01/23 15:05:36 kaleb Exp $
  </verb>
  
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml:3.9
*** xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml:1.1.1.1	Mon Jan 30 17:37:58 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml	Mon Jan 30 17:37:58 1995
***************
*** 4,14 ****
   
  <title> XFree86 3.1.1 P9000 Server Release Notes
  <author> Erik Nygren (<it>nygren@mit.edu</it>)
! <date> 1995 January 15
  <toc>
   
  <sect> Change Log <p>
  <descrip>
  <tag/1995.01.15:/
  	<itemize>
  	<item>
--- 4,20 ----
   
  <title> XFree86 3.1.1 P9000 Server Release Notes
  <author> Erik Nygren (<it>nygren@mit.edu</it>)
! <date> 1995 January 29
  <toc>
   
  <sect> Change Log <p>
  <descrip>
+ <tag/1995.01.29:/
+ 	<itemize>
+ 	<item>
+ 	  Updated P9000.sgml to mention using Robin's scanpci rather
+ 	  than PCIDUMP.EXE.
+ 	</itemize>
  <tag/1995.01.15:/
  	<itemize>
  	<item>
***************
*** 183,203 ****
  This should now work, thanks to help from Bob Hollinger and Matt Thomas.
  You may to specify the chipset <tt>"viperpci"</tt> in your <tt>XF86Config</tt>
  file.
! You'll also need to specify an <tt>IOBase</tt> and a <tt>MemBase</tt>.
! You can obtain these values with <tt>PCIDUMP.EXE</tt>.
! This program may be obtained
! by sending email to <it>xserver@summit.novell.com</it> with the two lines:
  <verb>
! send
! *p9k
  </verb>
! You should run this program and change these values after you
! add more PCI cards or move existing cards to different slots.
! According to David DeWolfe (<it>SXDJD@orca.alaska.edu</it>),
! you need to run <tt>PCIDUMP.EXE</tt> after a clean boot
! to DOS (with no <tt>AUTOEXEC.BAT</tt> or <tt>CONFIG.SYS</tt>).
! This may be accomplished by holding down the <tt>SHIFT</tt>
! key while <tt>DOS</tt> is booting.
  
  Eventually we would like to autodetect the <tt>IOBase</tt> and
  <tt>memBase</tt>, but this doesn't yet work.
--- 189,213 ----
  This should now work, thanks to help from Bob Hollinger and Matt Thomas.
  You may to specify the chipset <tt>"viperpci"</tt> in your <tt>XF86Config</tt>
  file.
! You'll also need to specify an <tt>IOBase</tt> and a <tt>memBase</tt>.
! These values may be obtained by running the <tt>scanpci</tt>
! program available
! via anonymous ftp from <url name="ftp.xfree86.org:/pub/XFree86/3.1.1/ScanPCI"
! url="ftp://ftp.xfree86.org/pub/XFree86/3.1.1/ScanPCI">
! Part of the output of this program will look like:
! 
  <verb>
! pci slot at 0xce00, vendor 0x100e device 0x9001
!  Diamond Viper/PCI
!   STATUS    0x0400  COMMAND 0x0003
!   CLASS     0x03 0x00 0x00  REVISION 0x03
!   BASE0     0xa0000000  addr 0xa0000000  MEM
!   BASE1     0x0000e001  addr 0x0000e000  I/O
!   BASEROM   0xff800000  addr 0xff800000  not-decode-enabled
  </verb>
! 
! In this case, you would specify <tt>0xe000</tt> as the <tt>IOBase</tt>
! and <tt>0xa0000000</tt> as the <tt>memBase</tt>.
  
  Eventually we would like to autodetect the <tt>IOBase</tt> and
  <tt>memBase</tt>, but this doesn't yet work.
***************
*** 415,421 ****
  
  <verb>
  $XConsortium: P9000.sgml,v 1.4 95/01/27 16:14:28 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml,v 3.7 1995/01/25 11:08:51 dawes Exp $
  </verb>
  
  </article>
--- 425,431 ----
  
  <verb>
  $XConsortium: P9000.sgml,v 1.4 95/01/27 16:14:28 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml,v 3.9 1995/01/29 10:45:34 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:3.17
*** xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:1.1.1.1	Mon Jan 30 17:37:59 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml	Mon Jan 30 17:37:59 1995
***************
*** 811,817 ****
  
  <verb>
  $XConsortium: README.sgml,v 1.4 95/01/27 16:14:29 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.16 1995/01/25 11:51:37 dawes Exp $
  </verb>
  
  </article>
--- 811,817 ----
  
  <verb>
  $XConsortium: README.sgml,v 1.4 95/01/27 16:14:29 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.17 1995/01/28 16:02:13 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml:3.12
*** xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml:1.1.1.1	Mon Jan 30 17:38:00 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml	Mon Jan 30 17:38:00 1995
***************
*** 485,491 ****
  
  <verb>
  $XConsortium: S3.sgml,v 1.6 95/01/27 16:14:30 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml,v 3.11 1995/01/26 02:19:15 dawes Exp $
  </verb>
  
  </article>
--- 485,491 ----
  
  <verb>
  $XConsortium: S3.sgml,v 1.6 95/01/27 16:14:30 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml,v 3.12 1995/01/28 16:02:17 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml:3.6
*** xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml:1.1.1.1	Mon Jan 30 17:38:01 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml	Mon Jan 30 17:38:01 1995
***************
*** 583,588 ****
  
  <verb>  
  $XConsortium: SCO.sgml,v 1.4 95/01/27 16:14:31 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.5 1995/01/25 11:08:52 dawes Exp $
  </verb>
  </article>
--- 583,588 ----
  
  <verb>  
  $XConsortium: SCO.sgml,v 1.4 95/01/27 16:14:31 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.6 1995/01/28 16:02:21 dawes Exp $
  </verb>
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml:1.1.1.1	Mon Jan 30 17:38:01 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml	Mon Jan 30 17:38:01 1995
***************
*** 297,302 ****
  
  <verb>
  $XConsortium: SOLX86.sgml,v 1.2 95/01/16 13:17:48 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml,v 3.2 1995/01/15 10:34:23 dawes Exp $
  </verb>
  </article>
--- 297,302 ----
  
  <verb>
  $XConsortium: SOLX86.sgml,v 1.2 95/01/16 13:17:48 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml,v 3.3 1995/01/28 16:02:26 dawes Exp $
  </verb>
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml:1.1.1.1	Mon Jan 30 17:38:02 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml	Mon Jan 30 17:38:02 1995
***************
*** 420,425 ****
  
  <verb>
  $XConsortium: SVR4.sgml,v 1.2 95/01/16 13:17:49 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml,v 3.2 1995/01/15 10:34:24 dawes Exp $
  </verb>
  </article>
--- 420,425 ----
  
  <verb>
  $XConsortium: SVR4.sgml,v 1.2 95/01/16 13:17:49 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml,v 3.3 1995/01/28 16:02:30 dawes Exp $
  </verb>
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml:3.5
*** xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml:1.1.1.1	Mon Jan 30 17:38:03 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml	Mon Jan 30 17:38:03 1995
***************
*** 904,910 ****
  
  <verb>
  $XConsortium: VGADriv.sgml,v 1.3 95/01/23 15:34:51 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml,v 3.4 1995/01/21 10:44:34 dawes Exp $
  </verb>
  
  </article>
--- 904,910 ----
  
  <verb>
  $XConsortium: VGADriv.sgml,v 1.3 95/01/23 15:34:51 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml,v 3.5 1995/01/28 16:02:34 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml:3.5
*** xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml:1.1.1.1	Mon Jan 30 17:38:04 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml	Mon Jan 30 17:38:04 1995
***************
*** 1147,1153 ****
  
  <verb>
  $XConsortium: VidModes.sgml,v 1.3 95/01/27 16:14:33 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml,v 3.4 1995/01/25 11:08:55 dawes Exp $
  </verb>
  
  </article>
--- 1147,1153 ----
  
  <verb>
  $XConsortium: VidModes.sgml,v 1.3 95/01/27 16:14:33 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml,v 3.5 1995/01/28 16:02:40 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml:3.2
*** xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml:1.1.1.1	Mon Jan 30 17:38:05 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml	Mon Jan 30 17:38:05 1995
***************
*** 97,102 ****
  
  <verb>
  $XConsortium: Video7.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml,v 3.1 1994/12/26 11:03:40 dawes Exp $
  </verb>
  </article>
--- 97,102 ----
  
  <verb>
  $XConsortium: Video7.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml,v 3.2 1995/01/28 16:02:44 dawes Exp $
  </verb>
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml:1.1.1.1	Mon Jan 30 17:38:05 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml	Mon Jan 30 17:38:05 1995
***************
*** 87,93 ****
  
  <verb>
  $XConsortium: W32.sgml,v 1.2 95/01/23 15:34:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml,v 3.2 1995/01/20 05:21:46 dawes Exp $
  </verb>
  
  </article>
--- 87,93 ----
  
  <verb>
  $XConsortium: W32.sgml,v 1.2 95/01/23 15:34:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml,v 3.3 1995/01/28 16:02:47 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml:3.2
*** xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml:1.1.1.1	Mon Jan 30 17:38:06 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml	Mon Jan 30 17:38:06 1995
***************
*** 54,60 ****
  
  <verb>
  $XConsortium: WstDig.sgml,v 1.2 95/01/16 13:17:51 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml,v 3.1 1995/01/11 09:47:54 dawes Exp $
  </verb>
  
  </article>
--- 54,60 ----
  
  <verb>
  $XConsortium: WstDig.sgml,v 1.2 95/01/16 13:17:51 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml,v 3.2 1995/01/28 16:02:50 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml:3.7
*** xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml:1.1.1.1	Mon Jan 30 17:38:06 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml	Mon Jan 30 17:38:06 1995
***************
*** 515,521 ****
  
  <verb>
  $XConsortium: agx.sgml,v 1.4 95/01/27 16:14:35 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml,v 3.6 1995/01/25 11:08:57 dawes Exp $
  </verb>
  
  </article>
--- 515,521 ----
  
  <verb>
  $XConsortium: agx.sgml,v 1.4 95/01/27 16:14:35 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml,v 3.7 1995/01/28 16:02:54 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:3.3
*** xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:1.1.1.1	Mon Jan 30 17:38:07 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml	Mon Jan 30 17:38:07 1995
***************
*** 245,251 ****
  
  <verb>
  $XConsortium: ati.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.2 1995/01/04 04:40:33 dawes Exp $
  </verb>
  
  </article>
--- 245,251 ----
  
  <verb>
  $XConsortium: ati.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.3 1995/01/28 16:02:58 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml:3.9
*** xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml:1.1.1.1	Mon Jan 30 17:38:08 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml	Mon Jan 30 17:38:08 1995
***************
*** 668,680 ****
  <item>	  Scrolling/text/fill acceleration at 16/32bpp.
  <item>	  Support for programmable clocks.
  <item>	  Support for Memory-Mapped I/O on 543x.
! <item>    Support for dot clocks up to 110 MHz on the 5434.
! <item>    Support for the CL6440 in the ``cl64xx'' driver.
  </itemize>
  
  <verb>
  $XConsortium: cirrus.sgml,v 1.4 95/01/27 16:14:36 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml,v 3.8 1995/01/27 04:51:53 dawes Exp $
  </verb>
  
  </article>
--- 668,680 ----
  <item>	  Scrolling/text/fill acceleration at 16/32bpp.
  <item>	  Support for programmable clocks.
  <item>	  Support for Memory-Mapped I/O on 543x.
! <item>	  Support for dot clocks up to 110 MHz on the 5434.
! <item>	  Support for the CL6440 in the ``cl64xx'' driver.
  </itemize>
  
  <verb>
  $XConsortium: cirrus.sgml,v 1.4 95/01/27 16:14:36 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml,v 3.9 1995/01/28 16:03:03 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml:3.2
*** xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml:1.1.1.1	Mon Jan 30 17:38:08 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml	Mon Jan 30 17:38:08 1995
***************
*** 74,80 ****
  
  <verb>
  $XConsortium: clkprog.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml,v 3.1 1995/01/04 04:40:36 dawes Exp $
  </verb>
  
  </article>
--- 74,80 ----
  
  <verb>
  $XConsortium: clkprog.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml,v 3.2 1995/01/28 16:03:06 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml:3.4
*** xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml:1.1.1.1	Mon Jan 30 17:38:09 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml	Mon Jan 30 17:38:09 1995
***************
*** 325,331 ****
  
  <verb>
  $XConsortium: isc.sgml,v 1.2 95/01/27 16:14:38 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.3 1995/01/27 04:51:55 dawes Exp $
  </verb>
  
  </article>
--- 325,331 ----
  
  <verb>
  $XConsortium: isc.sgml,v 1.2 95/01/27 16:14:38 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.4 1995/01/28 16:03:10 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:3.1
*** xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:1.1.1.1	Mon Jan 30 17:38:09 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml	Mon Jan 30 17:38:09 1995
***************
*** 88,94 ****
  
  <verb>
  $XConsortium: trident.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.0 1994/12/20 11:33:47 dawes Exp $
  </verb>
  
  </article>
--- 88,94 ----
  
  <verb>
  $XConsortium: trident.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.1 1995/01/28 16:03:14 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml:1.1.1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml:3.4
*** xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml:1.1.1.1	Mon Jan 30 17:38:10 1995
--- xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml	Mon Jan 30 17:38:10 1995
***************
*** 55,61 ****
  
  <verb>
  $XConsortium: tseng.sgml,v 1.2 95/01/23 15:34:58 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml,v 3.3 1995/01/21 10:44:40 dawes Exp $
  </verb>
  
  </article>
--- 55,61 ----
  
  <verb>
  $XConsortium: tseng.sgml,v 1.2 95/01/23 15:34:58 kaleb Exp $
! $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml,v 3.4 1995/01/28 16:03:19 dawes Exp $
  </verb>
  
  </article>
diff -c xc/programs/Xserver/hw/xfree86/etc/2key.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/2key.c:3.2
*** xc/programs/Xserver/hw/xfree86/etc/2key.c:1.1.1.1	Mon Jan 30 17:38:12 1995
--- xc/programs/Xserver/hw/xfree86/etc/2key.c	Mon Jan 30 17:38:12 1995
***************
*** 1,5 ****
  /*
!  * $XFree86: xc/programs/Xserver/hw/xfree86/etc/2key.c,v 3.1 1994/09/23 10:18:23 dawes Exp $
   * $XConsortium: 2key.c,v 1.1 95/01/25 23:45:59 kaleb Exp $
   *
   * Enable/disable the 2-key VT switching sequences for Esix SVR4
--- 1,5 ----
  /*
!  * $XFree86: xc/programs/Xserver/hw/xfree86/etc/2key.c,v 3.2 1995/01/28 16:03:47 dawes Exp $
   * $XConsortium: 2key.c,v 1.1 95/01/25 23:45:59 kaleb Exp $
   *
   * Enable/disable the 2-key VT switching sequences for Esix SVR4
diff -c xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4:3.1
*** xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4:1.1.1.1	Mon Jan 30 17:38:13 1995
--- xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4	Mon Jan 30 17:38:13 1995
***************
*** 6,12 ****
  # made 06/05/1994 05:08 UTC by root@gamma
  # Source directory /home5/x/XdmConf.svr4
  #
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4,v 3.0 1994/06/05 05:56:57 dawes Exp $
  #
  # existing files will NOT be overwritten unless -c is specified
  #
--- 6,12 ----
  # made 06/05/1994 05:08 UTC by root@gamma
  # Source directory /home5/x/XdmConf.svr4
  #
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/XdmConf.svr4,v 3.1 1995/01/28 16:03:51 dawes Exp $
  #
  # existing files will NOT be overwritten unless -c is specified
  #
diff -c xc/programs/Xserver/hw/xfree86/etc/console.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/console.h:3.1
*** xc/programs/Xserver/hw/xfree86/etc/console.h:1.1.1.1	Mon Jan 30 17:38:17 1995
--- xc/programs/Xserver/hw/xfree86/etc/console.h	Mon Jan 30 17:38:17 1995
***************
*** 18,24 ****
   *	$Id: console.h,v 1.3 95/01/13 19:47:45 kaleb Exp $
   */
  
! /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/console.h,v 3.0 1994/06/05 05:57:01 dawes Exp $ */
  
  #ifndef	_CONSOLE_H_
  #define	_CONSOLE_H_
--- 18,24 ----
   *	$Id: console.h,v 1.3 95/01/13 19:47:45 kaleb Exp $
   */
  
! /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/console.h,v 3.1 1995/01/28 16:03:54 dawes Exp $ */
  
  #ifndef	_CONSOLE_H_
  #define	_CONSOLE_H_
diff -c xc/programs/Xserver/hw/xfree86/etc/install.sv3:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/install.sv3:3.2
*** xc/programs/Xserver/hw/xfree86/etc/install.sv3:1.1.1.1	Mon Jan 30 17:38:18 1995
--- xc/programs/Xserver/hw/xfree86/etc/install.sv3	Mon Jan 30 17:38:18 1995
***************
*** 28,34 ****
  # (michael.rohleder%iktffm.uucp@Germany.EU.net)
  
  # $XConsortium: install.sv3,v 1.1 95/01/26 15:25:15 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv3,v 3.1 1995/01/11 03:51:22 dawes Exp $
  
  #
  # XFree86 version
--- 28,34 ----
  # (michael.rohleder%iktffm.uucp@Germany.EU.net)
  
  # $XConsortium: install.sv3,v 1.1 95/01/26 15:25:15 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv3,v 3.2 1995/01/28 16:03:57 dawes Exp $
  
  #
  # XFree86 version
diff -c xc/programs/Xserver/hw/xfree86/etc/install.sv4:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/install.sv4:3.1
*** xc/programs/Xserver/hw/xfree86/etc/install.sv4:1.1.1.1	Mon Jan 30 17:38:18 1995
--- xc/programs/Xserver/hw/xfree86/etc/install.sv4	Mon Jan 30 17:38:18 1995
***************
*** 24,30 ****
  #
  
  # $XConsortium: install.sv4,v 1.1 95/01/26 15:25:15 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv4,v 3.0 1994/06/05 05:57:05 dawes Exp $
  
  #
  # install addtional termcap & terminfo entries
--- 24,30 ----
  #
  
  # $XConsortium: install.sv4,v 1.1 95/01/26 15:25:15 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv4,v 3.1 1995/01/28 16:03:59 dawes Exp $
  
  #
  # install addtional termcap & terminfo entries
diff -c xc/programs/Xserver/hw/xfree86/etc/sun.tcap:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/sun.tcap:3.1
*** xc/programs/Xserver/hw/xfree86/etc/sun.tcap:1.1.1.1	Mon Jan 30 17:38:24 1995
--- xc/programs/Xserver/hw/xfree86/etc/sun.tcap	Mon Jan 30 17:38:24 1995
***************
*** 1,5 ****
  # $XConsortium: sun.tcap,v 1.1 95/01/26 15:24:23 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tcap,v 3.0 1994/06/05 05:57:20 dawes Exp $
  #
  Mu|sun|Sun Microsystems Workstation console:\
          :am:bs:km:mi:ms:pt:li#34:co#80:cl=^L:cm=\E[%i%d;%dH:\
--- 1,5 ----
  # $XConsortium: sun.tcap,v 1.1 95/01/26 15:24:23 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tcap,v 3.1 1995/01/28 16:04:03 dawes Exp $
  #
  Mu|sun|Sun Microsystems Workstation console:\
          :am:bs:km:mi:ms:pt:li#34:co#80:cl=^L:cm=\E[%i%d;%dH:\
diff -c xc/programs/Xserver/hw/xfree86/etc/sun.tinfo:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/sun.tinfo:3.1
*** xc/programs/Xserver/hw/xfree86/etc/sun.tinfo:1.1.1.1	Mon Jan 30 17:38:25 1995
--- xc/programs/Xserver/hw/xfree86/etc/sun.tinfo	Mon Jan 30 17:38:25 1995
***************
*** 1,5 ****
  # $XConsortium: sun.tinfo,v 1.1 95/01/26 15:24:23 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tinfo,v 3.0 1994/06/05 05:57:21 dawes Exp $
  #
  sun|Sun Microsystems Workstation console,
  	am, km, mir, msgr, xon,
--- 1,5 ----
  # $XConsortium: sun.tinfo,v 1.1 95/01/26 15:24:23 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tinfo,v 3.1 1995/01/28 16:04:07 dawes Exp $
  #
  sun|Sun Microsystems Workstation console,
  	am, km, mir, msgr, xon,
diff -c xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch:3.1
*** xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch:1.1.1.1	Mon Jan 30 17:38:26 1995
--- xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch	Mon Jan 30 17:38:26 1995
***************
*** 2,8 ****
  ######################################################################
  #
  # $XConsortium: svr3_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch,v 3.0 1994/06/05 05:57:24 dawes Exp $
  #
  # Back out the patch to kernel that prevents losing IOPL on signals.
  #
--- 2,8 ----
  ######################################################################
  #
  # $XConsortium: svr3_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch,v 3.1 1995/01/28 16:04:10 dawes Exp $
  #
  # Back out the patch to kernel that prevents losing IOPL on signals.
  #
diff -c xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch:1.1.1.1 xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch:3.1
*** xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch:1.1.1.1	Mon Jan 30 17:38:27 1995
--- xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch	Mon Jan 30 17:38:27 1995
***************
*** 2,8 ****
  ######################################################################
  #
  # $XConsortium: svr4_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch,v 3.0 1994/06/05 05:57:26 dawes Exp $
  #
  # Back out the patch to kernel that prevents losing IOPL on signals.
  #
--- 2,8 ----
  ######################################################################
  #
  # $XConsortium: svr4_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch,v 3.1 1995/01/28 16:04:12 dawes Exp $
  #
  # Back out the patch to kernel that prevents losing IOPL on signals.
  #
diff -c xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info:1.1.1.1 xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info:3.1
*** xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info:1.1.1.1	Mon Jan 30 17:38:41 1995
--- xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info	Mon Jan 30 17:38:41 1995
***************
*** 85,89 ****
  57,60,63 - not writable, zero (?)
  61	- fixed 85 (?)
  
! $XFree86: xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info,v 3.0 1994/05/04 15:01:08 dawes Exp $
  $XConsortium: HGC1280.info,v 1.1 95/01/25 23:44:47 kaleb Exp $
--- 85,89 ----
  57,60,63 - not writable, zero (?)
  61	- fixed 85 (?)
  
! $XFree86: xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info,v 3.1 1995/01/28 16:04:31 dawes Exp $
  $XConsortium: HGC1280.info,v 1.1 95/01/25 23:44:47 kaleb Exp $
diff -c xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile:1.1.1.1	Mon Jan 30 17:38:46 1995
--- xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile	Mon Jan 30 17:38:46 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:40:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile,v 3.0 1994/05/04 15:01:28 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:40:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/mono/mfb.banked/Imakefile,v 3.1 1995/01/28 16:04:47 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
diff -c xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile:1.1.1.1	Mon Jan 30 17:38:48 1995
--- xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile	Mon Jan 30 17:38:48 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:40:30 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile,v 3.0 1994/05/04 15:01:38 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mono.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:40:30 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/mono/mono/Imakefile,v 3.1 1995/01/28 16:04:56 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	mono.c
diff -c xc/programs/Xserver/hw/xfree86/os-support/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/Imakefile:3.5
*** xc/programs/Xserver/hw/xfree86/os-support/Imakefile:1.1.1.2	Mon Jan 30 17:38:52 1995
--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile	Mon Jan 30 17:38:52 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:43:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.3 1994/06/05 13:46:28 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:43:43 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.5 1995/01/28 17:04:13 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
diff -c xc/programs/Xserver/hw/xfree86/os-support/assyntax.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/assyntax.h:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/assyntax.h:1.1.1.2	Mon Jan 30 17:38:53 1995
--- xc/programs/Xserver/hw/xfree86/os-support/assyntax.h	Mon Jan 30 17:38:53 1995
***************
*** 1,5 ****
  /* $XConsortium: assyntax.h,v 1.2 95/01/05 20:43:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.0 1994/10/21 11:23:25 dawes Exp $ */
  #ifndef __ASSYNTAX_H__
  #define	__ASSYNTAX_H__
  
--- 1,5 ----
  /* $XConsortium: assyntax.h,v 1.2 95/01/05 20:43:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.2 1995/01/28 17:04:14 dawes Exp $ */
  #ifndef __ASSYNTAX_H__
  #define	__ASSYNTAX_H__
  
diff -c xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:3.14
*** xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:1.1.1.2	Mon Jan 30 17:38:54 1995
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	Mon Jan 30 17:38:54 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_OSlib.h,v 1.7 95/01/16 13:17:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.12 1995/01/10 10:27:30 dawes Exp $ */
  /*
   * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1992 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: xf86_OSlib.h,v 1.7 95/01/16 13:17:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.14 1995/01/28 17:04:16 dawes Exp $ */
  /*
   * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1992 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c:1.1.1.2	Mon Jan 30 17:38:55 1995
--- xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c	Mon Jan 30 17:38:55 1995
***************
*** 1,5 ****
  /* $XConsortium: am_init.c,v 1.3 95/01/05 20:41:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c,v 3.1 1994/10/23 12:59:40 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: am_init.c,v 1.3 95/01/05 20:41:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c,v 3.3 1995/01/28 17:04:20 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:1.1.1.2	Mon Jan 30 17:38:56 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile	Mon Jan 30 17:38:56 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.1 1994/12/10 02:14:51 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c bios_devmem.c mapVT_noop.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.3 1995/01/28 17:04:23 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c bios_devmem.c mapVT_noop.c \
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.1.1.2	Mon Jan 30 17:38:57 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c	Mon Jan 30 17:38:57 1995
***************
*** 1,5 ****
  /* $XConsortium: bsd_VTsw.c,v 1.2 95/01/16 13:17:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.1 1995/01/10 11:14:09 dawes Exp $ */
  /*
   * Derived from VTsw_usl.c which is
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bsd_VTsw.c,v 1.2 95/01/16 13:17:56 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.3 1995/01/28 17:04:24 dawes Exp $ */
  /*
   * Derived from VTsw_usl.c which is
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c:3.4
*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c:1.1.1.2	Mon Jan 30 17:38:57 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c	Mon Jan 30 17:38:57 1995
***************
*** 1,5 ****
  /* $XConsortium: bsd_init.c,v 1.4 95/01/16 13:17:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.2 1995/01/10 10:28:45 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bsd_init.c,v 1.4 95/01/16 13:17:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.4 1995/01/28 17:04:25 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c:3.4
*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c:1.1.1.2	Mon Jan 30 17:38:58 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c	Mon Jan 30 17:38:58 1995
***************
*** 1,5 ****
  /* $XConsortium: bsd_io.c,v 1.3 95/01/16 13:17:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.2 1995/01/10 10:28:47 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: bsd_io.c,v 1.3 95/01/16 13:17:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.4 1995/01/28 17:04:27 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c:3.5
*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c:1.1.1.2	Mon Jan 30 17:38:58 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c	Mon Jan 30 17:38:58 1995
***************
*** 1,5 ****
  /* $XConsortium: bsd_video.c,v 1.2 94/10/12 20:45:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c,v 3.3 1994/09/07 15:54:02 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bsd_video.c,v 1.2 94/10/12 20:45:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c,v 3.5 1995/01/28 17:04:28 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c:1.1.1.2	Mon Jan 30 17:39:00 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c	Mon Jan 30 17:39:00 1995
***************
*** 1,5 ****
  /* $XConsortium: bsdi_init.c,v 1.2 94/10/12 20:46:00 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c,v 3.0 1994/09/23 10:24:39 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bsdi_init.c,v 1.2 94/10/12 20:46:00 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c,v 3.2 1995/01/28 17:04:32 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c:1.1.1.2	Mon Jan 30 17:39:00 1995
--- xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c	Mon Jan 30 17:39:00 1995
***************
*** 1,5 ****
  /* $XConsortium: bsdi_video.c,v 1.2 95/01/05 20:42:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v 3.0 1994/10/29 22:40:34 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bsdi_video.c,v 1.2 95/01/05 20:42:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v 3.2 1995/01/28 17:04:33 dawes Exp $ */
  /*
   * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c:1.1.1.2	Mon Jan 30 17:39:01 1995
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	Mon Jan 30 17:39:01 1995
***************
*** 1,5 ****
  /* $XConsortium: lnx_init.c,v 1.2 94/10/12 20:46:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.0 1994/09/23 10:24:43 dawes Exp $ */
  /*
   * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: lnx_init.c,v 1.2 94/10/12 20:46:43 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.2 1995/01/28 17:04:37 dawes Exp $ */
  /*
   * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c:1.1.1.2	Mon Jan 30 17:39:03 1995
--- xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c	Mon Jan 30 17:39:03 1995
***************
*** 1,5 ****
  /* $XConsortium: bios_mmap.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c,v 3.0 1994/06/05 05:58:08 dawes Exp $ */
  /*
   * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: bios_mmap.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c,v 3.2 1995/01/28 17:04:40 dawes Exp $ */
  /*
   * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c:1.1.1.2	Mon Jan 30 17:39:03 1995
--- xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c	Mon Jan 30 17:39:03 1995
***************
*** 1,5 ****
  /* $XConsortium: mach_init.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c,v 3.0 1994/09/23 10:25:01 dawes Exp $ */
  /*
   * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: mach_init.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c,v 3.2 1995/01/28 17:04:41 dawes Exp $ */
  /*
   * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:1.1.1.2	Mon Jan 30 17:39:05 1995
--- xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile	Mon Jan 30 17:39:05 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:47:58 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile,v 3.0 1994/05/08 05:23:44 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mnx_init.c mnx_video.c mnx_io.c bios_devmem.c mapVT_noop.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:47:58 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile,v 3.2 1995/01/28 17:04:45 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mnx_init.c mnx_video.c mnx_io.c bios_devmem.c mapVT_noop.c \
diff -c xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c:1.1.1.2	Mon Jan 30 17:39:06 1995
--- xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c	Mon Jan 30 17:39:06 1995
***************
*** 1,5 ****
  /* $XConsortium: mnx_init.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c,v 3.1 1994/09/23 10:25:09 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: mnx_init.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c,v 3.3 1995/01/28 17:04:46 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c:1.1.1.2	Mon Jan 30 17:39:06 1995
--- xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c	Mon Jan 30 17:39:06 1995
***************
*** 1,5 ****
  /* $XConsortium: mnx_io.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c,v 3.0 1994/05/08 05:23:49 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: mnx_io.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c,v 3.2 1995/01/28 17:04:47 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c:1.1.1.2	Mon Jan 30 17:39:07 1995
--- xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c	Mon Jan 30 17:39:07 1995
***************
*** 1,5 ****
  /* $XConsortium: mnx_video.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c,v 3.0 1994/05/08 05:23:51 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: mnx_video.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c,v 3.2 1995/01/28 17:04:49 dawes Exp $ */
  /*
   * Copyright 1993 by Vrije Universiteit, The Netherlands
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c:1.1.1.2	Mon Jan 30 17:39:08 1995
--- xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c	Mon Jan 30 17:39:08 1995
***************
*** 1,5 ****
  /* $XConsortium: xf86_IlHack.c,v 1.2 94/10/12 20:48:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.0 1994/07/24 11:51:47 dawes Exp $ */
  /*
   * This file is an incredible crock to get the normally-inline functions
   * built into the server so that things can be debugged properly.
--- 1,5 ----
  /* $XConsortium: xf86_IlHack.c,v 1.2 94/10/12 20:48:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.2 1995/01/28 17:04:53 dawes Exp $ */
  /*
   * This file is an incredible crock to get the normally-inline functions
   * built into the server so that things can be debugged properly.
diff -c xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c:3.4
*** xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c:1.1.1.2	Mon Jan 30 17:39:09 1995
--- xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c	Mon Jan 30 17:39:09 1995
***************
*** 1,5 ****
  /* $XConsortium: sco_init.c,v 1.3 95/01/05 20:42:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.2 1994/11/19 13:56:23 dawes Exp $ */
  /*
   * Copyright 1993 by David McCullough <davidm@stallion.oz.au>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: sco_init.c,v 1.3 95/01/05 20:42:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.4 1995/01/28 17:04:56 dawes Exp $ */
  /*
   * Copyright 1993 by David McCullough <davidm@stallion.oz.au>
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c:1.1.1.2	Mon Jan 30 17:39:10 1995
--- xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c	Mon Jan 30 17:39:10 1995
***************
*** 1,5 ****
  /* $XConsortium: sco_mouse.c,v 1.2 94/10/12 20:49:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.1 1994/09/23 10:25:16 dawes Exp $ */
  
  /******************************************************************************/
  
--- 1,5 ----
  /* $XConsortium: sco_mouse.c,v 1.2 94/10/12 20:49:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.3 1995/01/28 17:04:58 dawes Exp $ */
  
  /******************************************************************************/
  
diff -c xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s:1.1.1.2	Mon Jan 30 17:39:11 1995
--- xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s	Mon Jan 30 17:39:11 1995
***************
*** 1,5 ****
  /* $XConsortium: inout.s,v 1.3 94/10/12 20:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.0 1994/08/31 04:40:50 dawes Exp $ */
  
  #include "assyntax.h"
  
--- 1,5 ----
  /* $XConsortium: inout.s,v 1.3 94/10/12 20:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.2 1995/01/28 17:05:02 dawes Exp $ */
  
  #include "assyntax.h"
  
diff -c xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c:3.4
*** xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c:1.1.1.2	Mon Jan 30 17:39:12 1995
--- xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c	Mon Jan 30 17:39:12 1995
***************
*** 1,5 ****
  /* $XConsortium: posix_tty.c,v 1.3 95/01/05 20:42:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.2 1994/10/23 13:00:05 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
--- 1,5 ----
  /* $XConsortium: posix_tty.c,v 1.3 95/01/05 20:42:55 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.4 1995/01/28 17:05:03 dawes Exp $ */
  /*
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
   *
diff -c xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c:1.1.1.2	Mon Jan 30 17:39:12 1995
--- xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c	Mon Jan 30 17:39:12 1995
***************
*** 1,5 ****
  /* $XConsortium: std_mouse.c,v 1.2 94/10/12 20:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c,v 3.1 1994/09/27 10:30:59 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: std_mouse.c,v 1.2 94/10/12 20:50:05 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c,v 3.3 1995/01/28 17:05:04 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c:3.4
*** xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c:1.1.1.2	Mon Jan 30 17:39:13 1995
--- xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c	Mon Jan 30 17:39:13 1995
***************
*** 1,5 ****
  /* $XConsortium: sysv_tty.c,v 1.3 95/01/05 22:40:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c,v 3.2 1994/10/23 13:00:06 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
--- 1,5 ----
  /* $XConsortium: sysv_tty.c,v 1.3 95/01/05 22:40:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c,v 3.4 1995/01/28 17:05:05 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff -c xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:1.1.1.2	Mon Jan 30 17:39:14 1995
--- xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile	Mon Jan 30 17:39:14 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:50:38 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile,v 3.0 1994/06/28 12:58:36 dawes Exp $
  #include <Server.tmpl>
  
  BIOS_MOD = solx86_mmap
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:50:38 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile,v 3.2 1995/01/28 17:05:09 dawes Exp $
  #include <Server.tmpl>
  
  BIOS_MOD = solx86_mmap
diff -c xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c:1.1.1.2	Mon Jan 30 17:39:14 1995
--- xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c	Mon Jan 30 17:39:15 1995
***************
*** 1,5 ****
  /* $XConsortium: solx86_init.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c,v 3.0 1994/09/23 10:25:22 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: solx86_init.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c,v 3.2 1995/01/28 17:05:11 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c:1.1.1.2	Mon Jan 30 17:39:15 1995
--- xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c	Mon Jan 30 17:39:15 1995
***************
*** 1,5 ****
  /* $XConsortium: solx86_vid.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c,v 3.0 1994/06/28 12:30:25 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: solx86_vid.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c,v 3.2 1995/01/28 17:05:12 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:1.1.1.2	Mon Jan 30 17:39:16 1995
--- xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile	Mon Jan 30 17:39:16 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/13 19:51:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile,v 3.1 11994/12/10 03:03:43 dawes Exp $
  #include <Server.tmpl>
  
  #if defined(SVR4Architecture)
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/13 19:51:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile,v 3.3 1995/01/28 17:05:16 dawes Exp $
  #include <Server.tmpl>
  
  #if defined(SVR4Architecture)
diff -c xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c:1.1.1.2	Mon Jan 30 17:39:17 1995
--- xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c	Mon Jan 30 17:39:17 1995
***************
*** 1,5 ****
  /* $XConsortium: bios_V4mmap.c,v 1.2 95/01/05 20:43:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c,v 3.0 1994/10/23 13:00:18 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: bios_V4mmap.c,v 1.2 95/01/05 20:43:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c,v 3.2 1995/01/28 17:05:18 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c:3.2
*** xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c:1.1.1.2	Mon Jan 30 17:39:17 1995
--- xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c	Mon Jan 30 17:39:17 1995
***************
*** 1,5 ****
  /* $XConsortium: sysv_init.c,v 1.2 94/10/12 20:51:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.0 1994/09/23 10:25:28 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
--- 1,5 ----
  /* $XConsortium: sysv_init.c,v 1.2 94/10/12 20:51:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.2 1995/01/28 17:05:19 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff -c xc/programs/Xserver/hw/xfree86/reconfig/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/reconfig/Imakefile:1.1.1.1	Mon Jan 30 17:39:19 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/Imakefile	Mon Jan 30 17:39:19 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/11/21 21:55:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/Imakefile,v 3.3 1994/09/23 10:25:37 dawes Exp $
  
            YFLAGS = -d
              SRCS = reconfig.c lex.c copyright.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/11/21 21:55:13 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/Imakefile,v 3.4 1995/01/28 16:07:26 dawes Exp $
  
            YFLAGS = -d
              SRCS = reconfig.c lex.c copyright.c
diff -c xc/programs/Xserver/hw/xfree86/reconfig/copyright.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/copyright.c:3.1
*** xc/programs/Xserver/hw/xfree86/reconfig/copyright.c:1.1.1.1	Mon Jan 30 17:39:19 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/copyright.c	Mon Jan 30 17:39:20 1995
***************
*** 1,5 ****
  /* $XConsortium: copyright.c,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/copyright.c,v 3.0 1994/09/21 10:55:51 dawes Exp $ */
  
  /* Print the copyright to stdout */
  
--- 1,5 ----
  /* $XConsortium: copyright.c,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/copyright.c,v 3.1 1995/01/28 16:07:28 dawes Exp $ */
  
  /* Print the copyright to stdout */
  
diff -c xc/programs/Xserver/hw/xfree86/reconfig/keyword.i:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/keyword.i:3.1
*** xc/programs/Xserver/hw/xfree86/reconfig/keyword.i:1.1.1.1	Mon Jan 30 17:39:20 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/keyword.i	Mon Jan 30 17:39:20 1995
***************
*** 1,5 ****
  /* $XConsortium: keyword.i,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/keyword.i,v 3.0 1994/09/03 02:52:16 dawes Exp $ */
  
    { FONTPATH,   "fontpath" },
    { RGBPATH,    "rgbpath" },
--- 1,5 ----
  /* $XConsortium: keyword.i,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/keyword.i,v 3.1 1995/01/28 16:07:30 dawes Exp $ */
  
    { FONTPATH,   "fontpath" },
    { RGBPATH,    "rgbpath" },
diff -c xc/programs/Xserver/hw/xfree86/reconfig/lex.l:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/lex.l:3.4
*** xc/programs/Xserver/hw/xfree86/reconfig/lex.l:1.1.1.1	Mon Jan 30 17:39:20 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/lex.l	Mon Jan 30 17:39:20 1995
***************
*** 1,5 ****
  /* $XConsortium: lex.l,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/lex.l,v 3.3 1994/09/08 14:28:39 dawes Exp $ */
  
  %{
  #include "os.h"
--- 1,5 ----
  /* $XConsortium: lex.l,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/lex.l,v 3.4 1995/01/28 16:07:31 dawes Exp $ */
  
  %{
  #include "os.h"
diff -c xc/programs/Xserver/hw/xfree86/reconfig/os.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/os.h:3.3
*** xc/programs/Xserver/hw/xfree86/reconfig/os.h:1.1.1.1	Mon Jan 30 17:39:21 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/os.h	Mon Jan 30 17:39:21 1995
***************
*** 1,5 ****
  /* $XConsortium: os.h,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/os.h,v 3.2 1994/09/26 15:52:24 dawes Exp $ */
  
  /* from <X11/Xosdefs.h> */
  #ifdef NOSTDHDRS
--- 1,5 ----
  /* $XConsortium: os.h,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/os.h,v 3.3 1995/01/28 16:07:32 dawes Exp $ */
  
  /* from <X11/Xosdefs.h> */
  #ifdef NOSTDHDRS
diff -c xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man:3.2
*** xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man:1.1.1.1	Mon Jan 30 17:39:21 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man	Mon Jan 30 17:39:21 1995
***************
*** 1,5 ****
  .\" $XConsortium: reconfig.man,v 1.3 95/01/05 20:24:39 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man,v 3.1 1994/10/20 06:10:31 dawes Exp $
  .TH reconfig 1 "Version 3.1.1" "XFree86"
  .SH NAME
  reconfig \- convert old Xconfig to new XF86Config
--- 1,5 ----
  .\" $XConsortium: reconfig.man,v 1.3 95/01/05 20:24:39 kaleb Exp $
! .\" $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/reconfig.man,v 3.2 1995/01/28 16:07:34 dawes Exp $
  .TH reconfig 1 "Version 3.1.1" "XFree86"
  .SH NAME
  reconfig \- convert old Xconfig to new XF86Config
diff -c xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y:3.6
*** xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y:1.1.1.1	Mon Jan 30 17:39:22 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y	Mon Jan 30 17:39:22 1995
***************
*** 1,5 ****
  /* $XConsortium: reconfig.y,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y,v 3.5 1994/09/23 13:40:05 dawes Exp $ */
  
  %{
  #include <stdio.h>
--- 1,5 ----
  /* $XConsortium: reconfig.y,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/reconfig.y,v 3.6 1995/01/28 16:07:35 dawes Exp $ */
  
  %{
  #include <stdio.h>
diff -c xc/programs/Xserver/hw/xfree86/reconfig/strlist.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/reconfig/strlist.h:3.1
*** xc/programs/Xserver/hw/xfree86/reconfig/strlist.h:1.1.1.1	Mon Jan 30 17:39:22 1995
--- xc/programs/Xserver/hw/xfree86/reconfig/strlist.h	Mon Jan 30 17:39:22 1995
***************
*** 1,5 ****
  /* $XConsortium: strlist.h,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/strlist.h,v 3.0 1994/09/03 02:52:19 dawes Exp $ */
  
  /* Used in the %union, therefore to be included in the scanner. */
  typedef struct {
--- 1,5 ----
  /* $XConsortium: strlist.h,v 1.2 94/11/21 21:55:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/reconfig/strlist.h,v 3.1 1995/01/28 16:07:37 dawes Exp $ */
  
  /* Used in the %union, therefore to be included in the scanner. */
  typedef struct {
diff -c /dev/null xc/programs/Xserver/hw/xfree86/vga16/BUGS:1.1.1.1
*** /dev/null	Mon Jan 30 17:39:23 1995
--- xc/programs/Xserver/hw/xfree86/vga16/BUGS	Mon Jan 30 17:39:24 1995
***************
*** 0 ****
--- 1,169 ----
+ Section 1: From IBM`s X11R4 contribution towards XFree86.
+ 
+ This section describes what I did to obtain a 16 colour vga server.
+ 
+ I started with the SYSV, ppc, vga and common directories from IBM's X11R4
+ contribution. Those directories have the following function:
+ 1. SYSV implements the mouse and keyboard.
+ 2. ppc is a generic layer implementing ddx in terms of drawing operations
+    through rectangles. (With spans as a boundary case: height = 1.)
+ 3. vga implements a layer of operations drawing through rectangles.
+ 4. common implements ddx initialization and quitting, and screen saving.
+ 
+ I eliminated SYSV and common since the functionality provided therein is
+ already provided in XFree86. Since XFree86 is actively being ported to
+ new operating systems, while X11R4 is out of date, I preferred the XFree86
+ code here above the SYSV and common code.
+ Whatever functionality was still needed from common (default colormap
+ initialization -- not much code) was moved into ppc.
+ 
+ Since XFree86 uses the mi-provided software cursor code, IBM's software
+ cursor code was deleted from ppc and vga. This is a pity, since it is
+ expected that it is more efficient than mi's code, but the XFree86 mouse and
+ keyboard code directly call mi, and I do not want to maintain the XFree86
+ mouse and keyboard code.
+ 
+ Since we cannot support a monolithic multi-screen server using all of the
+ x11r4 contributed code yet, all multi screen code was deleted. This includes
+ one header file containing a nasty copyright statement.
+ 
+ Since glyph handling has changed between X11R4 and X11R5, the code handling
+ glyphs was replaced by appropriate calls to mi.
+ I hope it can be modified and put back one day.
+ 
+ Provisionally, some code was added (viz. file vga/offscreen.c) to intercept
+ calls to the rectangle drawing code when we are switched out of the VT.
+ I hope this can be replaced by some window tree invalidation and GC validation
+ scheme.
+ 
+ 
+ Section 2: BUGS
+ 
+ This section describes fixed and still unfixed bugs in this code.
+ All bugs not labeled otherwise also occur in IBM's X11R4 code, and may be of
+ interest to anybody using that code.
+ 
+ 1. (Fixed.)
+ I found (and provisionally fixed) a bug in the IBM bitblit code:
+ In file ddx/ibm/vga/vgaImages.c a function vgaReadColorImage is defined.
+ When this function is used to read less than 8 pixels starting on a byte
+ boundary it will always read precisely 8 pixels.
+ Thus, when space is allocated for 4 or less pixels, it will write beyond
+ the allocated space.
+ Since the code is rather convoluted, this may not be apparent at first sight,
+ but going through the code with an example shows the error.
+ 
+ 2. (Fixed.)
+ In ppcPixmapFS.c, function ppcStipplePixmapFS there was a bug
+ regarding the stipple origin: The horizontal origin is added while
+ the vertical one is subtracted. The horizontal origin should be subtracted
+ instead of added here.
+ This bug gets visible when backing-store is enabled and one uses twm:
+ the submenu icons get truncated on their left hand side.
+ (In case you wonder why this bug appears: under those circumstances
+ twm prepares its menus by drawing into an unmapped window. 
+ The miCopyPlane function uses the ppcStipplePixmap (and many others)
+ to get the plane copied.)
+ I also fixed this bug in the other routines (ppcOpStipplePixmapFS,
+ ppcTilePixmapFS) in this file, although I had no visible clues for this.
+ I hope this is appropriate.
+ 
+ 3. (Unfixed, since it is not visible in practice.)
+ I find it suspect that ppcSetSpans gives different output when one
+ claims that an actually sorted list of spans is unsorted.
+ The unsorted code is wrong, and should be made to look more like the sorted
+ code. I.e., use ( xStart - ppt->x ) instead of ( xStart - pbox->x1 )
+ 
+ 4. (Fixed.)
+ There used to be another bug that became visible when using twm and backing
+ store: popping up a submenu, and moving the cursor upwards til it leaves the
+ submenu, the submenu would disappears, as it should.
+ But the submenu icon would not get restored, while it should be.
+ 10b. By replacing the clip-computing code in ppcValidateGC by that in
+ cfbValidateGC, I *finally* fixed the disappearing twm menu icon problem.
+ 
+ 5. Added mfbRegisterCopyplaneProc call. [Its omission was an error on my
+    part.]
+    Fixing a server core dump in XTest.
+ 
+ 6. Fixed not-very-high tile bug in function ppcTileRect, file emulTile.c
+    (I.e., if the tile was higher than the area to be tiled, far too much
+    was drawn, causing server core dumps in XTest.)
+    Actually, "savey" ought to be used to determine the height of the tiles in
+    the top line to be tiled, instead of "pTile->drawable.height".
+ 7. A use of height where width was intended was fixed in ppcTileRect:
+    "savehcount = w / pTile->drawable.height;" should use "... .width" and
+    "savehcount = ( x + w - htarget ) / pTile->drawable.height;" too.
+ 
+ 8. Deleted overly clever code in ppcCReduce.c
+    (All code that tried to pre-compute how alu's could be replaced by
+     other alu's with inverted colors, etc. was deleted. I think it is
+    at least wrong for FillSolid.)
+ 
+ 9. Looked at suspicious code in ppcSetSp.c
+    "tmpx = *pdst;" was never updated during the loop. We took it out of the
+    initialization position of the for and moved it into the loop.
+ 
+ 10. Add xSrc := GC->patOrg.x + pDrawable.x and ySrc := ... in ppcPixmapFS.c,
+    functions ppcStipplePixmapFS, ppcOpStipplePixmapFS, and ppcTilePixmapFS.
+    This because stipple and tile origins are taken relative to the drawable.
+    Also use a "modulo" function that gets the cases of a negative stipple
+    or tile offset right. (When the stipple origin is to the right of or
+    below the origin of the drawable.)
+ 
+ 11. File vgaSolid.c, function vgaFillSolid:
+    Inverting is XORing with all ones. Not with the color we want to AND/OR
+    later. So we'll have to set the color to VGA_ALLPLANES
+    whenever we want to invert existing data, and reset it before the
+    AND/OR is done.
+    Also we replaced an outb( 0x3CF, tmp2 ) by the SetVideoGraphicsData( tmp2 )
+    it is representing. (Just a cosmetic replacement.)
+ 
+ 12. File vgaImages, function vgaDrawColorImage.
+    Moved a line "invert_existing_data = TRUE;" two lines down, past a case
+    label. Now it is also part of the code executed for GXorReverse, as it
+    should be.
+ 
+ 13. The pixmap FillSpans routines (file ppcPixmapFS.c) got somewhat better
+    after importing some code from ddx/ibm/vga. (A getbits function that does
+    wrapping.)
+    They were wrong for the FillStippled and FillOpaqueStippled modes.
+    I don't understand the old code. How could it handle stipples of a size not
+    an exact multiple of 32? (or 8, for that matter.)
+ 
+ 14. In function vgaBitBlt file vgaBitBlt.c, in the shortcuts for
+     GXSet, GXClear and GXInvert, the source (x0,y0) is accidentally operated
+     upon by vgaFillSolid, instead of the destination (x1,y1).
+ 
+ 15. Notice that in DoMonoSingle and DoMonoMany in file vgaStipple.c, the left
+    edge of the square to be stippled is treated wrong.
+    Correct would be to get the bits with getbits using offset xshift, and
+    to shift them right (x & 07) places. 
+    [One might wish to use the variable tmp1 at this place, since it had been
+     set to (x & 07) at this place; but that is already re-used at this point.]
+    Also note that NeedValX is set wrong: The implicit assumption was that
+    stipples are more than 8 wide.
+    This only fixes the problem when miPushPixel is used instead of ppcPushPixel.
+    I think I should look some more into this.
+    
+ 16. I took out some code of the CopyArea function, in which a no-op function
+    was called while a real one was needed. My fix does not completely work,
+    although it improved the behaviour of GetImage somewhat.
+ 
+ 17.  After finding three kinds of errors in this single function,
+    -- the new kinds being the right side not being always written due to
+    an incorrect if scope, and the lower end not always being written due
+    to variables being updated at the wrong place --
+    (requiring modifications to be made at at least 10 places,
+    I decided to REWRITE the body of the ppcTileRect function from scratch.
+    This version simply computes all relevant margins in advance, and does
+    not try to reuse temporary variables. I leave that to the compiler.
+    (This was a maintenance and robustness nightmare anyway.)
+ 
+ MORE NOTES:
+    It is funny that there are two files in mi that require compilation
+    with the proper #defines ( -DXF86VGA16  in my case ):
+    Besides the obvious mibitblt.c, there is also mipushpxl.c.
+ 
+ 
+ 
diff -c xc/programs/Xserver/hw/xfree86/vga16/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/Imakefile:1.1.1.2	Mon Jan 30 17:39:24 1995
--- xc/programs/Xserver/hw/xfree86/vga16/Imakefile	Mon Jan 30 17:39:24 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:52:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/Imakefile,v 3.0 1994/06/05 05:58:22 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:52:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/Imakefile,v 3.2 1995/01/28 17:05:24 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile:3.5
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile:1.1.1.2	Mon Jan 30 17:39:25 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile	Mon Jan 30 17:39:26 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:18 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile,v 3.3 1994/12/25 12:32:34 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:18 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile,v 3.5 1995/01/28 17:05:27 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile:1.1.1.1	Mon Jan 30 17:39:28 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile	Mon Jan 30 17:39:28 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:35:25 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:07:15 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:35:25 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile,v 3.1 1995/01/28 16:07:51 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile:1.1.1.2	Mon Jan 30 17:39:29 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile	Mon Jan 30 17:39:29 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:44:03 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile,v 3.1 1994/11/19 07:56:22 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:44:03 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile,v 3.3 1995/01/28 17:05:31 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile:1.1.1.2	Mon Jan 30 17:39:31 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile	Mon Jan 30 17:39:31 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile,v 3.1 1994/05/30 08:25:30 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gen_driver.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile,v 3.3 1995/01/28 17:05:34 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gen_driver.c
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile:1.1.1.2	Mon Jan 30 17:39:32 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile	Mon Jan 30 17:39:32 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:52 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:25:35 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:52 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile,v 3.2 1995/01/28 17:05:36 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile:1.1.1.2	Mon Jan 30 17:39:34 1995
--- xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile	Mon Jan 30 17:39:34 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:57:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile,v 3.0 1994/05/30 08:25:47 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:57:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile,v 3.2 1995/01/28 17:05:40 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile:1.1.1.2	Mon Jan 30 17:39:39 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile	Mon Jan 30 17:39:39 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:37:31 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile,v 3.1 1995/01/26 02:20:15 dawes Exp $
  #include <Server.tmpl>
  
  SRCS =	ppcArea.c ppcBitmap.c ppcBStore.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:37:31 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile,v 3.3 1995/01/28 17:05:47 dawes Exp $
  #include <Server.tmpl>
  
  SRCS =	ppcArea.c ppcBitmap.c ppcBStore.c \
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h:1.1.1.2	Mon Jan 30 17:39:40 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h	Mon Jan 30 17:39:40 1995
***************
*** 1,5 ****
  /* $XConsortium: OScompiler.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h,v 3.1 1994/07/24 12:23:35 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: OScompiler.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h,v 3.3 1995/01/28 17:05:49 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c:1.1.1.2	Mon Jan 30 17:39:40 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c	Mon Jan 30 17:39:40 1995
***************
*** 1,5 ****
  /* $XConsortium: emulOpStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c,v 3.0 1994/05/04 15:03:04 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: emulOpStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c,v 3.2 1995/01/28 17:05:50 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c:1.1.1.2	Mon Jan 30 17:39:40 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c	Mon Jan 30 17:39:40 1995
***************
*** 1,5 ****
  /* $XConsortium: emulRepAre.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c,v 3.0 1994/05/04 15:03:05 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: emulRepAre.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c,v 3.2 1995/01/28 17:05:51 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c:1.1.1.2	Mon Jan 30 17:39:41 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c	Mon Jan 30 17:39:41 1995
***************
*** 1,5 ****
  /* $XConsortium: emulStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c,v 3.0 1994/05/04 15:03:06 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: emulStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c,v 3.2 1995/01/28 17:05:53 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c:1.1.1.2	Mon Jan 30 17:39:41 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c	Mon Jan 30 17:39:42 1995
***************
*** 1,5 ****
  /* $XConsortium: emulTile.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c,v 3.1 1994/05/31 08:12:21 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: emulTile.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c,v 3.3 1995/01/28 17:05:55 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c:1.1.1.1	Mon Jan 30 17:39:42 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c	Mon Jan 30 17:39:42 1995
***************
*** 48,54 ****
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbbres.c,v 1.3 95/01/13 19:55:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c,v 3.1 1994/11/26 12:47:04 dawes Exp $ */
  #include "X.h"
  #include "misc.h"
  #include "maskbits.h"
--- 48,54 ----
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbbres.c,v 1.3 95/01/13 19:55:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbres.c,v 3.2 1995/01/28 16:08:23 dawes Exp $ */
  #include "X.h"
  #include "misc.h"
  #include "maskbits.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c:1.1.1.1	Mon Jan 30 17:39:42 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c	Mon Jan 30 17:39:42 1995
***************
*** 47,53 ****
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbbresd.c,v 1.3 95/01/13 19:56:01 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c,v 3.1 1994/11/26 12:47:05 dawes Exp $ */
  #include "X.h"
  #include "misc.h"
  #include "maskbits.h"
--- 47,53 ----
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbbresd.c,v 1.3 95/01/13 19:56:01 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbbresd.c,v 3.2 1995/01/28 16:08:24 dawes Exp $ */
  #include "X.h"
  #include "misc.h"
  #include "maskbits.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c:1.1.1.1	Mon Jan 30 17:39:43 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c	Mon Jan 30 17:39:43 1995
***************
*** 48,54 ****
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbhrzvert.c,v 1.1 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c,v 3.0 1994/05/04 15:03:12 dawes Exp $ */
  #include "X.h"
  
  #include "gc.h"
--- 48,54 ----
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbhrzvert.c,v 1.1 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbhrzvert.c,v 3.1 1995/01/28 16:08:26 dawes Exp $ */
  #include "X.h"
  
  #include "gc.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c:1.1.1.1	Mon Jan 30 17:39:43 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c	Mon Jan 30 17:39:44 1995
***************
*** 47,53 ****
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbline.c,v 1.1 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c,v 3.0 1994/05/04 15:03:13 dawes Exp $ */
  #include "X.h"
  
  #include "gcstruct.h"
--- 47,53 ----
  ******************************************************************/
  /* GJA -- modified this file for vga16 */
  /* $XConsortium: mfbline.c,v 1.1 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbline.c,v 3.1 1995/01/28 16:08:28 dawes Exp $ */
  #include "X.h"
  
  #include "gcstruct.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c:1.1.1.2	Mon Jan 30 17:39:44 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c	Mon Jan 30 17:39:44 1995
***************
*** 1,5 ****
  /* $XConsortium: offscreen.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c,v 3.1 1994/06/18 16:26:33 dawes Exp $ */
  /*
   * Copyright 1993 Gerrit Jan Akkerman 
   *
--- 1,5 ----
  /* $XConsortium: offscreen.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c,v 3.3 1995/01/28 17:05:57 dawes Exp $ */
  /*
   * Copyright 1993 Gerrit Jan Akkerman 
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c:1.1.1.2	Mon Jan 30 17:39:45 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c	Mon Jan 30 17:39:45 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcArea.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c,v 3.0 1994/05/04 15:03:16 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcArea.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c,v 3.2 1995/01/28 17:05:58 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c:1.1.1.2	Mon Jan 30 17:39:45 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c	Mon Jan 30 17:39:45 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcBStore.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c,v 3.1 1994/06/18 16:26:35 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: ppcBStore.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c,v 3.3 1995/01/28 17:05:59 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c:1.1.1.2	Mon Jan 30 17:39:46 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c	Mon Jan 30 17:39:46 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcBitmap.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c,v 3.0 1994/05/04 15:03:19 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcBitmap.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c,v 3.2 1995/01/28 17:06:01 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c:1.1.1.2	Mon Jan 30 17:39:46 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c	Mon Jan 30 17:39:46 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcCpArea.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c,v 3.1 1994/06/18 16:26:37 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcCpArea.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c,v 3.3 1995/01/28 17:06:02 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c:1.1.1.2	Mon Jan 30 17:39:47 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c	Mon Jan 30 17:39:48 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c,v 3.0 1994/05/04 15:03:22 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: ppcGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c,v 3.2 1995/01/28 17:06:03 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c:1.1.1.2	Mon Jan 30 17:39:49 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c	Mon Jan 30 17:39:49 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcGetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c,v 3.0 1994/05/04 15:03:24 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcGetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c,v 3.2 1995/01/28 17:06:05 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c:1.1.1.2	Mon Jan 30 17:39:50 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c	Mon Jan 30 17:39:50 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcIO.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c,v 3.0 1994/05/04 15:03:25 dawes Exp $ */
  /*
  
  Copyright (c) 1990  X Consortium
--- 1,5 ----
  /* $XConsortium: ppcIO.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c,v 3.2 1995/01/28 17:06:06 dawes Exp $ */
  /*
  
  Copyright (c) 1990  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c:1.1.1.2	Mon Jan 30 17:39:50 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c	Mon Jan 30 17:39:50 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcImg.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c,v 3.1 1994/05/31 08:12:22 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcImg.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c,v 3.3 1995/01/28 17:06:08 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c:1.1.1.2	Mon Jan 30 17:39:51 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c	Mon Jan 30 17:39:51 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcPixFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c,v 3.0 1994/05/04 15:03:29 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcPixFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c,v 3.1 1995/01/28 16:08:45 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c:1.1.1.2	Mon Jan 30 17:39:51 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c	Mon Jan 30 17:39:51 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcPntWin.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c,v 3.0 1994/05/04 15:03:30 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcPntWin.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c,v 3.2 1995/01/28 17:06:09 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c:1.1.1.2	Mon Jan 30 17:39:52 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c	Mon Jan 30 17:39:52 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcPolyPnt.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c,v 3.0 1994/05/04 15:03:32 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: ppcPolyPnt.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c,v 3.2 1995/01/28 17:06:10 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c:1.1.1.2	Mon Jan 30 17:39:54 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c	Mon Jan 30 17:39:54 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcPushPxl.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c,v 3.0 1994/05/04 15:03:34 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcPushPxl.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c,v 3.2 1995/01/28 17:06:12 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c:1.1.1.2	Mon Jan 30 17:39:54 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c	Mon Jan 30 17:39:54 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcRslvC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c,v 3.0 1994/05/04 15:03:35 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: ppcRslvC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c,v 3.2 1995/01/28 17:06:13 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c:1.1.1.2	Mon Jan 30 17:39:55 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c	Mon Jan 30 17:39:55 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcSetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c,v 3.1 1994/06/18 16:26:39 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcSetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c,v 3.3 1995/01/28 17:06:15 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c:1.1.1.2	Mon Jan 30 17:39:56 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c	Mon Jan 30 17:39:56 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcWinFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c,v 3.0 1994/05/04 15:03:40 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: ppcWinFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c,v 3.1 1995/01/28 16:08:55 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c:1.1.1.2	Mon Jan 30 17:39:56 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c	Mon Jan 30 17:39:56 1995
***************
*** 1,5 ****
  /* $XConsortium: ppcWindow.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c,v 3.0 1994/05/04 15:03:39 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: ppcWindow.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c,v 3.2 1995/01/28 17:06:16 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h:3.3
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h:1.1.1.2	Mon Jan 30 17:39:57 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h	Mon Jan 30 17:39:58 1995
***************
*** 1,5 ****
  /* $XConsortium: vga16.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h,v 3.1 1994/06/18 16:26:41 dawes Exp $ */
  
  /*
   * some header files need to be included here to make
--- 1,5 ----
  /* $XConsortium: vga16.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h,v 3.3 1995/01/28 17:06:18 dawes Exp $ */
  
  /*
   * some header files need to be included here to make
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c:1.1.1.2	Mon Jan 30 17:39:58 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c	Mon Jan 30 17:39:58 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaBitBlt.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c,v 3.0 1994/05/04 15:03:44 dawes Exp $ */
  /* GJA -- span move routines */
  
  #include "X.h"
--- 1,5 ----
  /* $XConsortium: vgaBitBlt.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c,v 3.1 1995/01/28 16:09:01 dawes Exp $ */
  /* GJA -- span move routines */
  
  #include "X.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c:1.1.1.2	Mon Jan 30 17:39:59 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c	Mon Jan 30 17:39:59 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c,v 3.0 1994/05/04 15:03:46 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgaGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c,v 3.2 1995/01/28 17:06:19 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c:1.1.1.2	Mon Jan 30 17:40:00 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c	Mon Jan 30 17:40:00 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaImages.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c,v 3.0 1994/05/04 15:03:47 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: vgaImages.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c,v 3.2 1995/01/28 17:06:21 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c:1.1.1.2	Mon Jan 30 17:40:00 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c	Mon Jan 30 17:40:00 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaSolid.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c,v 3.0 1994/05/04 15:03:49 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: vgaSolid.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c,v 3.2 1995/01/28 17:06:22 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c:1.1.1.2	Mon Jan 30 17:40:01 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c	Mon Jan 30 17:40:01 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaStipple.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c,v 3.0 1994/05/04 15:03:51 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: vgaStipple.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c,v 3.2 1995/01/28 17:06:24 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h:1.1.1.2	Mon Jan 30 17:40:02 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h	Mon Jan 30 17:40:02 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaVideo.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h,v 3.0 1994/05/04 15:03:52 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
--- 1,5 ----
  /* $XConsortium: vgaVideo.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h,v 3.2 1995/01/28 17:06:26 dawes Exp $ */
  /*
   * Copyright IBM Corporation 1987,1988,1989
   *
diff -c xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c:1.1.1.2	Mon Jan 30 17:40:02 1995
--- xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c	Mon Jan 30 17:40:02 1995
***************
*** 1,5 ****
  /* $XConsortium: wm3.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c,v 3.0 1994/05/04 15:03:54 dawes Exp $ */
  #include <sys/types.h>
  #include "compiler.h"
  #include "vgaReg.h"
--- 1,5 ----
  /* $XConsortium: wm3.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c,v 3.2 1995/01/28 17:06:27 dawes Exp $ */
  #include <sys/types.h>
  #include "compiler.h"
  #include "vgaReg.h"
diff -c xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile:1.1.1.2	Mon Jan 30 17:40:04 1995
--- xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile	Mon Jan 30 17:40:04 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:19 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile,v 3.2 1994/12/17 10:07:36 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:19 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile,v 3.4 1995/01/28 17:06:40 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
diff -c xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile:1.1.1.2	Mon Jan 30 17:40:06 1995
--- xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile	Mon Jan 30 17:40:06 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:20 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile,v 3.2 1994/12/26 01:09:31 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mibitblt.c mipushpxl.c dixfonts.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:20 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile,v 3.4 1995/01/28 17:06:44 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = mibitblt.c mipushpxl.c dixfonts.c
diff -c xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile:1.1.1.2	Mon Jan 30 17:40:08 1995
--- xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile	Mon Jan 30 17:40:08 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:09:48 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile,v 3.0 1994/05/04 15:04:22 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaCmap.c vgaBank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:09:48 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile,v 3.2 1995/01/28 17:06:47 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaCmap.c vgaBank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/Imakefile:1.1.1.2	Mon Jan 30 17:40:09 1995
--- xc/programs/Xserver/hw/xfree86/vga2/Imakefile	Mon Jan 30 17:40:09 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:13:49 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/Imakefile,v 3.1 1994/06/05 05:59:28 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:13:49 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/Imakefile,v 3.3 1995/01/28 17:06:50 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile:3.5
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile:1.1.1.2	Mon Jan 30 17:40:11 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile	Mon Jan 30 17:40:11 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:21 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile,v 3.3 1994/12/25 12:33:27 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:21 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile,v 3.5 1995/01/28 17:06:54 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile:1.1.1.1	Mon Jan 30 17:40:15 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile	Mon Jan 30 17:40:15 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:52 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:07:48 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:52 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile,v 3.1 1995/01/28 16:09:49 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile:1.1.1.2	Mon Jan 30 17:40:16 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile	Mon Jan 30 17:40:17 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:15:39 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile,v 3.0 1994/05/30 08:26:28 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cpq_driver.c cpq_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:15:39 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile,v 3.2 1995/01/28 17:06:59 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cpq_driver.c cpq_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile:1.1.1.2	Mon Jan 30 17:40:18 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile	Mon Jan 30 17:40:18 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:16:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile,v 3.0 1994/05/30 08:26:38 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et3_driver.c et3_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:16:10 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile,v 3.2 1995/01/28 17:07:02 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et3_driver.c et3_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile:1.1.1.2	Mon Jan 30 17:40:19 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile	Mon Jan 30 17:40:19 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:45:04 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile,v 3.1 1994/11/19 07:57:24 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:45:04 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile,v 3.3 1995/01/28 17:07:05 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile:1.1.1.2	Mon Jan 30 17:40:20 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile	Mon Jan 30 17:40:21 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:17:22 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile,v 3.1 1994/05/15 03:01:52 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gen_driver.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:17:22 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile,v 3.3 1995/01/28 17:07:08 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gen_driver.c
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c:1.1.1.2	Mon Jan 30 17:40:21 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c	Mon Jan 30 17:40:21 1995
***************
*** 1,5 ****
  /* $XConsortium: gen_driver.c,v 1.3 95/01/16 13:17:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c,v 3.6 1995/01/10 10:29:23 dawes Exp $ */
  
  /*
   * Generic VGA driver for mono operation.  This driver doesn't do much since
--- 1,5 ----
  /* $XConsortium: gen_driver.c,v 1.3 95/01/16 13:17:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c,v 3.8 1995/01/28 17:07:09 dawes Exp $ */
  
  /*
   * Generic VGA driver for mono operation.  This driver doesn't do much since
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile:1.1.1.2	Mon Jan 30 17:40:22 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile	Mon Jan 30 17:40:22 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:19 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile,v 3.0 1994/05/30 08:26:46 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gvg_driver.c gvg_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:19 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile,v 3.2 1995/01/28 17:07:12 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gvg_driver.c gvg_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile:1.1.1.2	Mon Jan 30 17:40:24 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile	Mon Jan 30 17:40:24 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:39 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:26:50 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:39 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile,v 3.2 1995/01/28 17:07:15 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile:1.1.1.2	Mon Jan 30 17:40:25 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile	Mon Jan 30 17:40:25 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:55 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile,v 3.0 1994/05/30 08:26:53 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = oak_driver.c oak_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:55 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile,v 3.2 1995/01/28 17:07:18 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = oak_driver.c oak_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile:1.1.1.2	Mon Jan 30 17:40:26 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile	Mon Jan 30 17:40:26 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile,v 3.1 1994/07/24 11:55:07 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = pvg_driver.c pvg_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:15 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile,v 3.3 1995/01/28 17:07:21 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = pvg_driver.c pvg_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile:1.1.1.2	Mon Jan 30 17:40:27 1995
--- xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile	Mon Jan 30 17:40:27 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:32 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile,v 3.0 1994/05/30 08:27:01 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:32 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile,v 3.2 1995/01/28 17:07:23 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile:1.1.1.2	Mon Jan 30 17:40:29 1995
--- xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile	Mon Jan 30 17:40:29 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:20:01 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile,v 3.1 1994/05/14 07:01:05 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:20:01 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile,v 3.3 1995/01/28 17:07:28 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
diff -c xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile:1.1.1.2	Mon Jan 30 17:40:31 1995
--- xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile	Mon Jan 30 17:40:31 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:22 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile,v 3.1 1994/12/17 10:08:05 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:22 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile,v 3.3 1995/01/28 17:07:34 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
diff -c xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c:1.1.1.2	Mon Jan 30 17:40:31 1995
--- xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c	Mon Jan 30 17:40:31 1995
***************
*** 47,53 ****
  
  ******************************************************************/
  /* $XConsortium: mfbbitblt.c,v 1.3 94/10/12 21:20:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c,v 3.0 1994/05/31 08:13:32 dawes Exp $ */
  #include "X.h"
  #include "Xprotostr.h"
  
--- 47,53 ----
  
  ******************************************************************/
  /* $XConsortium: mfbbitblt.c,v 1.3 94/10/12 21:20:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c,v 3.2 1995/01/28 17:07:36 dawes Exp $ */
  #include "X.h"
  #include "Xprotostr.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c:1.1.1.1	Mon Jan 30 17:40:32 1995
--- xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c	Mon Jan 30 17:40:32 1995
***************
*** 31,37 ****
  
  */
  /* $XConsortium: mfbblt.c,v 1.1 94/10/12 21:20:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c,v 3.1 1994/08/12 14:02:47 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
--- 31,37 ----
  
  */
  /* $XConsortium: mfbblt.c,v 1.1 94/10/12 21:20:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbblt.c,v 3.2 1995/01/28 16:10:37 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
diff -c xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile:1.1.1.2	Mon Jan 30 17:40:34 1995
--- xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile	Mon Jan 30 17:40:34 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:23 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile,v 3.2 1994/12/26 01:10:43 dawes Exp $
  #include <Server.tmpl>
  
  SRCS =	 dixfonts.c mibitblt.c
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:23 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile,v 3.4 1995/01/28 17:07:39 dawes Exp $
  #include <Server.tmpl>
  
  SRCS =	 dixfonts.c mibitblt.c
diff -c xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile:1.1.1.2	Mon Jan 30 17:40:35 1995
--- xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile	Mon Jan 30 17:40:35 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:23:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile,v 3.1 1994/05/31 13:10:02 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaBank.s vgaLBank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:23:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile,v 3.3 1995/01/28 17:07:42 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	vgaHW.c vga.c vgaBank.s vgaLBank.s
diff -c xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s:3.1
*** xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s:1.1.1.1	Mon Jan 30 17:40:36 1995
--- xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s	Mon Jan 30 17:40:36 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaLBank.s,v 1.1 94/10/12 21:23:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s,v 3.0 1994/05/31 08:13:50 dawes Exp $ */
  /* The original file was: */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
--- 1,5 ----
  /* $XConsortium: vgaLBank.s,v 1.1 94/10/12 21:23:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/vga/vgaLBank.s,v 3.1 1995/01/28 16:10:46 dawes Exp $ */
  /* The original file was: */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff -c xc/programs/Xserver/hw/xfree86/vga256/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/Imakefile:1.1.1.2	Mon Jan 30 17:40:37 1995
--- xc/programs/Xserver/hw/xfree86/vga256/Imakefile	Mon Jan 30 17:40:37 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:30:32 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/Imakefile,v 3.4 1994/09/25 12:30:27 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:30:32 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/Imakefile,v 3.6 1995/01/28 17:07:45 dawes Exp $
  #include <Server.tmpl>
  
  #define IHaveSubdirs
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile:1.1.1.2	Mon Jan 30 17:40:42 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile	Mon Jan 30 17:40:42 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:58:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile,v 3.4 1994/12/25 12:34:25 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:58:24 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile,v 3.6 1995/01/28 17:07:49 dawes Exp $
  #include <Server.tmpl>
  #define IHaveSubdirs
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile:1.1.1.1	Mon Jan 30 17:40:46 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile	Mon Jan 30 17:40:46 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:06:48 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile,v 3.0 1994/10/30 04:21:37 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ali_driver.c ali_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:06:48 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile,v 3.1 1995/01/28 16:11:01 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ali_driver.c ali_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s:1.1.1.1	Mon Jan 30 17:40:46 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s	Mon Jan 30 17:40:46 1995
***************
*** 1,5 ****
  /* $XConsortium: ali_bank.s,v 1.1 94/12/15 21:06:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s,v 3.0 1994/10/30 04:21:45 dawes Exp $ */
  
  /*
   * These are here the very lowlevel VGA bankswitching routines.
--- 1,5 ----
  /* $XConsortium: ali_bank.s,v 1.1 94/12/15 21:06:48 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s,v 3.1 1995/01/28 16:11:02 dawes Exp $ */
  
  /*
   * These are here the very lowlevel VGA bankswitching routines.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c:1.1.1.1	Mon Jan 30 17:40:47 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c	Mon Jan 30 17:40:47 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: ali_driver.c,v 1.4 95/01/16 13:18:01 kaleb Exp $ 
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c,v 3.3 1995/01/10 10:30:21 dawes Exp $
   */
  
  #include "X.h"
--- 1,6 ----
  /*
   * $XConsortium: ali_driver.c,v 1.4 95/01/16 13:18:01 kaleb Exp $ 
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c,v 3.4 1995/01/28 16:11:03 dawes Exp $
   */
  
  #include "X.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile:1.1.1.2	Mon Jan 30 17:40:48 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile	Mon Jan 30 17:40:48 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:46:05 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile,v 3.2 1994/11/30 20:43:54 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ati_driver.c ati_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:46:05 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile,v 3.4 1995/01/28 17:07:53 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ati_driver.c ati_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile:1.1.1.1	Mon Jan 30 17:40:54 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile	Mon Jan 30 17:40:54 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:08:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile,v 3.0 1994/11/05 23:51:50 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ct_driver.c ct_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:08:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile,v 3.1 1995/01/28 16:11:10 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ct_driver.c ct_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s:1.1.1.1	Mon Jan 30 17:40:55 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s	Mon Jan 30 17:40:55 1995
***************
*** 1,5 ****
  /* $XConsortium: ct_bank.s,v 1.2 95/01/06 20:58:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s,v 3.1 1995/01/04 04:42:01 dawes Exp $ */
  /*
   * Copyright 1994 by Régis Cridlig <cridlig@dmi.ens.fr>
   *
--- 1,5 ----
  /* $XConsortium: ct_bank.s,v 1.2 95/01/06 20:58:29 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s,v 3.2 1995/01/28 16:11:11 dawes Exp $ */
  /*
   * Copyright 1994 by Régis Cridlig <cridlig@dmi.ens.fr>
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c:1.1.1.1	Mon Jan 30 17:40:57 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c	Mon Jan 30 17:40:57 1995
***************
*** 1,5 ****
  /* $XConsortium: ct_driver.c,v 1.4 95/01/23 15:35:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c,v 3.7 1995/01/20 04:22:37 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Block <block@frc.com>
   * Modified by Mike Hollick <hollick@graphics.cis.upenn.edu>
--- 1,5 ----
  /* $XConsortium: ct_driver.c,v 1.4 95/01/23 15:35:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c,v 3.8 1995/01/28 16:11:13 dawes Exp $ */
  /*
   * Copyright 1993 by Jon Block <block@frc.com>
   * Modified by Mike Hollick <hollick@graphics.cis.upenn.edu>
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile:3.10
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile:1.1.1.2	Mon Jan 30 17:41:00 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile	Mon Jan 30 17:41:00 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:38:28 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile,v 3.8 1995/01/26 02:20:53 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cir_driver.c cir_fill.c cir_blt.c cir_bltC.c cir_im.c cir_bank.s \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:38:28 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile,v 3.10 1995/01/28 17:08:00 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cir_driver.c cir_fill.c cir_blt.c cir_bltC.c cir_im.c cir_bank.s \
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h:1.1.1.1	Mon Jan 30 17:41:01 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h	Mon Jan 30 17:41:01 1995
***************
*** 1,5 ****
  /* $XConsortium: cirBlitMM.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h,v 3.3 1994/12/25 12:34:47 dawes Exp $ */
  
  /* Definitions for BitBLT engine communication. */
  /* Using Memory-Mapped I/O. */
--- 1,5 ----
  /* $XConsortium: cirBlitMM.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h,v 3.4 1995/01/28 16:11:23 dawes Exp $ */
  
  /* Definitions for BitBLT engine communication. */
  /* Using Memory-Mapped I/O. */
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h:3.7
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h:1.1.1.2	Mon Jan 30 17:41:01 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h	Mon Jan 30 17:41:01 1995
***************
*** 1,5 ****
  /* $XConsortium: cirBlitter.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h,v 3.6 1995/01/04 04:42:18 dawes Exp $ */
  
  /* Definitions for BitBLT engine communication. */
  
--- 1,5 ----
  /* $XConsortium: cirBlitter.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h,v 3.7 1995/01/28 16:11:25 dawes Exp $ */
  
  /* Definitions for BitBLT engine communication. */
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c:1.1.1.2	Mon Jan 30 17:41:02 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c	Mon Jan 30 17:41:02 1995
***************
*** 29,35 ****
  */
  
  /* $XConsortium: cirFillRct.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c,v 3.5 1994/12/25 12:35:02 dawes Exp $ */
  
  /* Modified for Cirrus by Harm Hanemaayer, <hhanemaa@cs.ruu.nl> */
  
--- 29,35 ----
  */
  
  /* $XConsortium: cirFillRct.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c,v 3.6 1995/01/28 16:11:27 dawes Exp $ */
  
  /* Modified for Cirrus by Harm Hanemaayer, <hhanemaa@cs.ruu.nl> */
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c:1.1.1.2	Mon Jan 30 17:41:02 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c	Mon Jan 30 17:41:02 1995
***************
*** 1,5 ****
  /* $XConsortium: cirFillSt.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c,v 3.7 1995/01/04 04:42:26 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
--- 1,5 ----
  /* $XConsortium: cirFillSt.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c,v 3.8 1995/01/28 16:11:28 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h:1.1.1.1	Mon Jan 30 17:41:03 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h	Mon Jan 30 17:41:03 1995
***************
*** 1,4 ****
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h,v 3.2 1995/01/04 04:42:15 dawes Exp $ */
  
  /*
   * Definitions for video memory allocator in cir_alloc.c.
--- 1,4 ----
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_alloc.h,v 3.4 1995/01/28 16:11:30 dawes Exp $ */
  
  /*
   * Definitions for video memory allocator in cir_alloc.c.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c:3.9
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c:1.1.1.2	Mon Jan 30 17:41:04 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c	Mon Jan 30 17:41:04 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_blitter.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c,v 3.7 1995/01/26 02:20:56 dawes Exp $ */
  /*
   *
   * Copyright 1994 by H. Hanemaayer, Utrecht, The Netherlands
--- 1,5 ----
  /* $XConsortium: cir_blitter.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c,v 3.9 1995/01/28 17:08:02 dawes Exp $ */
  /*
   *
   * Copyright 1994 by H. Hanemaayer, Utrecht, The Netherlands
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c:1.1.1.2	Mon Jan 30 17:41:05 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c	Mon Jan 30 17:41:05 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_blt.c,v 1.2 94/10/13 13:21:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c,v 3.1 1994/08/20 07:36:47 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
--- 1,5 ----
  /* $XConsortium: cir_blt.c,v 1.2 94/10/13 13:21:46 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c,v 3.3 1995/01/28 17:08:04 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c:1.1.1.1	Mon Jan 30 17:41:05 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c	Mon Jan 30 17:41:05 1995
***************
*** 3,9 ****
   */
  
  /* $XConsortium: cir_blt16.c,v 1.2 95/01/27 14:47:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c,v 3.0 1994/10/30 04:22:33 dawes Exp $ */
  
  /*
  
--- 3,9 ----
   */
  
  /* $XConsortium: cir_blt16.c,v 1.2 95/01/27 14:47:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c,v 3.1 1995/01/28 16:11:35 dawes Exp $ */
  
  /*
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c:1.1.1.2	Mon Jan 30 17:41:06 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c	Mon Jan 30 17:41:06 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_bltC.c,v 1.5 95/01/23 15:35:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c,v 3.6 1995/01/18 06:14:32 dawes Exp $ */
  /*
   
  
--- 1,5 ----
  /* $XConsortium: cir_bltC.c,v 1.5 95/01/23 15:35:09 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c,v 3.8 1995/01/28 17:08:05 dawes Exp $ */
  /*
   
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c:3.7
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c:1.1.1.2	Mon Jan 30 17:41:07 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c	Mon Jan 30 17:41:07 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_colexp.c,v 1.3 95/01/05 20:47:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c,v 3.5 1994/10/20 06:11:18 dawes Exp $ */
  /*
   *
   * Copyright 1994 by H. Hanemaayer, Utrecht, The Netherlands
--- 1,5 ----
  /* $XConsortium: cir_colexp.c,v 1.3 95/01/05 20:47:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c,v 3.7 1995/01/28 17:08:07 dawes Exp $ */
  /*
   *
   * Copyright 1994 by H. Hanemaayer, Utrecht, The Netherlands
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c:3.33
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c:1.1.1.2	Mon Jan 30 17:41:10 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c	Mon Jan 30 17:41:11 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_driver.c,v 1.6 95/01/23 15:35:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c,v 3.31 1995/01/21 07:18:04 dawes Exp $ */
  /*
   * cir_driver.c,v 1.10 1994/09/14 13:59:50 scooper Exp
   *
--- 1,5 ----
  /* $XConsortium: cir_driver.c,v 1.6 95/01/23 15:35:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c,v 3.33 1995/01/28 17:08:11 dawes Exp $ */
  /*
   * cir_driver.c,v 1.10 1994/09/14 13:59:50 scooper Exp
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h:3.15
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h:1.1.1.2	Mon Jan 30 17:41:12 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h	Mon Jan 30 17:41:12 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_driver.h,v 1.5 95/01/23 15:35:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h,v 3.13 1995/01/18 06:14:40 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Simon P. Cooper, New Brunswick, New Jersey, USA.
--- 1,5 ----
  /* $XConsortium: cir_driver.h,v 1.5 95/01/23 15:35:14 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h,v 3.15 1995/01/28 17:08:14 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Simon P. Cooper, New Brunswick, New Jersey, USA.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c:1.1.1.2	Mon Jan 30 17:41:12 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c	Mon Jan 30 17:41:13 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_fill.c,v 1.3 95/01/05 20:48:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c,v 3.6 1994/12/02 05:48:16 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
--- 1,5 ----
  /* $XConsortium: cir_fill.c,v 1.3 95/01/05 20:48:33 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c,v 3.8 1995/01/28 17:08:16 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c:3.9
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c:1.1.1.2	Mon Jan 30 17:41:13 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c	Mon Jan 30 17:41:13 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_im.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c,v 3.7 1995/01/26 02:20:59 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
--- 1,5 ----
  /* $XConsortium: cir_im.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c,v 3.9 1995/01/28 17:08:17 dawes Exp $ */
  /*
   *
   * Copyright 1993 by Bill Reynolds, Santa Fe, New Mexico
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s:1.1.1.2	Mon Jan 30 17:41:14 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s	Mon Jan 30 17:41:14 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_imblt.s,v 1.4 95/01/23 15:35:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s,v 3.4 1995/01/21 07:18:08 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
--- 1,5 ----
  /* $XConsortium: cir_imblt.s,v 1.4 95/01/23 15:35:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s,v 3.6 1995/01/28 17:08:19 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c:1.1.1.1	Mon Jan 30 17:41:15 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c	Mon Jan 30 17:41:15 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  /* $XConsortium: cir_line.c,v 1.1.1.1 95/01/27 01:02:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c,v 3.0 1994/12/25 12:35:06 dawes Exp $ */
  
  /*
   * Modified: Harm Hanemaayer (hhanemaa@cs.ruu.nl)
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: cir_line.c,v 1.1.1.1 95/01/27 01:02:40 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c,v 3.2 1995/01/28 16:11:56 dawes Exp $ */
  
  /*
   * Modified: Harm Hanemaayer (hhanemaa@cs.ruu.nl)
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c:1.1.1.1	Mon Jan 30 17:41:15 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c	Mon Jan 30 17:41:15 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_orect.c,v 1.3 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c,v 3.3 1995/01/26 02:21:02 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
--- 1,5 ----
  /* $XConsortium: cir_orect.c,v 1.3 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c,v 3.4 1995/01/28 16:11:58 dawes Exp $ */
  /***********************************************************
  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c:1.1.1.1	Mon Jan 30 17:41:16 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c	Mon Jan 30 17:41:16 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_solid.c,v 1.2 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c,v 3.2 1995/01/26 02:21:03 dawes Exp $ */
  
  /*
  
--- 1,5 ----
  /* $XConsortium: cir_solid.c,v 1.2 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c,v 3.3 1995/01/28 16:12:00 dawes Exp $ */
  
  /*
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c:3.15
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c:1.1.1.2	Mon Jan 30 17:41:18 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c	Mon Jan 30 17:41:18 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_teblt8.c,v 1.7 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c,v 3.13 1995/01/26 02:21:05 dawes Exp $ */
  /*
   * TEGblt - ImageText expanded glyph fonts only.  For
   * 8 bit displays, in Copy mode with no clipping.
--- 1,5 ----
  /* $XConsortium: cir_teblt8.c,v 1.7 95/01/26 15:38:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c,v 3.15 1995/01/28 17:08:21 dawes Exp $ */
  /*
   * TEGblt - ImageText expanded glyph fonts only.  For
   * 8 bit displays, in Copy mode with no clipping.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s:1.1.1.2	Mon Jan 30 17:41:19 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s	Mon Jan 30 17:41:19 1995
***************
*** 1,5 ****
  /* $XConsortium: cir_textblt.s,v 1.4 95/01/05 20:47:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s,v 3.4 1994/10/23 13:01:01 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
--- 1,5 ----
  /* $XConsortium: cir_textblt.s,v 1.4 95/01/05 20:47:57 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s,v 3.6 1995/01/28 17:08:23 dawes Exp $ */
  /*
   *
   * Copyright 1993 by H. Hanemaayer, Utrecht, The Netherlands
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c:1.1.1.1	Mon Jan 30 17:41:20 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c	Mon Jan 30 17:41:20 1995
***************
*** 1,5 ****
  /* $XConsortium: linearline.c,v 1.2 95/01/16 13:18:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c,v 3.2 1995/01/07 04:12:08 dawes Exp $ */
  /*
   * Copyright 1994  The XFree86 Project
   *
--- 1,5 ----
  /* $XConsortium: linearline.c,v 1.2 95/01/16 13:18:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c,v 3.3 1995/01/28 16:12:06 dawes Exp $ */
  /*
   * Copyright 1994  The XFree86 Project
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h:1.1.1.1	Mon Jan 30 17:41:20 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h	Mon Jan 30 17:41:21 1995
***************
*** 1,5 ****
  /* $XConsortium: linearline.h,v 1.1 95/01/06 20:37:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h,v 3.0 1994/12/25 12:35:15 dawes Exp $ */
  
  /* linearline.c */
  extern void LinearFramebufferVerticalLine(
--- 1,5 ----
  /* $XConsortium: linearline.h,v 1.1 95/01/06 20:37:49 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h,v 3.1 1995/01/28 16:12:08 dawes Exp $ */
  
  /* linearline.c */
  extern void LinearFramebufferVerticalLine(
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile:1.1.1.1	Mon Jan 30 17:41:23 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile	Mon Jan 30 17:41:23 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:08 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:08:19 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:08 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile,v 3.1 1995/01/28 16:12:26 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cl_driver.c cl_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s:1.1.1.1	Mon Jan 30 17:41:23 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s	Mon Jan 30 17:41:23 1995
***************
*** 1,5 ****
  /* $XConsortium: cl_bank.s,v 1.1 95/01/06 20:34:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s,v 3.0 1994/12/17 10:08:20 dawes Exp $ */
  /*
   * Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: cl_bank.s,v 1.1 95/01/06 20:34:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s,v 3.1 1995/01/28 16:12:28 dawes Exp $ */
  /*
   * Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c:1.1.1.1	Mon Jan 30 17:41:24 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c	Mon Jan 30 17:41:24 1995
***************
*** 1,5 ****
  /* $XConsortium: cl_driver.c,v 1.2 95/01/16 13:18:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c,v 3.3 1995/01/12 08:52:46 dawes Exp $ */
  /*
   * Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: cl_driver.c,v 1.2 95/01/16 13:18:11 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c,v 3.4 1995/01/28 16:12:30 dawes Exp $ */
  /*
   * Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile:1.1.1.2	Mon Jan 30 17:41:25 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile	Mon Jan 30 17:41:25 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:01 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile,v 3.0 1994/05/30 08:27:29 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cpq_driver.c cpq_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:01 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile,v 3.2 1995/01/28 17:08:31 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = cpq_driver.c cpq_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c:3.7
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c:1.1.1.2	Mon Jan 30 17:41:26 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c	Mon Jan 30 17:41:26 1995
***************
*** 1,5 ****
  /* $XConsortium: cpq_driver.c,v 1.4 95/01/16 13:18:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c,v 3.5 1995/01/10 10:31:10 dawes Exp $ */
  /*
   * Copyright 1993 Hans Oey <hans@mo.hobby.nl>
   *
--- 1,5 ----
  /* $XConsortium: cpq_driver.c,v 1.4 95/01/16 13:18:12 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c,v 3.7 1995/01/28 17:08:32 dawes Exp $ */
  /*
   * Copyright 1993 Hans Oey <hans@mo.hobby.nl>
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile:1.1.1.2	Mon Jan 30 17:41:27 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile	Mon Jan 30 17:41:27 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:37 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile,v 3.0 1994/05/30 08:27:33 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et3_driver.c et3_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:37 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile,v 3.2 1995/01/28 17:08:36 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et3_driver.c et3_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c:3.7
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c:1.1.1.2	Mon Jan 30 17:41:28 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c	Mon Jan 30 17:41:28 1995
***************
*** 1,5 ****
  /* $XConsortium: et3_driver.c,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c,v 3.5 1995/01/10 10:31:16 dawes Exp $ */
  /*
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
--- 1,5 ----
  /* $XConsortium: et3_driver.c,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c,v 3.7 1995/01/28 17:08:38 dawes Exp $ */
  /*
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile:1.1.1.2	Mon Jan 30 17:41:29 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile	Mon Jan 30 17:41:29 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:49:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile,v 3.2 1994/11/19 07:58:22 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:49:40 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile,v 3.4 1995/01/28 17:08:42 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = et4_driver.c et4_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s:1.1.1.2	Mon Jan 30 17:41:30 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s	Mon Jan 30 17:41:30 1995
***************
*** 1,5 ****
  /* $XConsortium: bank.s,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s,v 3.2 1995/01/10 10:31:23 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: bank.s,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s,v 3.4 1995/01/28 17:08:43 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c:3.10
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c:1.1.1.2	Mon Jan 30 17:41:31 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c	Mon Jan 30 17:41:31 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: et4_driver.c,v 1.6 95/01/16 13:18:14 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c,v 3.8 1995/01/10 10:31:24 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /*
   * $XConsortium: et4_driver.c,v 1.6 95/01/16 13:18:14 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c,v 3.10 1995/01/28 17:08:45 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile:1.1.1.2	Mon Jan 30 17:41:34 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile	Mon Jan 30 17:41:34 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:24:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile,v 3.0 1994/05/30 08:27:40 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gvg_driver.c gvg_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:24:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile,v 3.2 1995/01/28 17:08:49 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = gvg_driver.c gvg_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c:1.1.1.2	Mon Jan 30 17:41:34 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c	Mon Jan 30 17:41:34 1995
***************
*** 1,5 ****
  /* $XConsortium: gvg_driver.c,v 1.3 95/01/16 13:18:16 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c,v 3.4 1995/01/10 10:31:39 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: gvg_driver.c,v 1.3 95/01/16 13:18:16 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c,v 3.6 1995/01/28 17:08:51 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile:1.1.1.2	Mon Jan 30 17:41:38 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile	Mon Jan 30 17:41:38 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:18 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:27:43 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:18 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile,v 3.2 1995/01/28 17:08:55 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = ncr_driver.c ncr_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c:3.7
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c:1.1.1.2	Mon Jan 30 17:41:38 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c	Mon Jan 30 17:41:39 1995
***************
*** 1,5 ****
  /* $XConsortium: ncr_driver.c,v 1.4 95/01/16 13:18:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c,v 3.5 1995/01/10 10:31:54 dawes Exp $ */
  /* Copyright 1992 NCR Corporation - Dayton, Ohio, USA */
  
  
--- 1,5 ----
  /* $XConsortium: ncr_driver.c,v 1.4 95/01/16 13:18:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c,v 3.7 1995/01/28 17:08:56 dawes Exp $ */
  /* Copyright 1992 NCR Corporation - Dayton, Ohio, USA */
  
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile:1.1.1.2	Mon Jan 30 17:41:40 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile	Mon Jan 30 17:41:40 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile,v 3.1 1994/09/22 15:51:56 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = oak_driver.c oak_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:59 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile,v 3.3 1995/01/28 17:09:00 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = oak_driver.c oak_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s:1.1.1.2	Mon Jan 30 17:41:40 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s	Mon Jan 30 17:41:40 1995
***************
*** 1,5 ****
  /* $XConsortium: oak_bank.s,v 1.3 95/01/05 20:49:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s,v 3.0 1994/10/20 06:11:59 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
--- 1,5 ----
  /* $XConsortium: oak_bank.s,v 1.3 95/01/05 20:49:58 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s,v 3.2 1995/01/28 17:09:02 dawes Exp $ */
  /*
   * Copyright 1993 by David Wexelblat <dwex@goblin.org>
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c:3.15
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c:1.1.1.2	Mon Jan 30 17:41:42 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c	Mon Jan 30 17:41:42 1995
***************
*** 1,5 ****
  /* $XConsortium: oak_driver.c,v 1.6 95/01/23 15:35:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c,v 3.12 1995/01/21 07:18:44 dawes Exp $ */
  /*
   * Copyright 1994 by Jorge Delgado <ernar@dit.upm.es>
   *
--- 1,5 ----
  /* $XConsortium: oak_driver.c,v 1.6 95/01/23 15:35:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c,v 3.15 1995/01/28 17:09:05 dawes Exp $ */
  /*
   * Copyright 1994 by Jorge Delgado <ernar@dit.upm.es>
   *
***************
*** 169,174 ****
--- 169,182 ----
  static void     OAKRestore();
  static void     OAKAdjust();
  
+ #if 0
+ static void     OAKSaveScreen();
+ static void     OAKGetMode();
+ 
+ static void     OAKFbInit();
+ #endif
+ 
+ 
  /*
   * These are the bank select functions.  There are defined in oak_bank.s
   */
***************
*** 247,254 ****
     * This is a dummy initialization for the set of vendor/option flags
     * that this driver supports.  It gets filled in properly in the
     * probe function, if the probe succeeds (assuming the driver
! 					    * supports any such flags).
! 					    */
    {0,},
    /*
     * This specifies how the virtual width is to be rounded.  The
--- 255,262 ----
     * This is a dummy initialization for the set of vendor/option flags
     * that this driver supports.  It gets filled in properly in the
     * probe function, if the probe succeeds (assuming the driver
!    * supports any such flags).
!    */
    {0,},
    /*
     * This specifies how the virtual width is to be rounded.  The
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile:1.1.1.2	Mon Jan 30 17:41:44 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile	Mon Jan 30 17:41:44 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:26:38 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile,v 3.4 1994/09/22 15:52:01 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = pvg_driver.c pvg_bank.s pvgablt.c pvgasolid.c pvgaBitBlt.c \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:26:38 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile,v 3.6 1995/01/28 17:09:10 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = pvg_driver.c pvg_bank.s pvgablt.c pvgasolid.c pvgaBitBlt.c \
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s:1.1.1.2	Mon Jan 30 17:41:45 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s	Mon Jan 30 17:41:45 1995
***************
*** 1,5 ****
  /* $XConsortium: bank.s,v 1.3 94/10/13 13:26:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s,v 3.2 1994/08/01 12:18:11 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: bank.s,v 1.3 94/10/13 13:26:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s,v 3.4 1995/01/28 17:09:11 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h:1.1.1.2	Mon Jan 30 17:41:46 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h	Mon Jan 30 17:41:46 1995
***************
*** 1,5 ****
  /* $XConsortium: paradise.h,v 1.2 94/10/13 13:26:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h,v 3.0 1994/07/24 11:57:00 dawes Exp $ */
  /* Author: Mike Tierney <floyd@eng.umd.edu> */
  
  /* Modified by: Bill Morgart <wsm@morticia.ssw.com> */
--- 1,5 ----
  /* $XConsortium: paradise.h,v 1.2 94/10/13 13:26:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h,v 3.2 1995/01/28 17:09:12 dawes Exp $ */
  /* Author: Mike Tierney <floyd@eng.umd.edu> */
  
  /* Modified by: Bill Morgart <wsm@morticia.ssw.com> */
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c:3.15
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c:1.1.1.2	Mon Jan 30 17:41:47 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c	Mon Jan 30 17:41:47 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: pvg_driver.c,v 1.5 95/01/16 13:18:21 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c,v 3.13 1995/01/14 10:48:56 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /*
   * $XConsortium: pvg_driver.c,v 1.5 95/01/16 13:18:21 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c,v 3.15 1995/01/28 17:09:14 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c:1.1.1.2	Mon Jan 30 17:41:48 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c	Mon Jan 30 17:41:48 1995
***************
*** 1,5 ****
  /* $XConsortium: pvgaBitBlt.c,v 1.4 95/01/23 15:35:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c,v 3.2 1995/01/18 11:00:12 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: pvgaBitBlt.c,v 1.4 95/01/23 15:35:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c,v 3.4 1995/01/28 17:09:16 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c:1.1.1.2	Mon Jan 30 17:41:49 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c	Mon Jan 30 17:41:49 1995
***************
*** 1,5 ****
  /* $XConsortium: pvgablt.c,v 1.6 95/01/23 15:35:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c,v 3.2 1995/01/19 05:25:20 dawes Exp $ */
  /*
   * cfb copy area
   */
--- 1,5 ----
  /* $XConsortium: pvgablt.c,v 1.6 95/01/23 15:35:20 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c,v 3.4 1995/01/28 17:09:17 dawes Exp $ */
  /*
   * cfb copy area
   */
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c:1.1.1.2	Mon Jan 30 17:41:49 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c	Mon Jan 30 17:41:50 1995
***************
*** 1,5 ****
  /* $XConsortium: pvgapntwin.c,v 1.4 95/01/16 13:18:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c,v 3.1 1995/01/14 10:49:03 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: pvgapntwin.c,v 1.4 95/01/16 13:18:24 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c,v 3.3 1995/01/28 17:09:18 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c:1.1.1.2	Mon Jan 30 17:41:50 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c	Mon Jan 30 17:41:51 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: pvgasolid.c,v 1.6 94/10/13 13:26:38 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c,v 3.0 1994/07/24 11:57:07 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: pvgasolid.c,v 1.6 94/10/13 13:26:38 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c,v 3.2 1995/01/28 17:09:19 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile:1.1.1.2	Mon Jan 30 17:41:56 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile	Mon Jan 30 17:41:56 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:27:09 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile,v 3.1 1994/05/30 11:32:38 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:27:09 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile,v 3.3 1995/01/28 17:09:26 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = t89_driver.c t89_bank.s
diff -c xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c:1.1.1.2	Mon Jan 30 17:41:57 1995
--- xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c	Mon Jan 30 17:41:57 1995
***************
*** 1,5 ****
  /* $XConsortium: t89_driver.c,v 1.4 95/01/16 13:18:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c,v 3.6 1995/01/10 10:33:16 dawes Exp $ */
  /*
   * Copyright 1992 by Alan Hourihane, Wigan, England.
   *
--- 1,5 ----
  /* $XConsortium: t89_driver.c,v 1.4 95/01/16 13:18:25 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c,v 3.8 1995/01/28 17:09:27 dawes Exp $ */
  /*
   * Copyright 1992 by Alan Hourihane, Wigan, England.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c:1.1.1.2	Mon Jan 30 17:42:04 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c	Mon Jan 30 17:42:04 1995
***************
*** 1,5 ****
  /* $XConsortium: SpeedUpBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c,v 3.0 1994/07/24 11:58:09 dawes Exp $ */
  /*******************************************************************************
                          Copyr 1992 by Glenn G. Lai
  
--- 1,5 ----
  /* $XConsortium: SpeedUpBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c,v 3.2 1995/01/28 17:09:32 dawes Exp $ */
  /*******************************************************************************
                          Copyr 1992 by Glenn G. Lai
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s:1.1.1.2	Mon Jan 30 17:42:05 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s	Mon Jan 30 17:42:05 1995
***************
*** 1,5 ****
  /* $XConsortium: fFill.s,v 1.4 95/01/05 20:50:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s,v 3.2 1994/10/21 11:24:24 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: fFill.s,v 1.4 95/01/05 20:50:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s,v 3.4 1995/01/28 17:09:34 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s:1.1.1.2	Mon Jan 30 17:42:05 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s	Mon Jan 30 17:42:06 1995
***************
*** 1,5 ****
  /* $XConsortium: fFillSet.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s,v 3.1 1994/09/08 14:40:36 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: fFillSet.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s,v 3.3 1995/01/28 17:09:35 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s:3.5
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s:1.1.1.2	Mon Jan 30 17:42:06 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s	Mon Jan 30 17:42:06 1995
***************
*** 1,5 ****
  /* $XConsortium: fLineBres.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s,v 3.3 1994/09/21 10:59:42 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
--- 1,5 ----
  /* $XConsortium: fLineBres.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s,v 3.5 1995/01/28 17:09:36 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s:1.1.1.2	Mon Jan 30 17:42:07 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s	Mon Jan 30 17:42:07 1995
***************
*** 1,5 ****
  /* $XConsortium: fLineH.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s,v 3.2 1994/09/21 10:59:43 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
--- 1,5 ----
  /* $XConsortium: fLineH.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s,v 3.4 1995/01/28 17:09:38 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s:1.1.1.2	Mon Jan 30 17:42:07 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s	Mon Jan 30 17:42:07 1995
***************
*** 1,5 ****
  /* $XConsortium: fLineV.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s,v 3.2 1994/09/21 10:59:44 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
--- 1,5 ----
  /* $XConsortium: fLineV.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s,v 3.4 1995/01/28 17:09:39 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c:1.1.1.2	Mon Jan 30 17:42:08 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c	Mon Jan 30 17:42:08 1995
***************
*** 1,5 ****
  /* $XConsortium: gBanks.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c,v 3.0 1994/07/24 11:58:14 dawes Exp $ */
  /*******************************************************************************
  			Copyright 1992 by Glenn G. Lai 
  
--- 1,5 ----
  /* $XConsortium: gBanks.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c,v 3.2 1995/01/28 17:09:40 dawes Exp $ */
  /*******************************************************************************
  			Copyright 1992 by Glenn G. Lai 
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c:1.1.1.2	Mon Jan 30 17:42:08 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c	Mon Jan 30 17:42:08 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaBitBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c,v 3.0 1994/07/24 11:58:16 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vgaBitBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c,v 3.2 1995/01/28 17:09:42 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h:3.4
*** xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h:1.1.1.2	Mon Jan 30 17:42:09 1995
--- xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h	Mon Jan 30 17:42:09 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaFasm.h,v 1.3 95/01/05 20:50:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h,v 3.2 1994/10/21 11:24:26 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
--- 1,5 ----
  /* $XConsortium: vgaFasm.h,v 1.3 95/01/05 20:50:47 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h,v 3.4 1995/01/28 17:09:43 dawes Exp $ */
  /* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
  
  		All Rights Reserved
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile:3.6
*** xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile:1.1.1.2	Mon Jan 30 17:42:13 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile	Mon Jan 30 17:42:13 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:41:36 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile,v 3.4 1995/01/26 02:21:32 dawes Exp $
  #include <Server.tmpl>
  
  FSRCS =  fBitBlt.s fFillCopy.s fFillOr.s fFillAnd.s \
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:41:36 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile,v 3.6 1995/01/28 17:09:54 dawes Exp $
  #include <Server.tmpl>
  
  FSRCS =  fBitBlt.s fFillCopy.s fFillOr.s fFillAnd.s \
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c:3.30
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c:1.1.1.2	Mon Jan 30 17:42:14 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c	Mon Jan 30 17:42:14 1995
***************
*** 1,5 ****
  /* $XConsortium: vga.c,v 1.6 95/01/16 13:18:27 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c,v 3.28 1995/01/11 03:52:41 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vga.c,v 1.6 95/01/16 13:18:27 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c,v 3.30 1995/01/28 17:09:56 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h:3.8
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h:1.1.1.2	Mon Jan 30 17:42:14 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h	Mon Jan 30 17:42:14 1995
***************
*** 1,5 ****
  /* $XConsortium: vga.h,v 1.4 95/01/16 13:18:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h,v 3.6 1995/01/10 10:35:38 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vga.h,v 1.4 95/01/16 13:18:28 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h,v 3.8 1995/01/28 17:09:58 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c:1.1.1.1	Mon Jan 30 17:42:15 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c	Mon Jan 30 17:42:15 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: vga8cppl.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c,v 3.0 1994/07/24 11:58:40 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: vga8cppl.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga8cppl.c,v 3.1 1995/01/28 16:14:11 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h:1.1.1.2	Mon Jan 30 17:42:16 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h	Mon Jan 30 17:42:16 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaAsm.h,v 1.3 95/01/13 20:13:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgAsm.h,v 3.0 1994/11/26 12:48:16 dawes Exp $ */
  
  /* Definitions for VGA bank assembler routines */
  
--- 1,5 ----
  /* $XConsortium: vgaAsm.h,v 1.3 95/01/13 20:13:39 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h,v 3.2 1995/01/28 17:09:59 dawes Exp $ */
  
  /* Definitions for VGA bank assembler routines */
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h:1.1.1.2	Mon Jan 30 17:42:16 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h	Mon Jan 30 17:42:16 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaBank.h,v 1.4 95/01/05 20:51:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h,v 3.1 1994/11/26 12:48:17 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vgaBank.h,v 1.4 95/01/05 20:51:38 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h,v 3.3 1995/01/28 17:10:01 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s:1.1.1.2	Mon Jan 30 17:42:17 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s	Mon Jan 30 17:42:17 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaBank.s,v 1.3 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s,v 3.1 1994/05/06 08:27:17 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vgaBank.s,v 1.3 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s,v 3.3 1995/01/28 17:10:02 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c:1.1.1.2	Mon Jan 30 17:42:17 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c	Mon Jan 30 17:42:17 1995
***************
*** 1,5 ****
  /* $XConsortium: vgaCmap.c,v 1.2 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c,v 3.1 1994/08/01 13:20:24 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,5 ----
  /* $XConsortium: vgaCmap.c,v 1.2 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c,v 3.3 1995/01/28 17:10:05 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c:1.1.1.2 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c:3.17
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c:1.1.1.2	Mon Jan 30 17:42:18 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c	Mon Jan 30 17:42:18 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: vgaHW.c,v 1.6 95/01/06 20:59:04 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c,v 3.15 1994/12/29 10:21:23 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
--- 1,6 ----
  /*
   * $XConsortium: vgaHW.c,v 1.6 95/01/06 20:59:04 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c,v 3.17 1995/01/28 17:10:06 dawes Exp $
   *
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c:1.1.1.1	Mon Jan 30 17:42:19 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c	Mon Jan 30 17:42:19 1995
***************
*** 31,37 ****
  
  */
  /* $XConsortium: vgabitblt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c,v 3.0 1994/07/24 11:58:45 dawes Exp $ */
  
  #include	"vga256.h"
  #include	"fastblt.h"
--- 31,37 ----
  
  */
  /* $XConsortium: vgabitblt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabitblt.c,v 3.1 1995/01/28 16:14:20 dawes Exp $ */
  
  #include	"vga256.h"
  #include	"fastblt.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c:1.1.1.1	Mon Jan 30 17:42:19 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c	Mon Jan 30 17:42:20 1995
***************
*** 1,5 ****
  /* $XConsortium: vgablt.c,v 1.2 95/01/16 20:08:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c,v 3.0 1994/07/24 11:58:46 dawes Exp $ */
  /*
   * cfb copy area
   */
--- 1,5 ----
  /* $XConsortium: vgablt.c,v 1.2 95/01/16 20:08:17 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgablt.c,v 3.1 1995/01/28 16:14:22 dawes Exp $ */
  /*
   * cfb copy area
   */
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c:1.1.1.1	Mon Jan 30 17:42:20 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c	Mon Jan 30 17:42:20 1995
***************
*** 1,5 ****
  /* $XConsortium: vgabresd.c,v 1.2 95/01/13 20:15:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c,v 3.0 1994/07/24 11:58:49 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgabresd.c,v 1.2 95/01/13 20:15:15 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabresd.c,v 3.1 1995/01/28 16:14:23 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c:1.1.1.1	Mon Jan 30 17:42:21 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c	Mon Jan 30 17:42:21 1995
***************
*** 1,5 ****
  /* $XConsortium: vgabstore.c,v 1.2 95/01/13 20:16:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c,v 3.0 1994/07/24 11:58:50 dawes Exp $ */
  /*
   * This file was derived from cfbbstore.c.
   */
--- 1,5 ----
  /* $XConsortium: vgabstore.c,v 1.2 95/01/13 20:16:13 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgabstore.c,v 3.2 1995/01/28 16:14:25 dawes Exp $ */
  /*
   * This file was derived from cfbbstore.c.
   */
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c:1.1.1.1	Mon Jan 30 17:42:21 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c	Mon Jan 30 17:42:21 1995
***************
*** 26,32 ****
  ********************************************************/
  
  /* $XConsortium: vgafillarc.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c,v 3.0 1994/07/24 11:58:51 dawes Exp $ */
  
  #include "vga256.h"
  #include "mifillarc.h"
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: vgafillarc.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillarc.c,v 3.1 1995/01/28 16:14:26 dawes Exp $ */
  
  #include "vga256.h"
  #include "mifillarc.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c:1.1.1.1	Mon Jan 30 17:42:22 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c	Mon Jan 30 17:42:22 1995
***************
*** 29,35 ****
  */
  
  /* $XConsortium: vgafillrct.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c,v 3.0 1994/07/24 11:58:53 dawes Exp $ */
  
  #include "vga256.h"
  #include "cfbrrop.h"
--- 29,35 ----
  */
  
  /* $XConsortium: vgafillrct.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillrct.c,v 3.1 1995/01/28 16:14:27 dawes Exp $ */
  
  #include "vga256.h"
  #include "cfbrrop.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c:1.1.1.1	Mon Jan 30 17:42:22 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c	Mon Jan 30 17:42:22 1995
***************
*** 1,5 ****
  /* $XConsortium: vgafillsp.c,v 1.2 95/01/13 20:17:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c,v 3.0 1994/07/24 11:58:54 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,5 ----
  /* $XConsortium: vgafillsp.c,v 1.2 95/01/13 20:17:08 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgafillsp.c,v 3.1 1995/01/28 16:14:29 dawes Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c:1.1.1.1	Mon Jan 30 17:42:23 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c	Mon Jan 30 17:42:23 1995
***************
*** 1,5 ****
  /* $XConsortium: vgagc.c,v 1.3 95/01/13 20:17:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c,v 3.1 1994/12/25 12:36:06 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgagc.c,v 1.3 95/01/13 20:17:37 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgagc.c,v 3.2 1995/01/28 16:14:31 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c:1.1.1.1	Mon Jan 30 17:42:24 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c	Mon Jan 30 17:42:24 1995
***************
*** 1,5 ****
  /* $XConsortium: vgagetsp.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c,v 3.0 1994/07/24 11:58:58 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgagetsp.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgagetsp.c,v 3.1 1995/01/28 16:14:32 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c:1.1.1.1	Mon Jan 30 17:42:24 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c	Mon Jan 30 17:42:24 1995
***************
*** 29,35 ****
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: vgaglblt8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c,v 3.0 1994/07/24 11:58:59 dawes Exp $ */
  
  #include	"vga256.h"
  
--- 29,35 ----
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: vgaglblt8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaglblt8.c,v 3.1 1995/01/28 16:14:34 dawes Exp $ */
  
  #include	"vga256.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c:1.1.1.1	Mon Jan 30 17:42:25 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c	Mon Jan 30 17:42:25 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  /* $XConsortium: vgaimage.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c,v 3.0 1994/07/24 11:59:00 dawes Exp $ */
  
  #include "vga256.h"
  
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: vgaimage.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaimage.c,v 3.1 1995/01/28 16:14:35 dawes Exp $ */
  
  #include "vga256.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c:3.3
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c:1.1.1.1	Mon Jan 30 17:42:25 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c	Mon Jan 30 17:42:26 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  /* $XConsortium: vgaline.c,v 1.1.1.3 95/01/13 20:20:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c,v 3.2 1994/10/23 13:01:28 dawes Exp $ */
  
  #include "vga256.h"
  #include "miline.h"
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: vgaline.c,v 1.1.1.3 95/01/13 20:20:59 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaline.c,v 3.3 1995/01/28 16:14:36 dawes Exp $ */
  
  #include "vga256.h"
  #include "miline.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c:1.1.1.1	Mon Jan 30 17:42:26 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c	Mon Jan 30 17:42:26 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  /* $XConsortium: vgalined.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c,v 3.0 1994/07/24 11:59:03 dawes Exp $ */
  
  #include "vga256.h"
  #include "miline.h"
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: vgalined.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgalined.c,v 3.1 1995/01/28 16:14:38 dawes Exp $ */
  
  #include "vga256.h"
  #include "miline.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c:1.1.1.1	Mon Jan 30 17:42:26 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c	Mon Jan 30 17:42:27 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: vgaply1rct.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c,v 3.0 1994/07/24 11:59:04 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: vgaply1rct.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaply1rct.c,v 3.1 1995/01/28 16:14:39 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c:1.1.1.1	Mon Jan 30 17:42:27 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c	Mon Jan 30 17:42:27 1995
***************
*** 1,5 ****
  /* $XConsortium: vgapntwin.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c,v 3.0 1994/07/24 11:59:06 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgapntwin.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapntwin.c,v 3.1 1995/01/28 16:14:41 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c:1.1.1.1	Mon Jan 30 17:42:27 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c	Mon Jan 30 17:42:28 1995
***************
*** 26,32 ****
  ********************************************************/
  
  /* $XConsortium: vgapolypnt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c,v 3.0 1994/07/24 11:59:09 dawes Exp $ */
  
  #include "vga256.h"
  
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: vgapolypnt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapolypnt.c,v 3.1 1995/01/28 16:14:42 dawes Exp $ */
  
  #include "vga256.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c:1.1.1.1	Mon Jan 30 17:42:28 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c	Mon Jan 30 17:42:28 1995
***************
*** 28,34 ****
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: vgapush8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c,v 3.0 1994/07/24 11:59:11 dawes Exp $ */
  
  #include	"vga256.h"
  
--- 28,34 ----
  in this Software without prior written authorization from the X Consortium.
  */
  /* $XConsortium: vgapush8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapush8.c,v 3.1 1995/01/28 16:14:43 dawes Exp $ */
  
  #include	"vga256.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c:1.1.1.1	Mon Jan 30 17:42:28 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c	Mon Jan 30 17:42:28 1995
***************
*** 1,5 ****
  /* $XConsortium: vgapwinS.c,v 1.1 95/01/26 15:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c,v 3.0 1994/07/24 11:59:07 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgapwinS.c,v 1.1 95/01/26 15:06:18 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c,v 3.1 1995/01/28 16:14:45 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c:1.1.1.1	Mon Jan 30 17:42:29 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c	Mon Jan 30 17:42:29 1995
***************
*** 1,5 ****
  /* $XConsortium: vgarctstp8.c,v 1.2 95/01/13 20:23:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c,v 3.0 1994/07/24 11:59:13 dawes Exp $ */
  /*
   * Fill 32 bit stippled rectangles for 8 bit frame buffers
   */
--- 1,5 ----
  /* $XConsortium: vgarctstp8.c,v 1.2 95/01/13 20:23:30 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgarctstp8.c,v 3.1 1995/01/28 16:14:46 dawes Exp $ */
  /*
   * Fill 32 bit stippled rectangles for 8 bit frame buffers
   */
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c:3.2
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c:1.1.1.1	Mon Jan 30 17:42:29 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c	Mon Jan 30 17:42:29 1995
***************
*** 27,33 ****
  
  ********************************************************/
  /* $XConsortium: vgascrinit.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c,v 3.1 1994/09/11 07:43:40 dawes Exp $ */
  
  #include "vga256.h"
  #include "mibstore.h"
--- 27,33 ----
  
  ********************************************************/
  /* $XConsortium: vgascrinit.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgascrinit.c,v 3.2 1995/01/28 16:14:48 dawes Exp $ */
  
  #include "vga256.h"
  #include "mibstore.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c:1.1.1.1	Mon Jan 30 17:42:30 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c	Mon Jan 30 17:42:30 1995
***************
*** 1,5 ****
  /* $XConsortium: vgasetsp.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c,v 3.0 1994/07/24 11:59:16 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgasetsp.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgasetsp.c,v 3.1 1995/01/28 16:14:49 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c:1.1.1.1	Mon Jan 30 17:42:30 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c	Mon Jan 30 17:42:30 1995
***************
*** 1,6 ****
  /*
   * $XConsortium: vgasolid.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c,v 3.0 1994/07/24 11:59:17 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,6 ----
  /*
   * $XConsortium: vgasolid.c,v 1.1 94/10/13 13:04:50 kaleb Exp $
!  * $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgasolid.c,v 3.1 1995/01/28 16:14:50 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c:1.1.1.1	Mon Jan 30 17:42:31 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c	Mon Jan 30 17:42:31 1995
***************
*** 30,36 ****
  */
  
  /* $XConsortium: vgateblt8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c,v 3.0 1994/07/24 11:59:19 dawes Exp $ */
  
  #include	"vga256.h"
  
--- 30,36 ----
  */
  
  /* $XConsortium: vgateblt8.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgateblt8.c,v 3.1 1995/01/28 16:14:52 dawes Exp $ */
  
  #include	"vga256.h"
  
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c:1.1.1.1	Mon Jan 30 17:42:31 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c	Mon Jan 30 17:42:31 1995
***************
*** 1,5 ****
  /* $XConsortium: vgategblt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c,v 3.0 1994/07/24 11:59:20 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgategblt.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgategblt.c,v 3.1 1995/01/28 16:14:54 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c:1.1.1.1	Mon Jan 30 17:42:32 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c	Mon Jan 30 17:42:32 1995
***************
*** 30,36 ****
  */
  
  /* $XConsortium: vgatile32.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c,v 3.0 1994/07/24 11:59:22 dawes Exp $ */
  
  #include "vga256.h"
  #include "mergerop.h"
--- 30,36 ----
  */
  
  /* $XConsortium: vgatile32.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgatile32.c,v 3.1 1995/01/28 16:14:55 dawes Exp $ */
  
  #include "vga256.h"
  #include "mergerop.h"
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c:1.1.1.1	Mon Jan 30 17:42:32 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c	Mon Jan 30 17:42:33 1995
***************
*** 1,5 ****
  /* $XConsortium: vgatileodd.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c,v 3.0 1994/07/24 11:59:23 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /* $XConsortium: vgatileodd.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgatileodd.c,v 3.1 1995/01/28 16:14:57 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c:1.1.1.1	Mon Jan 30 17:42:33 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c	Mon Jan 30 17:42:33 1995
***************
*** 1,5 ****
  /* $XConsortium: vgawindow.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c,v 3.0 1994/07/24 11:59:26 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /* $XConsortium: vgawindow.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgawindow.c,v 3.1 1995/01/28 16:14:58 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c:3.1
*** xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c:1.1.1.1	Mon Jan 30 17:42:33 1995
--- xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c	Mon Jan 30 17:42:33 1995
***************
*** 26,32 ****
  ********************************************************/
  
  /* $XConsortium: vgazerarc.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c,v 3.0 1994/07/24 11:59:27 dawes Exp $ */
  
  /* Derived from:
   * "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: vgazerarc.c,v 1.1 94/10/13 13:04:50 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgazerarc.c,v 3.1 1995/01/28 16:15:00 dawes Exp $ */
  
  /* Derived from:
   * "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
diff -c xc/programs/Xserver/hw/xfree86/xf86config/Cards:1.1.1.1 xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.7
*** xc/programs/Xserver/hw/xfree86/xf86config/Cards:1.1.1.1	Mon Jan 30 17:42:37 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/Cards	Mon Jan 30 17:42:37 1995
***************
*** 19,25 ****
  # chipset/server and untested.
  # 
  # $XConsortium: Cards,v 1.3 95/01/23 15:35:21 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.6 1995/01/23 01:33:04 dawes Exp $
  
  # Cirrus Logic
  
--- 19,25 ----
  # chipset/server and untested.
  # 
  # $XConsortium: Cards,v 1.3 95/01/23 15:35:21 kaleb Exp $
! # $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.7 1995/01/28 16:15:15 dawes Exp $
  
  # Cirrus Logic
  
diff -c xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:1.1.1.1 xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.2
*** xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:1.1.1.1	Mon Jan 30 17:42:38 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/Imakefile	Mon Jan 30 17:42:38 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:59:07 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.1 1995/01/02 05:02:57 dawes Exp $
  
              SRCS = xf86config.c cards.c
              OBJS = xf86config.o cards.o
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:59:07 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.2 1995/01/28 16:15:17 dawes Exp $
  
              SRCS = xf86config.c cards.c
              OBJS = xf86config.o cards.o
***************
*** 8,13 ****
        CARDDBFILE = $(LIBDIR)/Cards
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"'
  
! InstallNonExecFile(Cards,$(LIBDIR))
! ComplexProgramTarget(xf86config)
  
--- 8,14 ----
        CARDDBFILE = $(LIBDIR)/Cards
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"'
  
! ComplexProgramTargetNoMan(xf86config)
  
+ InstallNonExecFile(Cards,$(LIBDIR))
+ InstallManPageLong(xf86conf,$(MANDIR),xf86config)
diff -c xc/programs/Xserver/hw/xfree86/xf86config/cards.c:1.1.1.1 xc/programs/Xserver/hw/xfree86/xf86config/cards.c:3.3
*** xc/programs/Xserver/hw/xfree86/xf86config/cards.c:1.1.1.1	Mon Jan 30 17:42:38 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/cards.c	Mon Jan 30 17:42:38 1995
***************
*** 1,5 ****
  /* $XConsortium: cards.c,v 1.3 95/01/23 15:35:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.2 1995/01/23 01:33:07 dawes Exp $ */
  
  /*
   *  Functions to manipulate card database.
--- 1,5 ----
  /* $XConsortium: cards.c,v 1.3 95/01/23 15:35:22 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.3 1995/01/28 16:15:18 dawes Exp $ */
  
  /*
   *  Functions to manipulate card database.
diff -c xc/programs/Xserver/hw/xfree86/xf86config/cards.h:1.1.1.1 xc/programs/Xserver/hw/xfree86/xf86config/cards.h:3.1
*** xc/programs/Xserver/hw/xfree86/xf86config/cards.h:1.1.1.1	Mon Jan 30 17:42:38 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/cards.h	Mon Jan 30 17:42:38 1995
***************
*** 1,5 ****
  /* $XConsortium: cards.h,v 1.1 95/01/06 20:53:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.0 1995/01/02 05:02:59 dawes Exp $ */
  
  #ifndef CARD_DATABASE_FILE
  #define CARD_DATABASE_FILE "Cards"
--- 1,5 ----
  /* $XConsortium: cards.h,v 1.1 95/01/06 20:53:10 kaleb Exp $ */
! /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.1 1995/01/28 16:15:19 dawes Exp $ */
  
  #ifndef CARD_DATABASE_FILE
  #define CARD_DATABASE_FILE "Cards"
diff -c /dev/null xc/programs/Xserver/hw/xfree86/xf86config/xf86conf.man:3.1
*** /dev/null	Mon Jan 30 17:42:39 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/xf86conf.man	Mon Jan 30 17:42:39 1995
***************
*** 0 ****
--- 1,15 ----
+ .\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86conf.man,v 3.1 1995/01/15 10:35:54 dawes Exp $
+ .TH xf86config 1 "Version 3.1.1" "XFree86"
+ .SH NAME
+ xf86config \- generate an XF86Config file
+ .SH SYNOPSIS
+ .B xf86config
+ .SH DESCRIPTION
+ \fIxf86config\fP is an interactive program for generating an XF86Config file
+ for use with XFree86 X servers.
+ .SH FILES
+ <xroot>/lib/X11/Cards            Video cards database
+ .SH "SEE ALSO"
+ XFree86(1), XF86Config(4/5), reconfig(1)
+ .SH AUTHOR
+ Harm Hanemaayer.
diff -c xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:1.1.1.1 xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:removed
*** xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:1.1.1.1	Mon Jan 30 17:42:41 1995
--- xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man	Mon Jan 30 17:42:41 1995
***************
*** 1,15 ****
- .\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86conf.man,v 3.1 1995/01/15 10:35:54 dawes Exp $
- .TH xf86config 1 "Version 3.1.1" "XFree86"
- .SH NAME
- xf86config \- generate an XF86Config file
- .SH SYNOPSIS
- .B xf86config
- .SH DESCRIPTION
- \fIxf86config\fP is an interactive program for generating an XF86Config file
- for use with XFree86 X servers.
- .SH FILES
- <xroot>/lib/X11/Cards            Video cards database
- .SH "SEE ALSO"
- XFree86(1), XF86Config(4/5), reconfig(1)
- .SH AUTHOR
- Harm Hanemaayer.
--- 0 ----
diff -c xc/programs/Xserver/hw/xnest/Imakefile:1.1.1.2 xc/programs/Xserver/hw/xnest/Imakefile:3.1
*** xc/programs/Xserver/hw/xnest/Imakefile:1.1.1.2	Mon Jan 30 17:42:44 1995
--- xc/programs/Xserver/hw/xnest/Imakefile	Mon Jan 30 17:42:44 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3.1.1 95/01/16 15:55:48 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.1 1995/01/28 16:15:26 dawes Exp $
  #include <Server.tmpl>
  
  SRCS = 	Args.c \
diff -c xc/programs/Xserver/hw/xnest/TestExt.c:1.1.1.1 xc/programs/Xserver/hw/xnest/TestExt.c:3.0
*** xc/programs/Xserver/hw/xnest/TestExt.c:1.1.1.1	Mon Jan 30 17:42:45 1995
--- xc/programs/Xserver/hw/xnest/TestExt.c	Mon Jan 30 17:42:45 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: TestExt.c,v 1.2 93/09/23 18:57:14 rws Exp $ */
+ /* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.0 1994/05/21 23:57:56 dawes Exp $ */
  /*
  
  Copyright 1993 by Davor Matic
***************
*** 14,19 ****
--- 15,21 ----
  */
  #include "X.h"
  #include "Xproto.h"
+ #include "Xlib.h"
  #include "screenint.h"
  #include "input.h"
  #include "misc.h"
diff -c xc/programs/Xserver/include/Imakefile:1.1.1.1 xc/programs/Xserver/include/Imakefile:3.3
*** xc/programs/Xserver/include/Imakefile:1.1.1.1	Mon Jan 30 17:42:48 1995
--- xc/programs/Xserver/include/Imakefile	Mon Jan 30 17:42:48 1995
***************
*** 1,5 ****
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/13 20:28:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.2 1994/12/02 05:48:52 dawes Exp $
  
  all::
  
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.2 95/01/13 20:28:14 kaleb Exp $
! XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.3 1995/01/28 16:15:32 dawes Exp $
  
  all::
  
diff -c xc/programs/Xserver/include/dix.h:1.1.1.2 xc/programs/Xserver/include/dix.h:3.1
*** xc/programs/Xserver/include/dix.h:1.1.1.2	Mon Jan 30 17:42:49 1995
--- xc/programs/Xserver/include/dix.h	Mon Jan 30 17:42:49 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: dix.h,v 1.82 94/12/02 19:15:52 mor Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/dix.h,v 3.1 1995/01/14 10:49:23 dawes Exp $ */
  
  #ifndef DIX_H
  #define DIX_H
***************
*** 167,173 ****
  #define _XTYPEDEF_CLIENTPTR
  #endif
  
! #ifdef LBX
  typedef struct _ClientPublic {
      int             (*writeToClient) ();
      int             (*uncompressedWriteToClient) ();
--- 168,174 ----
  #define _XTYPEDEF_CLIENTPTR
  #endif
  
! #if defined(LBX) || defined(LBX_COMPAT)
  typedef struct _ClientPublic {
      int             (*writeToClient) ();
      int             (*uncompressedWriteToClient) ();
***************
*** 179,185 ****
  #define UncompressedWriteToClient(client,len,buf)   (((client)->public.uncompressedWriteToClient)(client,len,buf))
  #define ReadRequestFromClient(client)   ((client)->public.readRequest(client))
  #define RequestLength(r,client,g,p)           (*(client)->public.requestLength) (r,client,g,p)
! #endif /* LBX */
  
  typedef struct _WorkQueue	*WorkQueuePtr;
  
--- 180,186 ----
  #define UncompressedWriteToClient(client,len,buf)   (((client)->public.uncompressedWriteToClient)(client,len,buf))
  #define ReadRequestFromClient(client)   ((client)->public.readRequest(client))
  #define RequestLength(r,client,g,p)           (*(client)->public.requestLength) (r,client,g,p)
! #endif /* LBX || LBX_COMPAT */
  
  typedef struct _WorkQueue	*WorkQueuePtr;
  
diff -c xc/programs/Xserver/include/dixstruct.h:1.1.1.1 xc/programs/Xserver/include/dixstruct.h:3.0
*** xc/programs/Xserver/include/dixstruct.h:1.1.1.1	Mon Jan 30 17:42:49 1995
--- xc/programs/Xserver/include/dixstruct.h	Mon Jan 30 17:42:49 1995
***************
*** 21,26 ****
--- 21,27 ----
  
  ******************************************************************/
  /* $XConsortium: dixstruct.h,v 1.33 94/04/17 20:25:40 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.0 1994/12/25 12:36:41 dawes Exp $ */
  
  #ifndef DIXSTRUCT_H
  #define DIXSTRUCT_H
***************
*** 99,105 ****
      unsigned char requestLog[MAX_REQUEST_LOG];
      int         requestLogIndex;
  #endif
! #ifdef LBX
      ClientPublicRec public;
      int         lbxIndex;
  #endif
--- 100,106 ----
      unsigned char requestLog[MAX_REQUEST_LOG];
      int         requestLogIndex;
  #endif
! #if defined(LBX) || defined(LBX_COMPAT)
      ClientPublicRec public;
      int         lbxIndex;
  #endif
diff -c xc/programs/Xserver/include/misc.h:1.1.1.1 xc/programs/Xserver/include/misc.h:3.1
*** xc/programs/Xserver/include/misc.h:1.1.1.1	Mon Jan 30 17:42:50 1995
--- xc/programs/Xserver/include/misc.h	Mon Jan 30 17:42:50 1995
***************
*** 67,72 ****
--- 67,73 ----
  
  ******************************************************************/
  /* $XConsortium: misc.h,v 1.68 94/04/17 20:25:48 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/misc.h,v 3.1 1994/06/18 16:29:35 dawes Exp $ */
  #ifndef MISC_H
  #define MISC_H 1
  /*
***************
*** 150,158 ****
--- 151,166 ----
  
  #define min(a, b) (((a) < (b)) ? (a) : (b))
  #define max(a, b) (((a) > (b)) ? (a) : (b))
+ #ifndef AMOEBA
  #ifndef abs
  #define abs(a) ((a) > 0 ? (a) : -(a))
  #endif
+ #else /* AMOEBA */
+ /* abs() is a function, not a macro; include the file declaring
+  * it in case we haven't done that yet.
+  */  
+ #include <stdlib.h>
+ #endif /* AMOEBA */
  #ifndef Fabs
  #define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */
  #endif
***************
*** 168,174 ****
--- 176,184 ----
   */
  #define lowbit(x) ((x) & (~(x) + 1))
  
+ #undef MAXSHORT
  #define MAXSHORT 32767
+ #undef MINSHORT
  #define MINSHORT -MAXSHORT 
  
  
diff -c xc/programs/Xserver/include/os.h:1.1.1.2 xc/programs/Xserver/include/os.h:3.5
*** xc/programs/Xserver/include/os.h:1.1.1.2	Mon Jan 30 17:42:50 1995
--- xc/programs/Xserver/include/os.h	Mon Jan 30 17:42:50 1995
***************
*** 47,52 ****
--- 47,53 ----
  ******************************************************************/
  
  /* $XConsortium: os.h,v 1.64 95/01/05 19:50:01 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/os.h,v 3.5 1995/01/28 16:15:34 dawes Exp $ */
  
  #ifndef OS_H
  #define OS_H
***************
*** 139,144 ****
--- 140,148 ----
  #define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
  #define xfree(ptr) Xfree((pointer)(ptr))
  
+ #ifdef SCO
+ #include <stdio.h>
+ #endif
  #ifndef X_NOT_STDC_ENV
  #include <string.h>
  #else
***************
*** 472,477 ****
--- 476,495 ----
  #endif
  );
  
+ #ifdef SERVER_LOCK
+ extern void LockServer(
+ #if NeedFunctionPrototypes
+     void
+ #endif
+ );
+ 
+ extern void UnlockServer(
+ #if NeedFunctionPrototypes
+     void
+ #endif
+ );
+ #endif
+ 
  extern int OsLookupColor(
  #if NeedFunctionPrototypes
      int	/*screen*/,
***************
*** 484,489 ****
--- 502,513 ----
  );
  
  extern void OsInit(
+ #if NeedFunctionPrototypes
+     void
+ #endif
+ );
+ 
+ extern void OsCleanup(
  #if NeedFunctionPrototypes
      void
  #endif
diff -c xc/programs/Xserver/include/propertyst.h:1.1.1.1 xc/programs/Xserver/include/propertyst.h:3.0
*** xc/programs/Xserver/include/propertyst.h:1.1.1.1	Mon Jan 30 17:42:51 1995
--- xc/programs/Xserver/include/propertyst.h	Mon Jan 30 17:42:51 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: propertyst.h,v 1.5 94/04/17 20:25:56 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.0 1994/12/25 12:36:44 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
***************
*** 61,67 ****
  	short		format;     /* format of data for swapping - 8,16,32 */
  	long		size;       /* size of data in (format/8) bytes */
  	pointer         data;       /* private to client */
! #ifdef LBX
  	/*  If space is at a premium and binary compatibility is not
  	 *  an issue, you may want to put the owner_pid next to format
  	 *  so that the two shorts pack together without padding.
--- 62,68 ----
  	short		format;     /* format of data for swapping - 8,16,32 */
  	long		size;       /* size of data in (format/8) bytes */
  	pointer         data;       /* private to client */
! #if defined(LBX) || defined(LBX_COMPAT)
  	/*  If space is at a premium and binary compatibility is not
  	 *  an issue, you may want to put the owner_pid next to format
  	 *  so that the two shorts pack together without padding.
diff -c xc/programs/Xserver/include/servermd.h:1.1.1.3 xc/programs/Xserver/include/servermd.h:3.7
*** xc/programs/Xserver/include/servermd.h:1.1.1.3	Mon Jan 30 17:42:52 1995
--- xc/programs/Xserver/include/servermd.h	Mon Jan 30 17:42:52 1995
***************
*** 48,53 ****
--- 48,54 ----
  #ifndef SERVERMD_H
  #define SERVERMD_H 1
  /* $XConsortium: servermd.h,v 1.73 95/01/09 20:56:43 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.7 1995/01/28 16:15:35 dawes Exp $ */
  
  /*
   * Machine dependent values:
***************
*** 131,139 ****
  
  #endif /* vax */
  
! #if (defined(sun) && !(defined(i386) && defined(SVR4))) || \
!     (defined(AMOEBA) && (defined(sparc) || defined(mc68000))) || \
!     (defined(__NetBSD__) && (defined(__sparc__) || defined(mc68000)))
  
  #if defined(sun386) || defined(sun5)
  # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
--- 132,138 ----
  
  #endif /* vax */
  
! #if (defined(sun) && !(defined(i386) && defined(SVR4))) || (defined(AMOEBA) && (defined(sparc) || defined(mc68000))) || (defined(__NetBSD__) && (defined(__sparc__) || defined(mc68000)))
  
  #if defined(sun386) || defined(sun5)
  # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
***************
*** 157,163 ****
  #define	GLYPHPADBYTES		4
  #define GETLEFTBITS_ALIGNMENT	1
  
! #endif /* sun */
  
  #ifdef apollo
  
--- 156,162 ----
  #define	GLYPHPADBYTES		4
  #define GETLEFTBITS_ALIGNMENT	1
  
! #endif /* sun && !(i386 && SVR4) */
  
  #ifdef apollo
  
***************
*** 314,329 ****
  
  #endif /* luna */
  
! #if ((defined(SVR4) && defined(i386)) || \
!      (defined(SYSV) && defined(i386)) || \
!      (defined(sun) && defined (i386) && defined(SVR4)) || \
!      defined(__bsdi__) || \
!      (defined(__NetBSD__) && defined(__i386__)) || \
!      defined(__FreeBSD__) || \
!      defined(MACH386) || \
!      defined(linux) || \
!      (defined(AMOEBA) && defined(i80386)) || \
!      defined(MINIX))
  
  #ifndef IMAGE_BYTE_ORDER
  #define IMAGE_BYTE_ORDER	LSBFirst
--- 313,319 ----
  
  #endif /* luna */
  
! #if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || defined(linux) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__))
  
  #ifndef IMAGE_BYTE_ORDER
  #define IMAGE_BYTE_ORDER	LSBFirst
diff -c xc/programs/Xserver/mfb/Imakefile:1.1.1.2 xc/programs/Xserver/mfb/Imakefile:3.1
*** xc/programs/Xserver/mfb/Imakefile:1.1.1.2	Mon Jan 30 17:42:56 1995
--- xc/programs/Xserver/mfb/Imakefile	Mon Jan 30 17:42:56 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.39 94/11/21 18:28:53 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.1 1995/01/28 16:15:43 dawes Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
diff -c xc/programs/Xserver/mfb/maskbits.h:1.1.1.1 xc/programs/Xserver/mfb/maskbits.h:3.0
*** xc/programs/Xserver/mfb/maskbits.h:1.1.1.1	Mon Jan 30 17:42:56 1995
--- xc/programs/Xserver/mfb/maskbits.h	Mon Jan 30 17:42:56 1995
***************
*** 22,27 ****
--- 22,28 ----
  
  ******************************************************************/
  /* $XConsortium: maskbits.h,v 1.33 94/04/17 20:28:13 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.0 1994/08/11 06:57:09 dawes Exp $ */
  #include "X.h"
  #include "Xmd.h"
  #include "servermd.h"
***************
*** 249,258 ****
   *  the Danbury C and i386cc
   */
  #if PPW == 32
! #define LONG2CHARS( x ) ( ( ( ( x ) & 0x000000FF ) << 0x18 ) \
!                       | ( ( ( x ) & 0x0000FF00 ) << 0x08 ) \
!                       | ( ( ( x ) & 0x00FF0000 ) >> 0x08 ) \
!                       | ( ( ( x ) & (unsigned long)0xFF000000 ) >> 0x18 ) )
  #else /* PPW == 64 */
  #define LONG2CHARS( x ) \
        ( ( ( ( x ) & 0x000000FF) << 0x18 ) \
--- 250,259 ----
   *  the Danbury C and i386cc
   */
  #if PPW == 32
! #define LONG2CHARS( x ) ( ( ( ( x ) & (unsigned long)0x000000FF ) << 0x18 ) \
!                         | ( ( ( x ) & (unsigned long)0x0000FF00 ) << 0x08 ) \
!                         | ( ( ( x ) & (unsigned long)0x00FF0000 ) >> 0x08 ) \
!                         | ( ( ( x ) & (unsigned long)0xFF000000 ) >> 0x18 ) )
  #else /* PPW == 64 */
  #define LONG2CHARS( x ) \
        ( ( ( ( x ) & 0x000000FF) << 0x18 ) \
diff -c xc/programs/Xserver/mfb/mfbblt.c:1.1.1.1 xc/programs/Xserver/mfb/mfbblt.c:3.0
*** xc/programs/Xserver/mfb/mfbblt.c:1.1.1.1	Mon Jan 30 17:42:57 1995
--- xc/programs/Xserver/mfb/mfbblt.c	Mon Jan 30 17:42:57 1995
***************
*** 31,36 ****
--- 31,37 ----
  
  */
  /* $XConsortium: mfbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.0 1994/08/12 14:03:38 dawes Exp $ */
  
  #include	"X.h"
  #include	"Xmd.h"
***************
*** 337,344 ****
  		    if (startmask)
  		    {
  			bits1 = BitLeft(bits,leftShift);
! 			bits = *psrc++;
! 			bits1 |= BitRight(bits,rightShift);
  			*pdst = MROP_MASK(bits1, *pdst, startmask);
  			pdst++;
  		    }
--- 338,347 ----
  		    if (startmask)
  		    {
  			bits1 = BitLeft(bits,leftShift);
! 			if (BitLeft(startmask, rightShift)) {
! 				bits = *psrc++;
! 				bits1 |= BitRight(bits,rightShift);
! 			}
  			*pdst = MROP_MASK(bits1, *pdst, startmask);
  			pdst++;
  		    }
***************
*** 501,508 ****
  		    if (endmask)
  		    {
  			bits1 = BitRight(bits, rightShift);
! 			bits = *--psrc;
! 			bits1 |= BitLeft(bits, leftShift);
  			pdst--;
  			*pdst = MROP_MASK(bits1, *pdst, endmask);
  		    }
--- 504,513 ----
  		    if (endmask)
  		    {
  			bits1 = BitRight(bits, rightShift);
! 			if (BitRight(endmask, leftShift)) {
! 				bits = *--psrc;
! 				bits1 |= BitLeft(bits, leftShift);
! 			}
  			pdst--;
  			*pdst = MROP_MASK(bits1, *pdst, endmask);
  		    }
diff -c xc/programs/Xserver/mfb/mfbscrinit.c:1.1.1.1 xc/programs/Xserver/mfb/mfbscrinit.c:3.0
*** xc/programs/Xserver/mfb/mfbscrinit.c:1.1.1.1	Mon Jan 30 17:42:57 1995
--- xc/programs/Xserver/mfb/mfbscrinit.c	Mon Jan 30 17:42:58 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: mfbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.0 1994/06/18 16:29:52 dawes Exp $ */
  
  #include "X.h"
  #include "Xproto.h"	/* for xColorItem */
***************
*** 100,106 ****
  	frameWindowPrivateIndex = AllocateWindowPrivateIndex();
  #endif
  	mfbWindowPrivateIndex = AllocateWindowPrivateIndex();
! 	mfbGCPrivateIndex = AllocateGCPrivateIndex();
  	miRegisterGCPrivateIndex(mfbGCPrivateIndex);
  	visual.vid = FakeClientID(0);
  	VID = visual.vid;
--- 101,107 ----
  	frameWindowPrivateIndex = AllocateWindowPrivateIndex();
  #endif
  	mfbWindowPrivateIndex = AllocateWindowPrivateIndex();
! 	mfbGCPrivateIndex = miAllocateGCPrivateIndex();
  	miRegisterGCPrivateIndex(mfbGCPrivateIndex);
  	visual.vid = FakeClientID(0);
  	VID = visual.vid;
diff -c xc/programs/Xserver/mfb/mfbzerarc.c:1.1.1.1 xc/programs/Xserver/mfb/mfbzerarc.c:3.0
*** xc/programs/Xserver/mfb/mfbzerarc.c:1.1.1.1	Mon Jan 30 17:42:58 1995
--- xc/programs/Xserver/mfb/mfbzerarc.c	Mon Jan 30 17:42:58 1995
***************
*** 26,31 ****
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: mfbzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.0 1994/08/01 12:19:30 dawes Exp $ */
  
  /* Derived from:
   * "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
***************
*** 50,56 ****
   * LONG2CHARS() takes care of the re-ordering as required. (DHD)
   */
  #if (BITMAP_BIT_ORDER == MSBFirst)
! #define LEFTMOST	((PixelType) LONG2CHARS((1 << PLST)))
  #else
  #define LEFTMOST	((PixelType) LONG2CHARS(1))
  #endif
--- 51,57 ----
   * LONG2CHARS() takes care of the re-ordering as required. (DHD)
   */
  #if (BITMAP_BIT_ORDER == MSBFirst)
! #define LEFTMOST	((PixelType) LONG2CHARS(((unsigned long)1 << PLST)))
  #else
  #define LEFTMOST	((PixelType) LONG2CHARS(1))
  #endif
diff -c xc/programs/Xserver/mi/Imakefile:1.1.1.2 xc/programs/Xserver/mi/Imakefile:3.6
*** xc/programs/Xserver/mi/Imakefile:1.1.1.2	Mon Jan 30 17:43:03 1995
--- xc/programs/Xserver/mi/Imakefile	Mon Jan 30 17:43:03 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 5.24 95/01/06 21:58:10 kaleb Exp $
+ XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.6 1995/01/28 16:15:50 dawes Exp $
  #include <Server.tmpl>
  
  SRCS =  mivaltree.c mipolyseg.c mipolyrect.c \
***************
*** 31,37 ****
  LintLibraryTarget(mi,$(SRCS))
  NormalLintTarget($(SRCS))
  
! all:: cbrt.o
  
  SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
  SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
--- 32,38 ----
  LintLibraryTarget(mi,$(SRCS))
  NormalLintTarget($(SRCS))
  
! NormalLibraryTarget(cbrt,cbrt.o)
  
  SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
  SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
***************
*** 45,50 ****
  InstallLinkKitNonExecFile(misprite.h,$(LINKKITDIR)/include)
  InstallLinkKitNonExecFile(mispritest.h,$(LINKKITDIR)/include)
  InstallLinkKitNonExecFile(mistruct.h,$(LINKKITDIR)/include)
! InstallLinkKitNonExecFile(miinitext.c,$(LINKKITDIR)/include)
  
  DependTarget()
--- 46,51 ----
  InstallLinkKitNonExecFile(misprite.h,$(LINKKITDIR)/include)
  InstallLinkKitNonExecFile(mispritest.h,$(LINKKITDIR)/include)
  InstallLinkKitNonExecFile(mistruct.h,$(LINKKITDIR)/include)
! InstallLinkKitNonExecFile(miinitext.c,$(LINKKITDIR))
  
  DependTarget()
diff -c xc/programs/Xserver/mi/cbrt.c:1.1.1.1 xc/programs/Xserver/mi/cbrt.c:3.0
*** xc/programs/Xserver/mi/cbrt.c:1.1.1.1	Mon Jan 30 17:43:04 1995
--- xc/programs/Xserver/mi/cbrt.c	Mon Jan 30 17:43:04 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: cbrt.c,v 1.2 94/04/17 20:27:10 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.0 1994/04/29 14:11:16 dawes Exp $ */
  /*
  
  Copyright (c) 1990  X Consortium
***************
*** 37,41 ****
  cbrt(x)
      double x;
  {
!     return pow(x, 1.0/3.0);
  }
--- 38,45 ----
  cbrt(x)
      double x;
  {
!     if (x > 0.0)
! 	return pow(x, 1.0/3.0);
!     else
! 	return -pow(-x, 1.0/3.0);
  }
diff -c xc/programs/Xserver/mi/mi.h:1.1.1.1 xc/programs/Xserver/mi/mi.h:3.0
*** xc/programs/Xserver/mi/mi.h:1.1.1.1	Mon Jan 30 17:43:04 1995
--- xc/programs/Xserver/mi/mi.h	Mon Jan 30 17:43:04 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: mi.h,v 1.17 94/04/17 20:27:10 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.0 1994/06/18 16:30:11 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
***************
*** 555,560 ****
--- 556,567 ----
      int /*numVisuals*/,
      VisualPtr /*visuals*/,
      miBSFuncPtr /*bsfuncs*/
+ #endif
+ );
+ 
+ extern int miAllocateGCPrivateIndex(
+ #if NeedFunctionPrototypes
+     void
  #endif
  );
  
diff -c xc/programs/Xserver/mi/mifillarc.c:1.1.1.2 xc/programs/Xserver/mi/mifillarc.c:3.2
*** xc/programs/Xserver/mi/mifillarc.c:1.1.1.2	Mon Jan 30 17:43:05 1995
--- xc/programs/Xserver/mi/mifillarc.c	Mon Jan 30 17:43:05 1995
***************
*** 28,33 ****
--- 28,34 ----
  ********************************************************/
  
  /* $XConsortium: mifillarc.c,v 5.18 95/01/10 20:59:49 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.2 1995/01/28 16:15:52 dawes Exp $ */
  
  #include <math.h>
  #include "X.h"
diff -c xc/programs/Xserver/mi/mifillarc.h:1.1.1.2 xc/programs/Xserver/mi/mifillarc.h:3.2
*** xc/programs/Xserver/mi/mifillarc.h:1.1.1.2	Mon Jan 30 17:43:05 1995
--- xc/programs/Xserver/mi/mifillarc.h	Mon Jan 30 17:43:06 1995
***************
*** 26,31 ****
--- 26,32 ----
  ********************************************************/
  
  /* $XConsortium: mifillarc.h,v 5.9 95/01/11 16:19:24 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.2 1995/01/28 16:15:53 dawes Exp $ */
  
  #define FULLCIRCLE (360 * 64)
  
diff -c xc/programs/Xserver/mi/miscrinit.c:1.1.1.1 xc/programs/Xserver/mi/miscrinit.c:3.0
*** xc/programs/Xserver/mi/miscrinit.c:1.1.1.1	Mon Jan 30 17:43:06 1995
--- xc/programs/Xserver/mi/miscrinit.c	Mon Jan 30 17:43:07 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: miscrinit.c,v 5.10 94/04/17 20:27:51 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.0 1994/06/18 16:30:13 dawes Exp $ */
  /*
  
  Copyright (c) 1990  X Consortium
***************
*** 267,270 ****
--- 268,285 ----
      pScreen->MarkUnrealizedWindow = miMarkUnrealizedWindow;
  
      return miScreenDevPrivateInit(pScreen, width, pbits);
+ }
+ 
+ int
+ miAllocateGCPrivateIndex()
+ {
+     static int privateIndex = -1;
+     static unsigned long miGeneration = 0;
+ 
+     if (miGeneration != serverGeneration)
+     {
+ 	privateIndex = AllocateGCPrivateIndex();
+ 	miGeneration = serverGeneration;
+     }
+     return privateIndex;
  }
diff -c xc/programs/Xserver/mi/mizerline.c:1.1.1.1 xc/programs/Xserver/mi/mizerline.c:3.0
*** xc/programs/Xserver/mi/mizerline.c:1.1.1.1	Mon Jan 30 17:43:07 1995
--- xc/programs/Xserver/mi/mizerline.c	Mon Jan 30 17:43:07 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: mizerline.c,v 5.7 94/04/17 20:28:05 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.0 1995/01/18 06:15:25 dawes Exp $ */
  #include "X.h"
  
  #include "misc.h"
***************
*** 66,73 ****
  
  /* round, but maps x/y == z.5 to z.0 instead of (z+1).0 */
  /* note that "ceiling" breaks for numerator < 1, so special-case it */
! #define round_down(x, y)   ((int)(2*(x)-(y)) <= 0 ? 0 :\
! 			                (ceiling((2*(x)-(y)), (2*(y)))))
  
  /* miZeroClipLine
   *
--- 67,74 ----
  
  /* round, but maps x/y == z.5 to z.0 instead of (z+1).0 */
  /* note that "ceiling" breaks for numerator < 1, so special-case it */
! #define round_down(x, y)   ((int)((x)-(y)/2) <= 0 ? 0 :\
! 			                (ceiling(((x)-(y)/2), ((y)))))
  
  /* miZeroClipLine
   *
diff -c xc/programs/Xserver/os/Imakefile:1.1.1.3 xc/programs/Xserver/os/Imakefile:3.8
*** xc/programs/Xserver/os/Imakefile:1.1.1.3	Mon Jan 30 17:43:10 1995
--- xc/programs/Xserver/os/Imakefile	Mon Jan 30 17:43:10 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.78 94/12/02 19:23:26 mor Exp $
+ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.8 1995/01/28 16:15:59 dawes Exp $
  #include <Server.tmpl>
  
  /*
***************
*** 10,15 ****
--- 11,21 ----
  #define OtherObjects hpsocket.o
  #endif
  
+ #ifdef AmoebaArchitecture
+ #define OtherSources iopreader.c
+ #define OtherObjects iopreader.o
+ #endif
+ 
  /*
   * do not modify the following two definitions
   */
***************
*** 51,57 ****
     SOCK_DEFINES = -DBSD44SOCKETS
  #endif
  
! #if BuildLBX
     LBX_SRCS = lbxio.c
     LBX_OBJS = lbxio.o
  #else
--- 57,63 ----
     SOCK_DEFINES = -DBSD44SOCKETS
  #endif
  
! #if BuildLBX || defined(LinkDirectory)
     LBX_SRCS = lbxio.c
     LBX_OBJS = lbxio.o
  #else
***************
*** 128,133 ****
--- 134,163 ----
  LinkSourceFile(k5encode.c,$(XAUTHSRC))
  #endif
  
+ #ifndef LinkDirectory
  InstallLinkKitLibrary(os,$(LINKKITDIR)/lib)
+ #endif
+ 
+ #ifdef LinkDirectory
+ LinkSourceFile(WaitFor.c,LinkDirectory)
+ LinkSourceFile(access.c,LinkDirectory)
+ LinkSourceFile(auth.c,LinkDirectory)
+ LinkSourceFile(connection.c,LinkDirectory)
+ LinkSourceFile(decompress.c,LinkDirectory)
+ LinkSourceFile(genalloca.c,LinkDirectory)
+ LinkSourceFile(hpsocket.c,LinkDirectory)
+ LinkSourceFile(io.c,LinkDirectory)
+ LinkSourceFile(lbxio.c,LinkDirectory)
+ LinkSourceFile(iopreader.c,LinkDirectory)
+ LinkSourceFile(k5auth.c,LinkDirectory)
+ LinkSourceFile(mitauth.c,LinkDirectory)
+ LinkSourceFile(oscolor.c,LinkDirectory)
+ LinkSourceFile(osdep.h,LinkDirectory)
+ LinkSourceFile(osinit.c,LinkDirectory)
+ LinkSourceFile(rpcauth.c,LinkDirectory)
+ LinkSourceFile(utils.c,LinkDirectory)
+ LinkSourceFile(xdmauth.c,LinkDirectory)
+ LinkSourceFile(xdmcp.c,LinkDirectory)
+ #endif
  
  DependTarget()
diff -c xc/programs/Xserver/os/WaitFor.c:1.1.1.1 xc/programs/Xserver/os/WaitFor.c:3.4
*** xc/programs/Xserver/os/WaitFor.c:1.1.1.1	Mon Jan 30 17:43:10 1995
--- xc/programs/Xserver/os/WaitFor.c	Mon Jan 30 17:43:11 1995
***************
*** 47,52 ****
--- 47,53 ----
  ******************************************************************/
  
  /* $XConsortium: WaitFor.c,v 1.68 94/04/17 20:26:52 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.4 1994/09/03 02:53:23 dawes Exp $ */
  
  /*****************************************************************
   * OS Dependent input routines:
***************
*** 67,73 ****
--- 68,79 ----
  #include "X.h"
  #include "misc.h"
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #else
  #include <sys/param.h>
+ #endif
  #include "osdep.h"
  #include "dixstruct.h"
  #include "opaque.h"
***************
*** 130,135 ****
--- 136,143 ----
  
  static INT32 timeTilFrob = 0;		/* while screen saving */
  
+ #if !defined(AMOEBA)
+ 
  int
  WaitForSomething(pClientsReady)
      int *pClientsReady;
***************
*** 363,368 ****
--- 371,538 ----
      return (FALSE);
  }
  #endif
+ 
+ #else /* AMOEBA */
+ 
+ #define dbprintf(list)  /* printf list */
+ 
+ int
+ WaitForSomething(pClientsReady)
+     int		*pClientsReady;
+ {
+     register int	i, wt, nt;
+     struct timeval	*wtp;
+     long        	alwaysCheckForInput[2];
+     int 		nready;
+     int 		timeout;
+     unsigned long	now;
+ 
+     WakeupInitWaiters();
+ 
+     /* Be sure to check for input on every sweep in the dispatcher.
+      * This routine should be in InitInput, but since this is more
+      * or less a device dependent routine, and the semantics of it
+      * are device independent I decided to put it here.
+      */
+     alwaysCheckForInput[0] = 0;
+     alwaysCheckForInput[1] = 1;
+     SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]);
+ 
+     while (1) {
+ 	/* deal with any blocked jobs */
+ 	if (workQueue)
+ 	    ProcessWorkQueue();
+ 
+ 	if (ANYSET(ClientsWithInput)) {
+ 	    FdSet clientsReadable;
+ 	    int highest_priority;
+ 
+ 	    COPYBITS(ClientsWithInput, clientsReadable);
+ 	    dbprintf(("WaitFor: "));
+ 	    nready = 0;
+ 	    for (i=0; i < mskcnt; i++) {
+ 		while (clientsReadable[i]) {
+ 		    int client_priority, curclient, client_index;
+ 
+ 		    curclient = ffs (clientsReadable[i]) - 1;
+ 		    client_index = ConnectionTranslation[curclient + (i << 5)];
+ 		    dbprintf(("%d has input\n", curclient));
+ #ifdef XSYNC
+ 		    client_priority = clients[client_index]->priority;
+ 		    if (nready == 0 || client_priority > highest_priority)
+ 		    {
+ 		        pClientsReady[0] = client_index;
+ 		        highest_priority = client_priority;
+ 		        nready = 1;
+ 		    }
+ 		    else if (client_priority == highest_priority)
+ #endif
+ 		    {
+ 		        pClientsReady[nready++] = client_index;
+ 		    }
+ 		    clientsReadable[i] &= ~(((FdMask)1) << curclient);
+ 		}
+ 	    }
+ 	    break;
+ 	}	
+ 
+ 	wt = -1;
+ 	now = GetTimeInMillis();
+ 	if (timers)
+ 	{
+ 	    while (timers && timers->expires <= now)
+ 		DoTimer(timers, now, &timers);
+ 	    if (timers)
+ 	    {
+ 		timeout = timers->expires - now;
+ 		wt = timeout;
+ 	    }
+ 	}
+ 	if (ScreenSaverTime) {
+ 	    timeout = ScreenSaverTime - TimeSinceLastInputEvent();
+ 	    if (timeout <= 0) { /* may be forced by AutoResetServer() */
+ 		long timeSinceSave;
+ 
+ 		timeSinceSave = -timeout;
+ 		if ((timeSinceSave >= timeTilFrob) && (timeTilFrob >= 0)) {
+ 		    SaveScreens(SCREEN_SAVER_ON, ScreenSaverActive);
+ 		    if (ScreenSaverInterval)
+ 			/* round up to the next ScreenSaverInterval */
+ 			timeTilFrob = ScreenSaverInterval *
+ 				((timeSinceSave + ScreenSaverInterval) /
+ 					ScreenSaverInterval);
+ 		    else
+ 			timeTilFrob = -1;
+ 		}
+ 		timeout = timeTilFrob - timeSinceSave;
+ 	    } else {
+ 		if (timeout > ScreenSaverTime)
+ 		    timeout = ScreenSaverTime;
+ 		timeTilFrob = 0;
+ 	    }
+ 	    
+ 	    if (wt < 0 || (timeTilFrob >= 0 && wt > timeout)) {
+ 		wt = timeout;
+ 	    }
+ 	}
+ 
+ 	/* Check for new clients. We do this here and not in the listener
+ 	 * threads because we cannot be sure that dix is re-entrant, and
+ 	 * we need to call some dix routines during startup.
+ 	 */
+ 	if (nNewConns) {
+ 	    QueueWorkProc(EstablishNewConnections, NULL,
+ 			  (pointer) 0);
+ 	}
+ 
+ 	/* Call device dependent block handlers, which may want to
+ 	 * specify a different timeout (e.g. used for key auto-repeat).
+ 	 */
+ 	wtp = (struct timeval *) NULL;
+ 	BlockHandler((pointer)&wtp, (pointer)NULL);
+ 	if (wtp) wt = (wtp->tv_sec * 1000) + (wtp->tv_usec / 1000);
+ 
+ 	if (NewOutputPending)
+ 	    FlushAllOutput();
+ 
+ 	/* TODO: XTESTEXT1 */
+ 
+ 	nready = AmFindReadyClients(pClientsReady, AllSockets);
+ 
+ 	/* If we found some work, or the iop server has us informed about
+ 	 * new device events, we return.
+ 	 */
+ 	if (nready || AmoebaEventsAvailable())
+ 	    break;
+ 
+ 	if (dispatchException)
+ 	    return 0;
+ 
+ 	/* Nothing interesting is available. Go to sleep with a timeout.
+ 	 * The other threads will wake us when needed.
+ 	 */
+ 	i = SleepMainThread(wt);
+ 
+ 	/* Wake up any of the sleeping handlers */
+ 	WakeupHandler((unsigned long)0, (pointer)NULL);
+ 
+ 	/* TODO: XTESTEXT1 */
+ 
+ 	if (dispatchException)
+ 	    return 0;
+ 
+ 	if (i == -1) {
+ 	    /* An error or timeout occurred */
+ 	    return 0;
+ 	}
+     }
+ 
+     dbprintf(("WaitForSomething: %d clients ready\n", nready));
+     return nready;
+ }
+ 
+ #endif /* AMOEBA */
+ 
  
  static void
  DoTimer(timer, now, prev)
diff -c xc/programs/Xserver/os/access.c:1.1.1.2 xc/programs/Xserver/os/access.c:3.5
*** xc/programs/Xserver/os/access.c:1.1.1.2	Mon Jan 30 17:43:11 1995
--- xc/programs/Xserver/os/access.c	Mon Jan 30 17:43:11 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: access.c,v 1.75 94/11/21 18:27:47 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/access.c,v 3.5 1995/01/28 16:16:01 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
***************
*** 55,60 ****
--- 56,62 ----
  #include "misc.h"
  #include "site.h"
  #include <errno.h>
+ #if !defined(AMOEBA) && !defined(MINIX)
  #ifdef ESIX
  #include <lan/socket.h>
  #else
***************
*** 61,76 ****
  #include <sys/socket.h>
  #endif
  #include <sys/ioctl.h>
  #include <ctype.h>
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC)
  #include <netinet/in.h>
! #endif /* TCPCONN || STREAMSCONN || ISC */
  #ifdef DNETCONN
  #include <netdnet/dn.h>
  #include <netdnet/dnetdb.h>
  #endif
  
  #ifdef hpux
  # include <sys/utsname.h>
  # ifdef HAS_IFREQ
--- 63,98 ----
  #include <sys/socket.h>
  #endif
  #include <sys/ioctl.h>
+ #else
+ #ifdef AMOEBA
+ #define port am_port_t
+ #include <amoeba.h>
+ #include <cmdreg.h>
+ #include <stdcom.h>
+ #include <stderr.h>
+ #include <ampolicy.h>
+ #include <server/ip/hton.h>
+ #include <server/ip/types.h>
+ #include <server/ip/tcpip.h>
+ #include <server/ip/tcp_io.h>
+ #include <server/ip/gen/in.h>
+ #include <server/ip/gen/tcp.h>
+ #include <server/ip/gen/tcp_io.h>
+ #include <server/ip/gen/socket.h>
+ #undef port
+ #endif
+ #endif /* AMOEBA || MINIX */
  #include <ctype.h>
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(SCO)
  #include <netinet/in.h>
! #endif /* TCPCONN || STREAMSCONN || ISC || SCO */
  #ifdef DNETCONN
  #include <netdnet/dn.h>
  #include <netdnet/dnetdb.h>
  #endif
  
+ #if !defined(AMOEBA)
  #ifdef hpux
  # include <sys/utsname.h>
  # ifdef HAS_IFREQ
***************
*** 77,104 ****
  #  include <net/if.h>
  # endif
  #else
! #if defined(SVR4) ||  (defined(SYSV) && defined(i386))
  # include <sys/utsname.h>
  #endif
  #if defined(SYSV) &&  defined(i386)
  # include <sys/stream.h>
  #endif
  #ifdef ESIX
  # include <lan/if.h>
  #else
  # include <net/if.h>
  #endif
  #endif /* hpux */
  
  #ifdef SVR4
  #include <sys/sockio.h>
  #endif
  
  #ifdef ESIX
  #include <lan/netdb.h>
  #else
  #include <netdb.h>
  #endif
  
  #include "dixstruct.h"
  #include "osdep.h"
--- 99,145 ----
  #  include <net/if.h>
  # endif
  #else
! #if defined(SVR4) ||  (defined(SYSV) && defined(i386)) || defined(MINIX)
  # include <sys/utsname.h>
  #endif
  #if defined(SYSV) &&  defined(i386)
  # include <sys/stream.h>
+ # ifdef ISC
+ #  include <sys/stropts.h>
+ #  include <sys/sioctl.h>
+ # endif /* ISC */
  #endif
  #ifdef ESIX
  # include <lan/if.h>
  #else
+ #ifndef MINIX
  # include <net/if.h>
  #endif
+ #endif
  #endif /* hpux */
+ #endif /* !AMOEBA */
  
  #ifdef SVR4
  #include <sys/sockio.h>
+ #include <sys/stropts.h>
  #endif
  
  #ifdef ESIX
  #include <lan/netdb.h>
  #else
+ #if !defined(AMOEBA) && !defined(MINIX)
  #include <netdb.h>
+ #else
+ #ifdef AMOEBA
+ #include <server/ip/gen/netdb.h>
+ #endif
+ #ifdef MINIX
+ #include <net/hton.h>
+ #include <net/gen/netdb.h>
+ #define INADDR_BROADCAST 0xFFFFFFFF
  #endif
+ #endif /* AMOEBA || MINIX */
+ #endif /* ESIX */
  
  #include "dixstruct.h"
  #include "osdep.h"
***************
*** 193,198 ****
--- 234,295 ----
  }
  
  
+ #if ((defined(SVR4) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
+ 
+ /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
+ 
+ static int
+ ifioctl (fd, cmd, arg)
+     int fd;
+     int cmd;
+     char *arg;
+ {
+     struct strioctl ioc;
+     int ret;
+ 
+     bzero((char *) &ioc, sizeof(ioc));
+     ioc.ic_cmd = cmd;
+     ioc.ic_timout = 0;
+     if (cmd == SIOCGIFCONF)
+     {
+ 	ioc.ic_len = ((struct ifconf *) arg)->ifc_len;
+ 	ioc.ic_dp = ((struct ifconf *) arg)->ifc_buf;
+ #ifdef ISC
+ 	/* SIOCGIFCONF is somewhat brain damaged on ISC. The argument
+ 	 * buffer must contain the ifconf structure as header. Ifc_req
+ 	 * is also not a pointer but a one element array of ifreq
+ 	 * structures. On return this array is extended by enough
+ 	 * ifreq fields to hold all interfaces. The return buffer length
+ 	 * is placed in the buffer header.
+ 	 */
+         ((struct ifconf *) ioc.ic_dp)->ifc_len =
+                                          ioc.ic_len - sizeof(struct ifconf);
+ #endif
+     }
+     else
+     {
+ 	ioc.ic_len = sizeof(struct ifreq);
+ 	ioc.ic_dp = arg;
+     }
+     ret = ioctl(fd, I_STR, (char *) &ioc);
+     if (ret >= 0 && cmd == SIOCGIFCONF)
+ #ifdef SVR4
+ 	((struct ifconf *) arg)->ifc_len = ioc.ic_len;
+ #endif
+ #ifdef ISC
+     {
+ 	((struct ifconf *) arg)->ifc_len =
+ 				 ((struct ifconf *)ioc.ic_dp)->ifc_len;
+ 	((struct ifconf *) arg)->ifc_buf = 
+ 			(caddr_t)((struct ifconf *)ioc.ic_dp)->ifc_req;
+     }
+ #endif
+     return(ret);
+ }
+ #else /* ((SVR4 && !sun) || ISC) && SIOCGIFCONF */
+ #define ifioctl ioctl
+ #endif /* ((SVR4 && !sun) || ISC) && SIOCGIFCONF */
+ 
  /*
   * DefineSelf (fd):
   *
***************
*** 342,348 ****
  DefineSelf (fd)
      int fd;
  {
! #if !defined(TCPCONN) && !defined(UNIXCONN)
      return;
  #else
      register int n;
--- 439,445 ----
  DefineSelf (fd)
      int fd;
  {
! #if !defined(TCPCONN) && !defined(STREAMSCONN) && !defined(UNIXCONN) && !defined(MNX_TCPCONN)
      return;
  #else
      register int n;
***************
*** 351,361 ****
      int		family;
      register HOST	*host;
  
- #if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-     char name[100];
- #else
      struct utsname name;
- #endif
      register struct hostent  *hp;
  
      union {
--- 448,454 ----
***************
*** 366,377 ****
      struct	sockaddr_in	*inetaddr;
      struct sockaddr_in broad_addr;
  
- #if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-     if (gethostname (name, sizeof name) < 0)
- 	    hp = NULL;
-     else
- 	    hp = gethostbyname (name);
- #else
      /* Why not use gethostname()?  Well, at least on my system, I've had to
       * make an ugly kernel patch to get a name longer than 8 characters, and
       * uname() lets me access to the whole string (it smashes release, you
--- 459,464 ----
***************
*** 379,385 ****
       */
      uname(&name);
      hp = gethostbyname (name.nodename);
- #endif
      if (hp != NULL)
      {
  	saddr.sa.sa_family = hp->h_addrtype;
--- 466,471 ----
***************
*** 421,428 ****
  		    XdmcpRegisterBroadcastAddress ((struct sockaddr_in *)
  						   &broad_addr);
  		}
- 	    }
  #endif /* XDMCP */
  	}
      }
      /*
--- 507,514 ----
  		    XdmcpRegisterBroadcastAddress ((struct sockaddr_in *)
  						   &broad_addr);
  		}
  #endif /* XDMCP */
+ 	    }
  	}
      }
      /*
***************
*** 443,457 ****
  	    selfhosts = host;
  	}
      }
! #endif /* !TCPCONN && !UNIXCONN */
  }
  
  #else
  void
  DefineSelf (fd)
      int fd;
  {
!     char		buf[2048];
      struct ifconf	ifc;
      register int	n;
      int 		len;
--- 529,554 ----
  	    selfhosts = host;
  	}
      }
! #endif /* !TCPCONN && !STREAMSCONN && !UNIXCONN && !MNX_TCPCONN */
  }
  
  #else
+ 
+ #ifdef AF_LINK
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+ 		     (p->ifr_addr.sa_len > sizeof (p->ifr_addr) ? \
+ 		      p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
+ #define ifraddr_size(a) (a.sa_len)
+ #else
+ #define ifr_size(p) (sizeof (struct ifreq))
+ #define ifraddr_size(a) (sizeof (a))
+ #endif
+ 
  void
  DefineSelf (fd)
      int fd;
  {
!     char		buf[2048], *cp, *cplim;
      struct ifconf	ifc;
      register int	n;
      int 		len;
***************
*** 491,510 ****
  #endif
      ifc.ifc_len = sizeof (buf);
      ifc.ifc_buf = buf;
!     if (ioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0)
          Error ("Getting interface configuration");
!     for (ifr = ifc.ifc_req
! #ifdef CSRG_BASED
! 	 ; (char *)ifr < ifc.ifc_buf + ifc.ifc_len;
! 	 ifr = (struct ifreq *)((char *)ifr + sizeof (struct ifreq) +
! 		(ifr->ifr_addr.sa_len > sizeof (ifr->ifr_addr) ?
! 		 ifr->ifr_addr.sa_len - sizeof (ifr->ifr_addr) : 0))
  #else
! 	 , n = ifc.ifc_len / sizeof (struct ifreq); --n >= 0; ifr++
  #endif
! 	 )
      {
! 	len = sizeof(ifr->ifr_addr);
  #ifdef DNETCONN
  	/*
  	 * DECnet was handled up above.
--- 588,608 ----
  #endif
      ifc.ifc_len = sizeof (buf);
      ifc.ifc_buf = buf;
!     if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0)
          Error ("Getting interface configuration");
! 
! #ifdef ISC
! #define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf
  #else
! #define IFC_IFC_REQ ifc.ifc_req
  #endif
! 
!     cplim = (char *) IFC_IFC_REQ + ifc.ifc_len;
!     
!     for (cp = (char *) IFC_IFC_REQ; cp < cplim; cp += ifr_size (ifr))
      {
! 	ifr = (struct ifreq *) cp;
! 	len = ifraddr_size (ifr->ifr_addr);
  #ifdef DNETCONN
  	/*
  	 * DECnet was handled up above.
***************
*** 515,520 ****
--- 613,623 ----
  	family = ConvertAddr (&ifr->ifr_addr, &len, (pointer *)&addr);
          if (family == -1 || family == FamilyLocal)
  	    continue;
+ #ifdef DEF_SELF_DEBUG
+ 	if (family == FamilyInternet) 
+ 	    ErrorF("Xserver: DefineSelf(): ifname = %s, addr = %d.%d.%d.%d\n",
+ 		   ifr->ifr_name, addr[0], addr[1], addr[2], addr[3]);
+ #endif
          for (host = selfhosts;
   	     host && !addrEqual (family, addr, len, host);
  	     host = host->next)
***************
*** 558,570 ****
  	    	struct ifreq    broad_req;
      
  	    	broad_req = *ifr;
! 		if (ioctl (fd, SIOCGIFFLAGS, (char *) &broad_req) != -1 &&
  		    (broad_req.ifr_flags & IFF_BROADCAST) &&
  		    (broad_req.ifr_flags & IFF_UP)
  		    )
  		{
  		    broad_req = *ifr;
! 		    if (ioctl (fd, SIOCGIFBRDADDR, &broad_req) != -1)
  			broad_addr = broad_req.ifr_addr;
  		    else
  			continue;
--- 661,673 ----
  	    	struct ifreq    broad_req;
      
  	    	broad_req = *ifr;
! 		if (ifioctl (fd, SIOCGIFFLAGS, (char *) &broad_req) != -1 &&
  		    (broad_req.ifr_flags & IFF_BROADCAST) &&
  		    (broad_req.ifr_flags & IFF_UP)
  		    )
  		{
  		    broad_req = *ifr;
! 		    if (ifioctl (fd, SIOCGIFBRDADDR, &broad_req) != -1)
  			broad_addr = broad_req.ifr_addr;
  		    else
  			continue;
***************
*** 573,578 ****
--- 676,686 ----
  		    continue;
  	    }
  #endif
+ #ifdef DEF_SELF_DEBUG
+ 	    ErrorF("Xserver: DefineSelf(): ifname = %s, baddr = %s\n",
+ 		   ifr->ifr_name,
+ 	           inet_ntoa(((struct sockaddr_in *) &broad_addr)->sin_addr));
+ #endif
  	    XdmcpRegisterBroadcastAddress ((struct sockaddr_in *) &broad_addr);
  	}
  #endif
***************
*** 649,657 ****
      FILE		*fd;
      char		*ptr;
      int                 i, hostlen;
      union {
          struct sockaddr	sa;
! #if defined(TCPCONN) || defined(STREAMSCONN)
          struct sockaddr_in in;
  #endif /* TCPCONN || STREAMSCONN */
  #ifdef DNETCONN
--- 757,766 ----
      FILE		*fd;
      char		*ptr;
      int                 i, hostlen;
+ #ifndef AMOEBA
      union {
          struct sockaddr	sa;
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
          struct sockaddr_in in;
  #endif /* TCPCONN || STREAMSCONN */
  #ifdef DNETCONN
***************
*** 658,663 ****
--- 767,773 ----
          struct sockaddr_dn dn;
  #endif
      } 			saddr;
+ #endif /* AMOEBA */
  #ifdef DNETCONN
      struct nodeent 	*np;
      struct dn_naddr 	dnaddr, *dnaddrp, *dnet_addr();
***************
*** 698,704 ****
  	    family = FamilyLocalHost;
  	    NewHost(family, "", 0);
  	}
! #if defined(TCPCONN) || defined(STREAMSCONN)
  	else if (!strncmp("inet:", lhostname, 5))
  	{
  	    family = FamilyInternet;
--- 808,814 ----
  	    family = FamilyLocalHost;
  	    NewHost(family, "", 0);
  	}
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
  	else if (!strncmp("inet:", lhostname, 5))
  	{
  	    family = FamilyInternet;
***************
*** 770,776 ****
  	}
  	else
  #endif /* SECURE_RPC */
! #if defined(TCPCONN) || defined(STREAMSCONN)
  	{
      	    /* host name */
      	    if (family == FamilyInternet && (hp = gethostbyname (hostname)) ||
--- 880,886 ----
  	}
  	else
  #endif /* SECURE_RPC */
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
  	{
      	    /* host name */
      	    if (family == FamilyInternet && (hp = gethostbyname (hostname)) ||
***************
*** 1036,1044 ****
  
      switch (family)
      {
! #if defined(TCPCONN) || defined(STREAMSCONN)
        case FamilyInternet:
  	if (length == sizeof (struct in_addr))
  	    len = length;
  	else
  	    len = -1;
--- 1146,1158 ----
  
      switch (family)
      {
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) || defined(MNX_TCPCONN)
        case FamilyInternet:
+ #if !defined(AMOEBA)
  	if (length == sizeof (struct in_addr))
+ #else
+ 	if (length == sizeof(ipaddr_t))
+ #endif
  	    len = length;
  	else
  	    len = -1;
***************
*** 1069,1075 ****
--- 1183,1193 ----
   * Returns 1 if host is invalid, 0 if we've found it. */
  
  InvalidHost (saddr, len)
+ #ifndef AMOEBA_ORIG
      register struct sockaddr	*saddr;
+ #else
+     register ipaddr_t		*saddr;
+ #endif
      int				len;
  {
      int 			family;
***************
*** 1112,1121 ****
--- 1230,1244 ----
  
  static int
  ConvertAddr (saddr, len, addr)
+ #ifndef AMOEBA_ORIG
      register struct sockaddr	*saddr;
+ #else
+     register ipaddr_t		*saddr;
+ #endif
      int				*len;
      pointer			*addr;
  {
+ #ifndef AMOEBA
      if (*len == 0)
          return (FamilyLocal);
      switch (saddr->sa_family)
***************
*** 1125,1131 ****
      case AF_UNIX:
  #endif
          return FamilyLocal;
! #if defined(TCPCONN) || defined(STREAMSCONN)
      case AF_INET:
          *len = sizeof (struct in_addr);
          *addr = (pointer) &(((struct sockaddr_in *) saddr)->sin_addr);
--- 1248,1254 ----
      case AF_UNIX:
  #endif
          return FamilyLocal;
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
      case AF_INET:
          *len = sizeof (struct in_addr);
          *addr = (pointer) &(((struct sockaddr_in *) saddr)->sin_addr);
***************
*** 1150,1155 ****
--- 1273,1284 ----
      default:
          return -1;
      }
+ #else /* AMOEBA */
+     if (*len == 0) return -1;
+     *len = sizeof (ipaddr_t);
+     *addr = (pointer) saddr;
+     return FamilyInternet;
+ #endif /* AMOEBA */
  }
  
  int
diff -c xc/programs/Xserver/os/connection.c:1.1.1.3 xc/programs/Xserver/os/connection.c:3.6
*** xc/programs/Xserver/os/connection.c:1.1.1.3	Mon Jan 30 17:43:13 1995
--- xc/programs/Xserver/os/connection.c	Mon Jan 30 17:43:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: connection.c,v 1.190 94/11/08 20:47:43 mor Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/connection.c,v 3.6 1995/01/25 10:56:41 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987, 1989  X Consortium
***************
*** 70,76 ****
--- 71,79 ----
  #ifdef X_NOT_STDC_ENV
  extern int errno;
  #endif
+ #ifndef MINIX
  #include <sys/socket.h>
+ #endif
  
  #include <signal.h>
  #include <setjmp.h>
***************
*** 84,89 ****
--- 87,98 ----
  #include <sys/ioctl.h>
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ 
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  #if defined(TCPCONN) || defined(STREAMSCONN)
  # include <netinet/in.h>
  # ifndef hpux
***************
*** 97,104 ****
--- 106,121 ----
  # endif
  #endif
  
+ #ifdef AMTCPCONN
+ #include <server/ip/types.h>
+ #include <server/ip/gen/in.h>
+ #include <server/ip/gen/inet.h>
+ #endif
+ 
  #include <stdio.h>
+ #if !defined(AMOEBA) && !defined(_MINIX)
  #include <sys/uio.h>
+ #endif
  #include "misc.h"		/* for typedef of pointer */
  #include "osdep.h"
  #include "opaque.h"
***************
*** 202,210 ****
  void XdmcpOpenDisplay(), XdmcpInit(), XdmcpReset(), XdmcpCloseDisplay();
  #endif
  
! #ifdef LBX
  extern int  StandardReadRequestFromClient();
  extern int  StandardWriteToClient ();
  extern int  UncompressWriteToClient ();
  extern unsigned long  StandardRequestLength ();
  extern int  StandardFlushClient ();
--- 219,229 ----
  void XdmcpOpenDisplay(), XdmcpInit(), XdmcpReset(), XdmcpCloseDisplay();
  #endif
  
! #if defined(LBX) || defined(LBX_COMPAT)
  extern int  StandardReadRequestFromClient();
  extern int  StandardWriteToClient ();
+ #endif
+ #ifdef LBX
  extern int  UncompressWriteToClient ();
  extern unsigned long  StandardRequestLength ();
  extern int  StandardFlushClient ();
***************
*** 398,404 ****
  #endif
  	    strcpy(addr, "local host");
  	    break;
! #if defined(TCPCONN) || defined(STREAMSCONN)
  	case AF_INET:
  	    sprintf(addr, "IP %s port %d",
  		    inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr),
--- 417,423 ----
  #endif
  	    strcpy(addr, "local host");
  	    break;
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
  	case AF_INET:
  	    sprintf(addr, "IP %s port %d",
  		    inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr),
***************
*** 411,416 ****
--- 430,445 ----
  		    dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add));
  	    break;
  #endif
+ #ifdef AMRPCCONN
+ 	case FamilyAmoeba:
+ 	    sprintf(addr, "AM %s", saddr);
+ 	    break;
+ #endif
+ #if defined(AMTCPCONN) && !(defined(TCPCONN) || defined(STREAMSCONN))
+ 	case AF_INET:
+ 	    sprintf(addr, "AMIP %s", inet_ntoa(*((ipaddr_t *) saddr)));
+ 	    break;
+ #endif
  	default:
  	    strcpy(addr, "unknown address");
  	}
***************
*** 463,468 ****
--- 492,504 ----
  	if (_XSERVTransGetPeerAddr (priv->trans_conn,
  	    &family, &fromlen, &from) != -1)
  	{
+ #ifdef AMRPCCONN
+ 	    /* Amoeba RPC connections are already checked by the capability. */
+ 	    if (family == FamilyAmoeba) {
+ 		auth_id = (XID) 0;
+ 	    }
+ 	    else
+ #endif
  	    if (InvalidHost ((struct sockaddr *) from, fromlen))
  		AuthAudit(client->index, FALSE,
  		    (struct sockaddr *) from, fromlen, proto_n, auth_proto);
***************
*** 648,653 ****
--- 684,690 ----
      extern int  writev(), close();
  #endif
  
+ #ifndef AMOEBA
      readyconnections = (((FdMask)closure) & WellKnownConnections);
      if (!readyconnections)
  	return TRUE;
***************
*** 663,668 ****
--- 700,711 ----
  		CloseDownClient(client);     
  	}
      }
+ #else /* AMOEBA */
+     /* EstablishNewConnections is only called when there is one new
+      * connection waiting on the first transport.
+      */
+     readyconnections = 1;
+ #endif /* AMOEBA */
      while (readyconnections) 
      {
  	XtransConnInfo trans_conn, new_trans_conn;
***************
*** 717,722 ****
--- 760,769 ----
  	    (client = NextAvailableClient((pointer)oc)))
  	{
  	    ConnectionTranslation[newconn] = client->index;
+ #ifdef LBX_COMPAT
+ 	    client->public.readRequest = StandardReadRequestFromClient;
+ 	    client->public.writeToClient = StandardWriteToClient;
+ #endif
  	}
  	else
  	{
***************
*** 745,750 ****
--- 792,798 ----
      struct iovec iov[3];
      char byteOrder = 0;
      int whichbyte = 1;
+ #ifndef AMOEBA
      struct timeval waittime;
      FdSet mask;
  
***************
*** 755,760 ****
--- 803,809 ----
      CLEARBITS(mask);
      BITSET(mask, fd);
      (void)select(fd + 1, (int *) mask, (int *) NULL, (int *) NULL, &waittime);
+ #endif
      /* try to read the byte-order of the connection */
      (void)_XSERVTransRead(trans_conn, &byteOrder, 1);
      if ((byteOrder == 'l') || (byteOrder == 'B'))
***************
*** 847,852 ****
--- 896,902 ----
      struct timeval	notime;
      int r;
  
+ #ifndef AMOEBA
      notime.tv_sec = 0;
      notime.tv_usec = 0;
  
***************
*** 866,871 ****
--- 916,922 ----
  	    mask &= ~(1 << curoff);
  	}
      }	
+ #endif
  }
  
  
***************
*** 882,887 ****
--- 933,939 ----
  
      if (oc->output && oc->output->count)
  	FlushClient(client, oc, (char *)NULL, 0);
+     ConnectionTranslation[oc->fd] = 0;
  #ifdef XDMCP
      XdmcpCloseDisplay(oc->fd);
  #endif
diff -c xc/programs/Xserver/os/io.c:1.1.1.5 xc/programs/Xserver/os/io.c:3.6
*** xc/programs/Xserver/os/io.c:1.1.1.5	Mon Jan 30 17:43:14 1995
--- xc/programs/Xserver/os/io.c	Mon Jan 30 17:43:14 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: io.c,v 1.91 95/01/25 11:14:28 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/io.c,v 3.6 1995/01/28 16:16:03 dawes Exp $ */
  /*****************************************************************
   * i/o functions
   *
***************
*** 61,67 ****
--- 62,70 ----
  #endif
  #include "Xmd.h"
  #include <errno.h>
+ #if !defined(AMOEBA) && !defined(MINIX)
  #include <sys/uio.h>
+ #endif
  #include "X.h"
  #include "Xproto.h"
  #include "os.h"
***************
*** 191,197 ****
  #define YieldControlDeath()			\
          { timesThisConnection = 0; }
  
! #ifdef LBX
  int
  StandardReadRequestFromClient(client)
      ClientPtr client;
--- 194,200 ----
  #define YieldControlDeath()			\
          { timesThisConnection = 0; }
  
! #if defined(LBX) || defined(LBX_COMPAT)
  int
  StandardReadRequestFromClient(client)
      ClientPtr client;
***************
*** 325,332 ****
  	{
  	    if ((result < 0) && ETEST(errno))
  	    {
! 		YieldControlNoInput();
! 		return 0;
  	    }
  	    YieldControlDeath();
  	    return -1;
--- 328,350 ----
  	{
  	    if ((result < 0) && ETEST(errno))
  	    {
! #if defined(SVR4) && defined(i386) && !defined(sun)
! #ifdef LBX && 0
! 		/*
! 		 * For LBX connections, we can get a valid EWOULDBLOCK
! 		 * There is probably a better way of distinguishing LBX
! 		 * connections, but this works. (DHD)
! 		 */
! 		extern int LbxRead();
! 		if (oc->Read == LbxRead)
! #else
! 		if (0)
! #endif
! #endif
! 		{
! 		    YieldControlNoInput();
! 		    return 0;
! 		}
  	    }
  	    YieldControlDeath();
  	    return -1;
***************
*** 866,872 ****
   *****************/
  
  int
! #ifdef LBX
  StandardWriteToClient (who, count, buf)
  #else
  WriteToClient (who, count, buf)
--- 884,890 ----
   *****************/
  
  int
! #if defined(LBX) || defined(LBX_COMPAT)
  StandardWriteToClient (who, count, buf)
  #else
  WriteToClient (who, count, buf)
diff -c xc/programs/Xserver/os/osdep.h:1.1.1.1 xc/programs/Xserver/os/osdep.h:3.0
*** xc/programs/Xserver/os/osdep.h:1.1.1.1	Mon Jan 30 17:43:15 1995
--- xc/programs/Xserver/os/osdep.h	Mon Jan 30 17:43:15 1995
***************
*** 46,56 ****
--- 46,75 ----
  
  ******************************************************************/
  /* $XConsortium: osdep.h,v 1.40 94/04/17 20:27:05 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.0 1994/04/28 12:42:44 dawes Exp $ */
  
+ #ifdef AMOEBA
+ #include <stddef.h>
+ #define port am_port_t
+ #include <amoeba.h>
+ #include <stdio.h>
+ #include <assert.h>
+ #include <semaphore.h>
+ #include <circbuf.h>
+ #include <exception.h>
+ #include <vc.h>
+ #include <fault.h>
+ #include <module/signals.h>
+ #include <server/x11/Xamoeba.h>
+ #undef  port
+ #endif
+ 
  #define BOTIMEOUT 200 /* in milliseconds */
  #define BUFSIZE 4096
  #define BUFWATERMARK 8192
+ #ifndef MAXBUFSIZE
  #define MAXBUFSIZE (1 << 22)
+ #endif
  
  #include <X11/Xmd.h>
  
***************
*** 200,205 ****
--- 219,236 ----
   * #define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || src[4] ...)
   */
  #endif
+ 
+ #ifdef AMOEBA
+ #include "X.h"
+ #include "misc.h"
+ 
+ #define FamilyAmoeba 33
+ 
+ extern char             *XServerHostName;       /* X server host name */
+ extern char             *XTcpServerName;        /* TCP/IP server name */
+ extern int              maxClient;              /* Highest client# */
+ extern int              nNewConns;              /* # of new clients */
+ #endif /* AMOEBA */
  
  typedef struct _connectionInput {
      struct _connectionInput *next;
diff -c xc/programs/Xserver/os/osinit.c:1.1.1.2 xc/programs/Xserver/os/osinit.c:3.9
*** xc/programs/Xserver/os/osinit.c:1.1.1.2	Mon Jan 30 17:43:15 1995
--- xc/programs/Xserver/os/osinit.c	Mon Jan 30 17:43:16 1995
***************
*** 46,51 ****
--- 46,52 ----
  
  ******************************************************************/
  /* $XConsortium: osinit.c,v 1.49 95/01/17 14:12:18 kaleb Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.9 1995/01/28 16:16:05 dawes Exp $ */
  
  #include <stdio.h>
  #include "X.h"
***************
*** 61,67 ****
  #endif
  #endif
  
! #ifndef SYSV
  #include <sys/resource.h>
  #endif
  
--- 62,68 ----
  #endif
  #endif
  
! #if !defined(SYSV) && !defined(AMOEBA) && !defined(_MINIX)
  #include <sys/resource.h>
  #endif
  
***************
*** 85,90 ****
--- 86,92 ----
  void
  OsInit()
  {
+ #ifndef AMOEBA
      static Bool been_here = FALSE;
      char fname[PATH_MAX];
  
***************
*** 93,100 ****
--- 95,104 ----
  #endif
  
      if (!been_here) {
+ #if !defined(MINIX) && !defined(SCO)
  	fclose(stdin);
  	fclose(stdout);
+ #endif
  	/* hack test to decide where to log errors */
  	if (write (2, fname, 0)) 
  	{
***************
*** 111,117 ****
  		dup2 (fileno (err), 2);
  		fclose (err);
  	    }
! #if defined(SYSV) || defined(SVR4)
  	    {
  	    static char buf[BUFSIZ];
  	    setvbuf (stderr, buf, _IOLBF, BUFSIZ);
--- 115,121 ----
  		dup2 (fileno (err), 2);
  		fclose (err);
  	    }
! #if defined(SYSV) || defined(SVR4) || defined(MINIX)
  	    {
  	    static char buf[BUFSIZ];
  	    setvbuf (stderr, buf, _IOLBF, BUFSIZ);
***************
*** 178,185 ****
--- 182,193 ----
  	    }
  	}
  #endif
+ #ifdef SERVER_LOCK
+ 	LockServer();
+ #endif
  	been_here = TRUE;
      }
+ #endif /* AMOEBA */
      TimerInit();
  #ifdef DDXOSINIT
      OsVendorInit();
***************
*** 186,189 ****
--- 194,205 ----
  #endif
      OsInitAllocator();
      if (!OsDelayInitColors) OsInitColors();
+ }
+ 
+ void
+ OsCleanup()
+ {
+ #ifdef SERVER_LOCK
+     UnlockServer();
+ #endif
  }
diff -c xc/programs/Xserver/os/utils.c:1.1.1.2 xc/programs/Xserver/os/utils.c:3.6
*** xc/programs/Xserver/os/utils.c:1.1.1.2	Mon Jan 30 17:43:16 1995
--- xc/programs/Xserver/os/utils.c	Mon Jan 30 17:43:16 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: utils.c,v 1.147 94/08/16 14:03:23 dpw Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/utils.c,v 3.6 1994/12/29 10:22:01 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
***************
*** 71,77 ****
  #undef _POSIX_SOURCE
  #endif
  #endif
! #ifndef SYSV
  #include <sys/resource.h>
  #endif
  #include <time.h>
--- 72,78 ----
  #undef _POSIX_SOURCE
  #endif
  #endif
! #if !defined(SYSV) && !defined(AMOEBA) && !defined(_MINIX)
  #include <sys/resource.h>
  #endif
  #include <time.h>
***************
*** 81,86 ****
--- 82,106 ----
  #include <stdarg.h>
  #endif
  
+ #ifdef AMOEBA
+ #include "osdep.h"
+ #include <amoeba.h>
+ #include <module/mutex.h>
+ 
+ static mutex print_lock;
+ #endif
+ 
+ #if defined(__STDC__) || defined(AMOEBA)
+ /* DHD: SVR4.0 has a prototype for abs() in stdlib.h */
+ /* DHD: might be better to move this include higher up? */
+ #ifdef abs
+ #undef abs
+ #endif
+ #ifndef NOSTDHDRS
+ #include <stdlib.h>	/* for malloc() */
+ #endif
+ #endif
+ 
  extern char *display;
  
  extern CARD32 defaultScreenSaverTime;	/* for parsing command line */
***************
*** 171,176 ****
--- 191,351 ----
  #endif
  }
  
+ #ifdef SERVER_LOCK
+ /*
+  * Explicit support for a server lock file like the ones used for UUCP.
+  * For architectures with virtual terminals that can run more than one
+  * server at a time.  This keeps the servers from stomping on each other
+  * if the user forgets to give them different display numbers.
+  */
+ #define LOCK_PATH "/tmp/.X"
+ #define LOCK_TMPPATH "/tmp/.tX"
+ #define LOCK_SUFFIX "-lock"
+ 
+ #ifdef _MINIX
+ #include <limits.h>	/* For PATH_MAX */
+ #endif
+ 
+ #ifndef PATH_MAX
+ #include <sys/param.h>
+ #ifndef PATH_MAX
+ #ifdef MAXPATHLEN
+ #define PATH_MAX MAXPATHLEN
+ #else
+ #define PATH_MAX 1024
+ #endif
+ #endif
+ #endif
+ 
+ #include <errno.h>
+ extern int errno;
+ 
+ static Bool StillLocking = FALSE;
+ 
+ /*
+  * LockServer --
+  *      Check if the server lock file exists.  If so, check if the PID
+  *      contained inside is valid.  If so, then die.  Otherwise, create
+  *      the lock file containing the PID.
+  */
+ void
+ LockServer()
+ {
+ #ifndef AMOEBA
+   char tmp[PATH_MAX], lock[PATH_MAX], pid_str[12];
+   int lfd, i, haslock, l_pid, t;
+ 
+   /*
+    * Path names
+    */
+   (void) sprintf(tmp, "%s%s%s", LOCK_TMPPATH, display, LOCK_SUFFIX);
+   (void) sprintf(lock, "%s%s%s", LOCK_PATH, display, LOCK_SUFFIX);
+ 
+   /*
+    * Create a temporary file containing our PID.  Attempt three times
+    * to create the file.
+    */
+   StillLocking = TRUE;
+   i = 0;
+   do {
+     i++;
+     lfd = creat(tmp, 0444);
+     if (lfd < 0)
+        sleep(2);
+     else
+        break;
+   } while (i < 3);
+   if (lfd < 0)
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10d\n", getpid());
+   (void) write(lfd, pid_str, 11);
+   (void) close(lfd);
+   (void) chmod(tmp, 0444);
+ 
+   /*
+    * OK.  Now the tmp file exists.  Try three times to move it in place
+    * for the lock.
+    */
+   i = 0;
+   haslock = 0;
+   while ((!haslock) && (i++ < 3)) {
+     haslock = (link(tmp,lock) == 0);
+     if (haslock) {
+       /*
+        * We're done.
+        */
+       break;
+     }
+     else {
+       /*
+        * Read the pid from the existing file
+        */
+       lfd = open(lock, O_RDONLY);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", lock);
+       }
+       pid_str[0] = '\0';
+       if (read(lfd, pid_str, 11) != 11) {
+         /*
+          * Bogus lock file.
+          */
+         unlink(lock);
+         close(lfd);
+         continue;
+       }
+       pid_str[11] = '\0';
+       sscanf(pid_str, "%d", &l_pid);
+       close(lfd);
+ 
+       /*
+        * Now try to kill the PID to see if it exists.
+        */
+       errno = 0;
+       t = kill(l_pid, 0);
+       if ((t< 0) && (errno == ESRCH)) {
+         /*
+          * Stale lock file.
+          */
+         unlink(lock);
+         continue;
+       }
+       else if (((t < 0) && (errno == EPERM)) || (t == 0)) {
+         /*
+          * Process is still active.
+          */
+         unlink(tmp);
+ 	FatalError("Server is already active for display %s\n%s %s\n%s\n",
+ 		   display, "\tIf this server is no longer running, remove",
+ 		   lock, "\tand start again.");
+       }
+     }
+   }
+   unlink(tmp);
+   if (!haslock)
+     FatalError("Could not create server lock file: %s\n", lock);
+   StillLocking = FALSE;
+ #endif /* !AMOEBA */
+ }
+ 
+ /*
+  * Unlock_Server --
+  *      Remove the server lock file.
+  */
+ void
+ UnlockServer()
+ {
+ #ifndef AMOEBA
+   char buf[PATH_MAX];
+ 
+   if (StillLocking)
+     return;
+   (void)sprintf(buf, "%s%s%s", LOCK_PATH, display, LOCK_SUFFIX);
+   (void) unlink(buf);
+ #endif
+ }
+ #endif /* SERVER_LOCK */
+ 
  /* Force connections to close on SIGHUP from init */
  
  /*ARGSUSED*/
***************
*** 187,192 ****
--- 362,370 ----
  #if defined(SYSV) && defined(X_NOT_POSIX)
      OsSignal (SIGHUP, AutoResetServer);
  #endif
+ #ifdef AMOEBA
+     WakeUpMainThread();
+ #endif
  }
  
  /* Force connections to close and then exit on SIGTERM, SIGINT */
***************
*** 202,207 ****
--- 380,388 ----
      if (sig)
  	OsSignal(sig, SIG_IGN);
  #endif
+ #ifdef AMOEBA
+     WakeUpMainThread();
+ #endif
  }
  
  
***************
*** 210,217 ****
--- 391,402 ----
  {
      extern void AbortDDX();
  
+     OsCleanup();
      AbortDDX();
      fflush(stderr);
+ #ifdef AMOEBA
+     IOPCleanUp();
+ #endif
      if (CoreDump)
  	abort();
      exit (1);
***************
*** 221,227 ****
--- 406,418 ----
  Error(str)
      char *str;
  {
+ #ifdef AMOEBA
+     mu_lock(&print_lock);
+ #endif
      perror(str);
+ #ifdef AMOEBA
+     mu_unlock(&print_lock);
+ #endif
  }
  
  #ifndef DDXTIME
***************
*** 228,237 ****
--- 419,432 ----
  CARD32
  GetTimeInMillis()
  {
+ #ifndef AMOEBA
      struct timeval  tp;
  
      X_GETTIMEOFDAY(&tp);
      return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
+ #else
+     return sys_milli();
+ #endif
  }
  #endif
  
***************
*** 263,269 ****
--- 458,468 ----
  void UseMsg()
  {
  #if !defined(AIXrt) && !defined(AIX386)
+ #ifndef AMOEBA
      ErrorF("use: X [:<display>] [option]\n");
+ #else
+     ErrorF("use: X [[<host>]:<display>] [option]\n");
+ #endif
      ErrorF("-a #                   mouse acceleration (pixels)\n");
      ErrorF("-ac                    disable access control restrictions\n");
  #ifdef MEMBUG
***************
*** 306,311 ****
--- 505,511 ----
  #endif
      ErrorF("-p #                   screen-saver pattern duration (minutes)\n");
      ErrorF("-pn                    accept failure to listen on all ports\n");
+     ErrorF("-nopn                  reject failure to listen on all ports\n");
      ErrorF("-r                     turns off auto-repeat\n");
      ErrorF("r                      turns on auto-repeat \n");
      ErrorF("-s #                   screen-saver timeout (minutes)\n");
***************
*** 319,324 ****
--- 519,527 ----
      ErrorF("-v                     screen-saver without video blanking\n");
      ErrorF("-wm                    WhenMapped default backing-store\n");
      ErrorF("-x string              loads named extension at init time \n");
+ #ifdef AMOEBA
+     ErrorF("-tcp capability        specify TCP/IP server capability\n");
+ #endif
  #ifdef XDMCP
      XdmcpUseMsg();
  #endif
***************
*** 339,346 ****
--- 542,557 ----
  {
      int i, skip;
  
+ #ifdef AMOEBA
+     mu_init(&print_lock);
+ #endif
+ 
      defaultKeyboardControl.autoRepeat = TRUE;
  
+ #ifdef PART_NET
+ 	PartialNetwork = TRUE;
+ #endif
+ 
  #ifdef AIXV3
      OpenDebug();
  #endif
***************
*** 357,362 ****
--- 568,589 ----
  	    display = argv[i];
  	    display++;
  	}
+ #ifdef AMOEBA
+         else if (strchr(argv[i], ':') != NULL) {
+             char *p;
+ 
+             XServerHostName = argv[i];
+             if ((p = strchr(argv[i], ':')) != NULL) {
+                 *p++ = '\0';
+                 display = p;
+             }
+         } else if (strcmp( argv[i], "-tcp") == 0) {
+             if (++i < argc)
+                 XTcpServerName = argv[i];
+             else
+                 UseMsg();
+         }
+ #endif /* AMOEBA */
  	else if ( strcmp( argv[i], "-a") == 0)
  	{
  	    if(++i < argc)
***************
*** 540,545 ****
--- 767,774 ----
  	}
  	else if ( strcmp( argv[i], "-pn") == 0)
  	    PartialNetwork = TRUE;
+ 	else if ( strcmp( argv[i], "-nopn") == 0)
+ 	    PartialNetwork = FALSE;
  	else if ( strcmp( argv[i], "r") == 0)
  	    defaultKeyboardControl.autoRepeat = TRUE;
  	else if ( strcmp( argv[i], "-r") == 0)
***************
*** 798,804 ****
--- 1027,1035 ----
  Xalloc (amount)
      unsigned long amount;
  {
+ #if !defined(__STDC__) && !defined(AMOEBA)
      char		*malloc();
+ #endif
      register pointer  ptr;
  	
      if ((long)amount <= 0)
***************
*** 826,832 ****
--- 1057,1065 ----
  XNFalloc (amount)
      unsigned long amount;
  {
+ #if !defined(__STDC__) && !defined(AMOEBA)
      char             *malloc();
+ #endif
      register pointer ptr;
  
      if ((long)amount <= 0)
***************
*** 868,875 ****
--- 1101,1110 ----
      register pointer ptr;
      unsigned long amount;
  {
+ #if !defined(__STDC__) && !defined(AMOEBA)
      char *malloc();
      char *realloc();
+ #endif
  
  #ifdef MEMBUG
      if (!Must_have_memory && Memory_fail &&
***************
*** 1046,1052 ****
--- 1281,1293 ----
      if (SyncOn)
          sync();
  #else /* not AIXV3 */
+ #ifdef AMOEBA
+     mu_lock(&print_lock);
+ #endif
      fprintf( stderr, f, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9);
+ #ifdef AMOEBA
+     mu_unlock(&print_lock);
+ #endif
  #endif /* AIXV3 */
  #endif
  }
diff -c xc/programs/Xserver/os/xdmcp.c:1.1.1.2 xc/programs/Xserver/os/xdmcp.c:3.5
*** xc/programs/Xserver/os/xdmcp.c:1.1.1.2	Mon Jan 30 17:43:17 1995
--- xc/programs/Xserver/os/xdmcp.c	Mon Jan 30 17:43:18 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xdmcp.c,v 1.31 94/06/03 17:21:13 mor Exp $ */
+ /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.5 1994/12/17 10:09:26 dawes Exp $ */
  /*
   * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
   *
***************
*** 15,24 ****
--- 16,35 ----
   */
  
  #include "Xos.h"
+ #ifndef MINIX
  #include <sys/param.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <netdb.h>
+ #else
+ #include <net/hton.h>
+ #include <net/netlib.h>
+ #include <net/gen/netdb.h>
+ #include <net/gen/udp.h>
+ #include <net/gen/udp_io.h>
+ #include <sys/nbio.h>
+ #include <sys/ioctl.h>
+ #endif
  #include <stdio.h>
  #include "X.h"
  #include "Xmd.h"
***************
*** 202,207 ****
--- 213,228 ----
  #endif
  );
  
+ #ifdef MINIX
+ static void read_cb(
+ #if NeedFunctionPrototypes
+     nbio_ref_t	/*ref*/,
+     int		/*res*/,
+     int		/*err*/
+ #endif
+ );
+ #endif
+ 
  static short	xdm_udp_port = XDM_UDP_PORT;
  static Bool	OneSession = FALSE;
  
***************
*** 892,899 ****
  static
  get_xdmcp_sock()
  {
-     int soopts = 1;
- 
  #ifdef STREAMSCONN
      if ((xdmcpSocket = t_open("/dev/udp", O_RDWR, 0)) < 0)
  	XdmcpWarning("t_open() of /dev/udp failed");
--- 913,918 ----
***************
*** 900,906 ****
--- 919,969 ----
      if( t_bind(xdmcpSocket,NULL,NULL) < 0 )
  	t_error("t_bind(xdmcpSocket) failed" );
  #else
+ #ifndef _MINIX
+     int soopts = 1;
+ 
      if ((xdmcpSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ #else /* MINIX */
+     char *udp_device;
+     int r, s_errno;
+     nwio_udpopt_t udpopt;
+     nbio_ref_t ref;
+ 
+     udp_device= getenv("UDP_DEVICE");
+     if (udp_device == NULL)
+     	udp_device= UDP_DEVICE;
+     xdmcpSocket= open(udp_device, O_RDWR);
+     if (xdmcpSocket != -1)
+     {
+     	udpopt.nwuo_flags= NWUO_COPY | NWUO_LP_SEL | NWUO_EN_LOC | 
+     		NWUO_DI_BROAD | NWUO_RP_ANY | NWUO_RA_ANY | NWUO_RWDATALL |
+     		NWUO_DI_IPOPT;
+     	r= ioctl(xdmcpSocket, NWIOSUDPOPT, &udpopt);
+     	if (r == -1)
+     	{
+     		s_errno= errno;
+     		close(xdmcpSocket);
+     		xdmcpSocket= -1;
+     		errno= s_errno;
+     	}
+     	ioctl(xdmcpSocket, NWIOGUDPOPT, &udpopt);
+     	ErrorF("0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n", 
+     		udpopt.nwuo_flags,
+     		udpopt.nwuo_locport,
+     		udpopt.nwuo_remport,
+     		udpopt.nwuo_locaddr,
+     		udpopt.nwuo_remaddr);
+     }
+     if (xdmcpSocket != -1)
+     {
+ 	fcntl(xdmcpSocket, F_SETFD, fcntl(xdmcpSocket, F_GETFD) | 
+     								FD_ASYNCHIO);
+ 	nbio_register(xdmcpSocket);
+ 	ref.ref_int= xdmcpSocket;
+ 	nbio_setcallback(xdmcpSocket, ASIO_READ, read_cb, ref);
+     }
+     if (xdmcpSocket == -1)
+ #endif /* !MINIX */
  	XdmcpWarning("UDP socket creation failed");
  #ifdef SO_BROADCAST
      else if (setsockopt(xdmcpSocket, SOL_SOCKET, SO_BROADCAST, (char *)&soopts,
***************
*** 1236,1247 ****
      char	*type;
      ARRAY8Ptr	status;
  {
!     extern void AbortDDX();
! 
!     ErrorF ("XDMCP fatal error: %s %*.*s\n", type,
  	   status->length, status->length, status->data);
-     AbortDDX ();
-     exit (1);
  }
  
  static 
--- 1299,1306 ----
      char	*type;
      ARRAY8Ptr	status;
  {
!     FatalError ("XDMCP fatal error: %s %*.*s\n", type,
  	   status->length, status->length, status->data);
  }
  
  static 
***************
*** 1268,1274 ****
--- 1327,1337 ----
  	ErrorF("Xserver: unknown host: %s\n", argv[i]);
  	exit(1);
      }
+ #ifndef _MINIX
      if (hep->h_length == sizeof (struct in_addr))
+ #else
+     if (hep->h_length == sizeof (ipaddr_t))
+ #endif
      {
  	memmove(&ManagerAddress.sin_addr, hep->h_addr, hep->h_length);
  #ifdef BSD44SOCKETS
***************
*** 1283,1288 ****
--- 1346,1411 ----
  	exit (1);
      }
  }
+ 
+ #ifdef MINIX
+ static char read_buffer[XDM_MAX_MSGLEN+sizeof(udp_io_hdr_t)];
+ static int read_inprogress;
+ static int read_size;
+ 
+ int
+ XdmcpFill (fd, buffer, from, fromlen)
+ int             fd;
+ XdmcpBufferPtr  buffer;
+ XdmcpNetaddr    from;       /* return */
+ int             *fromlen;   /* return */
+ {
+ 	int r;
+ 
+ 	if (read_inprogress)
+ 		return 0;
+ 
+ 	if (read_size != 0)
+ 	{
+ 		r= read_size;
+ 		read_size= 0;
+ 		return MNX_XdmcpFill(fd, buffer, from, fromlen, read_buffer,
+ 			r);
+ 	}
+ 
+ 	r= read(fd, read_buffer, sizeof(read_buffer));
+ 	if (r > 0)
+ 	{
+ 		return MNX_XdmcpFill(fd, buffer, from, fromlen, read_buffer,
+ 			r);
+ 	}
+ 	else if (r == -1 && errno == EINPROGRESS)
+ 	{
+ 		read_inprogress= 1;
+ 		nbio_inprogress(fd, ASIO_READ, 1 /* read */, 0 /* write */,
+ 			0 /* except */);
+ 		return 0;
+ 	}
+ 	else
+ 		FatalError("XdmcpFill: read failed: %s\n",
+ 			r == 0 ? "EOF" : strerror(errno));
+ 	return 0;
+ }
+ 
+ static void read_cb(ref, res, err)
+ nbio_ref_t ref;
+ int res;
+ int err;
+ {
+ 	if (res <= 0)
+ 	{
+ 		FatalError("xdmcp'read_cb: read failed: %s\n",
+ 			res == 0 ? "EOF" : strerror(err));
+ 	}
+ 	read_inprogress= 0;
+ 	read_size= res;
+ }
+ #endif
+ 
  #else
  static int xdmcp_non_empty; /* avoid complaint by ranlib */
  #endif /* XDMCP */
diff -c /dev/null xc/programs/Xserver/oslbx/Imakefile:3.1
*** /dev/null	Mon Jan 30 17:43:19 1995
--- xc/programs/Xserver/oslbx/Imakefile	Mon Jan 30 17:43:19 1995
***************
*** 0 ****
--- 1,10 ----
+ XCOMM $XFree86: xc/programs/Xserver/oslbx/Imakefile,v 3.1 1994/12/25 13:48:23 dawes Exp $
+ 
+ #define LinkDirectory ../os
+ 
+ #include "../os/Imakefile"
+ 
+ EXTRA_DEFINES = -DLBX -UBIGREQS
+ 
+ InstallLinkKitNamedLibrary(os,oslbx,$(LINKKITDIR)/lib)
+ 
diff -c xc/programs/bdftopcf/Imakefile:1.1.1.1 xc/programs/bdftopcf/Imakefile:3.1
*** xc/programs/bdftopcf/Imakefile:1.1.1.1	Mon Jan 30 17:43:22 1995
--- xc/programs/bdftopcf/Imakefile	Mon Jan 30 17:43:22 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.7 93/09/04 17:40:29 rws Exp $
+ XCOMM $XFree86: xc/programs/bdftopcf/Imakefile,v 3.1 1994/12/17 11:22:28 dawes Exp $
  LOCAL_LIBRARIES = $(FONTLIB)
  DEPLIBS = $(DEPFONTLIB)
  INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
***************
*** 6,8 ****
--- 7,13 ----
  OBJS = bdftopcf.o
  
  ComplexProgramTarget(bdftopcf)
+ #ifdef OS2Architecture
+ all:: bdftopcf.exe
+ 	$(CP) bdftopcf.exe /
+ #endif
diff -c /dev/null xc/programs/beforelight/B4light.ad:3.0
*** /dev/null	Mon Jan 30 17:43:23 1995
--- xc/programs/beforelight/B4light.ad	Mon Jan 30 17:43:23 1995
***************
*** 0 ****
--- 1 ----
+ *label.label: Before Light - Keith's hack...
diff -c /dev/null xc/programs/beforelight/Imakefile:3.1
*** /dev/null	Mon Jan 30 17:43:23 1995
--- xc/programs/beforelight/Imakefile	Mon Jan 30 17:43:24 1995
***************
*** 0 ****
--- 1,15 ----
+ XCOMM $XConsortium: Imakefile,v 1.2 93/09/18 16:23:30 rws Exp $
+ XCOMM $XFree86: xc/programs/beforelight/Imakefile,v 3.1 1994/07/15 07:05:55 dawes Exp $
+         DEPLIBS = XawClientDepLibs
+ LOCAL_LIBRARIES = XawClientLibs
+            SRCS = b4light.c
+            OBJS = b4light.o
+ 
+ ComplexProgramTargetNoMan(beforelight)
+ InstallAppDefaultsLong(B4light,Beforelight)
+ 
+ #if ExpandManNames
+ InstallManPageLong(b4light,$(MANDIR),beforelight)
+ #else
+ InstallManPage(b4light,$(MANDIR))
+ #endif
diff -c /dev/null xc/programs/beforelight/b4light.c:3.2
*** /dev/null	Mon Jan 30 17:43:24 1995
--- xc/programs/beforelight/b4light.c	Mon Jan 30 17:43:24 1995
***************
*** 0 ****
--- 1,419 ----
+ /*
+  * $XConsortium: b4light.c,v 1.3 94/04/17 20:59:38 rws Exp $
+  * $XFree86: xc/programs/beforelight/b4light.c,v 3.2 1994/08/01 13:21:00 dawes Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #include <X11/Xatom.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
+ #include <X11/Xaw/Label.h>
+ #include <X11/Xaw/Cardinals.h>
+ #include <X11/extensions/scrnsaver.h>
+ #include <X11/Xcms.h>
+ 
+ static void quit ();
+ 
+ static XtActionsRec beforedark_actions[] = {
+     { "quit",	quit },
+ };
+ 
+ static Atom wm_delete_window;
+ 
+ static int  ss_event, ss_error;
+ 
+ static Display *display;
+ static Window  root, saver;
+ static int screen;
+ static int  scr_wid, scr_hei;
+ static Colormap	cmap;
+ static GC gc, black_gc, erase_gc;
+ static int  screen_saved;
+ static XtAppContext app_con;
+ static XtIntervalId interval;
+ static GC   bit_1_gc, bit_0_gc;
+ static Bool	filled = False;
+ 
+ #define MAX_POINTS  16
+ 
+ typedef  struct _moving {
+     int  x, y, dx, dy;
+ } Moving;
+ 
+ static Moving	p[MAX_POINTS];
+ 
+ #define NUM_HISTORY 32
+ 
+ static XPoint	history[NUM_HISTORY][MAX_POINTS];
+ static Pixmap	old_pixmaps[NUM_HISTORY];
+ static unsigned long	old_pixels[NUM_HISTORY];
+ static int	num_points = 3;
+ static int	history_head, history_tail;
+ #define hist_bump(h)	((++(h) == NUM_HISTORY) ? ((h) = 0) : 0)
+ 
+ #define NUM_COLORS  64
+ 
+ static unsigned long	black_pixel;
+ static unsigned long	pixels[NUM_COLORS];
+ static int  cur_pen = 0;
+ 
+ static void
+ AllocateColors ()
+ {
+     double	angle;
+     double	step;
+     XcmsColor	cms_color;
+     int		i;
+     XColor	hard, exact;
+ 
+     XAllocNamedColor (display, cmap, "black", &hard, &exact);
+     black_pixel = hard.pixel;
+     step = 360.0 / NUM_COLORS;
+     for (i = 0; i < NUM_COLORS; i++) {
+ 	angle = i * step;
+ 	cms_color.spec.TekHVC.H = angle;
+ 	cms_color.spec.TekHVC.V = 75.0;
+ 	cms_color.spec.TekHVC.C = 75.0;
+ 	cms_color.format = XcmsTekHVCFormat;
+ 	XcmsAllocColor (display, cmap, &cms_color, XcmsRGBFormat);
+ 	pixels[i] = cms_color.pixel;
+     }
+ }
+ 
+ 
+ static void
+ StepPen ()
+ {
+     XSetForeground (display, gc, pixels[cur_pen]);
+     cur_pen++;
+     if (cur_pen == NUM_COLORS)
+ 	cur_pen = 0;
+ }
+ 
+ static void
+ DrawPoints (draw, gc, p, n)
+     Drawable	draw;
+     GC		gc;
+     XPoint	*p;
+ {
+     XPoint  xp[MAX_POINTS + 1];
+     int	    i;
+ 
+     switch (n) {
+     case 1:
+ 	XDrawPoint (display, draw, gc, p->x, p->y);
+ 	break;
+     case 2:
+ 	XDrawLine (display, draw, gc, p[0].x, p[0].y, p[1].x, p[1].y);
+ 	break;
+     default:
+ 	for (i = 0; i < n; i++) {
+ 	    xp[i].x = p[i].x; xp[i].y = p[i].y;
+ 	}
+ 	xp[i].x = p[0].x; xp[i].y = p[0].y;
+ 	if (filled)
+ 	    XFillPolygon (display, draw, gc, xp, i+1, Complex, CoordModeOrigin);
+ 	else
+ 	    XDrawLines (display, draw, gc, xp, i + 1, CoordModeOrigin);
+     }
+ }
+ 
+ static void
+ Draw (p, n)
+     Moving  *p;
+     int	    n;
+ {
+     XPoint  xp[MAX_POINTS];
+     int	    i;
+     for (i = 0; i < n; i++) 
+     {
+ 	xp[i].x = p[i].x; xp[i].y = p[i].y;
+     }
+     old_pixels[history_head] = pixels[cur_pen];
+     StepPen ();
+     DrawPoints (saver, gc, xp, n);
+     if (filled)
+     {
+ 	XFillRectangle (display, old_pixmaps[history_head], bit_0_gc,
+ 			0, 0, scr_wid, scr_hei);
+ 	DrawPoints (old_pixmaps[history_head], bit_1_gc, xp, n);
+ 	for (i = history_tail; i != history_head; hist_bump(i))
+ 	    DrawPoints (old_pixmaps[i], bit_0_gc, xp, n);
+     }
+ }
+ 
+ static void
+ Erase (p, n)
+     XPoint  *p;
+     int	    n;
+ {
+     if (filled) {
+ 	XSetForeground (display, erase_gc, black_pixel ^ old_pixels[history_tail]);
+ 	XCopyPlane (display, old_pixmaps[history_tail], saver, erase_gc,
+ 		    0, 0, scr_wid, scr_hei, 0, 0, 1);
+     }
+     else
+ 	DrawPoints (saver, black_gc, p, n);
+ }
+ 
+ #define STEP_MAX    32
+ 
+ static int
+ RandomStep ()
+ {
+     return (rand () % STEP_MAX) + 1;
+ }
+ 
+ static
+ StepMoving (m)
+     Moving  *m;
+ {
+     int	maxx, maxy;
+ 
+     maxx = DisplayWidth (display, screen);
+     maxy = DisplayHeight (display, screen);
+     m->x += m->dx;
+     if (m->x <= 0) {
+ 	m->x = 0;
+ 	m->dx = RandomStep ();
+     }
+     if (m->x >= maxx) {
+ 	m->x = maxx - 1;
+ 	m->dx = -RandomStep ();
+     }
+     m->y += m->dy;
+     if (m->y <= 0) {
+ 	m->y = 0;
+ 	m->dy = RandomStep ();
+     }
+     if (m->y >= maxy) {
+ 	m->y = maxy - 1;
+ 	m->dy = -RandomStep ();
+     }
+ }
+ 
+ static void
+ StepPoints ()
+ {
+     int	i;
+ 
+     for (i = 0; i < num_points; i++)
+ 	StepMoving (&p[i]);
+     hist_bump(history_head);
+     if (history_tail == history_head)
+     {
+ 	Erase (history[history_tail], num_points);
+ 	hist_bump(history_tail);
+     }
+     Draw (p, num_points);
+     for (i = 0; i < num_points; i++)
+     {
+     	history[history_head][i].x = p[i].x;
+     	history[history_head][i].y = p[i].y;
+     }
+ }
+ 
+ StartPoints ()
+ {
+     history_head = history_tail = 0;
+ }
+ 
+ static void
+ Timeout (closure, id)
+     XtPointer	    closure;
+     XtIntervalId    *id;
+ {
+     if (screen_saved)
+     {
+ 	StepPoints ();
+ 	interval = XtAppAddTimeOut (app_con, 50, Timeout, NULL);
+     }
+ }
+ 
+ StartSaver ()
+ {
+     if (screen_saved)
+ 	return;
+     screen_saved = True;
+     StartPoints ();
+     StepPoints ();
+     interval = XtAppAddTimeOut (app_con, 50, Timeout, NULL);
+ }
+ 
+ StopSaver ()
+ {
+     if (!screen_saved)
+ 	return;
+     screen_saved = False;
+ }
+ 
+ int ignoreError (display, error)
+     Display *display;
+     XErrorEvent	*error;
+ {
+ }
+ 
+ void main(argc, argv)
+     int argc;
+     char **argv;
+ {
+     Widget toplevel;
+     Arg arg;
+     Pixmap icon_pixmap = None;
+     XEvent  event;
+     XScreenSaverNotifyEvent *sevent;
+     XSetWindowAttributes    attr;
+     XScreenSaverInfo	    *info;
+     unsigned long	    mask;
+     Pixmap		    blank_pix;
+     XColor		    dummyColor;
+     XID			    kill_id;
+     Atom		    kill_type;
+     int			    i;
+ 
+ #if !defined(X_NOT_POSIX) || ((__STDC__) && !defined(X_NOT_STDC_ENV))
+     srand((int)time((time_t *)NULL));
+ #else
+     srand((int)time((int *)NULL));
+ #endif
+ 
+     toplevel = XtAppInitialize (&app_con, "Beforelight", NULL, ZERO,
+ 				&argc, argv, NULL, NULL, ZERO);
+     display = XtDisplay (toplevel);
+     root = DefaultRootWindow (display);
+     screen = DefaultScreen (display);
+     scr_wid = DisplayWidth (display, screen);
+     scr_hei = DisplayHeight (display, screen);
+     if (!XScreenSaverQueryExtension (display, &ss_event, &ss_error))
+ 	exit (1);
+ #ifdef NOTDEF
+     XtAppAddActions (app_con, beforedark_actions, XtNumber(beforedark_actions));
+ 
+     /*
+      * This is a hack so that f.delete will do something useful in this
+      * single-window application.
+      */
+     XtOverrideTranslations(toplevel, 
+ 		    XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
+ 
+     XtCreateManagedWidget ("label", labelWidgetClass, toplevel, NULL, ZERO);
+     XtRealizeWidget (toplevel);
+     wm_delete_window = XInternAtom (XtDisplay(toplevel), "WM_DELETE_WINDOW",
+ 				    False);
+     (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
+ 			    &wm_delete_window, 1);
+     
+ #endif
+     if (XScreenSaverGetRegistered (display, screen, &kill_id, &kill_type))
+ 	XKillClient (display, kill_id);
+ 
+     XScreenSaverSelectInput (display, root, ScreenSaverNotifyMask);
+ #ifdef NOTDEF
+     cmap = XCreateColormap (display, root, DefaultVisual (display, screen), AllocNone);
+ #else
+     cmap = DefaultColormap (display, screen);
+ #endif
+     AllocateColors();
+     blank_pix = XCreatePixmap (display, root, 1, 1, 1);
+     XScreenSaverRegister (display, screen, (XID) blank_pix, XA_PIXMAP);
+     bit_0_gc = XCreateGC (display, blank_pix, 0, 0);
+     XSetForeground (display, bit_0_gc, 0);
+     bit_1_gc = XCreateGC (display, blank_pix, 0, 0);
+     XSetForeground (display, bit_1_gc, ~0);
+     XFillRectangle (display, blank_pix, bit_0_gc, 0, 0, 1, 1);
+     info = XScreenSaverAllocInfo ();
+     XScreenSaverQueryInfo (display, root, info);
+     mask = 0;
+     attr.colormap = cmap;
+     mask |= CWColormap;
+     attr.background_pixel = black_pixel;
+     mask |= CWBackPixel;
+     attr.cursor = XCreatePixmapCursor (display, blank_pix, blank_pix, &dummyColor, &dummyColor, 0, 0);
+     mask |= CWCursor;
+     XScreenSaverSetAttributes (display, root, 0, 0,
+ 	DisplayWidth (display, screen), DisplayHeight(display, screen), 0,
+ 	CopyFromParent, CopyFromParent, CopyFromParent, mask, &attr);
+     XSync (display, False);
+     gc = XCreateGC (display, root, 0, 0);
+     black_gc = XCreateGC (display, root, 0, 0);
+     XSetForeground (display, black_gc, black_pixel);
+     if (filled)
+     {
+     	erase_gc = XCreateGC (display, root, 0, 0);
+     	XSetBackground (display, erase_gc, 0);
+     	XSetFunction (display, erase_gc, GXxor);
+     	XSetGraphicsExposures (display, erase_gc, False);
+     	for (i = 0; i < NUM_HISTORY; i++)
+ 	    old_pixmaps[i] = XCreatePixmap (display, root, scr_wid, scr_hei, 1);
+     }
+     XSetErrorHandler (ignoreError);
+     saver = info->window;
+     if (info->state == ScreenSaverOn)
+     {
+ 	if (info->kind != ScreenSaverExternal) 
+ 	{
+ 	    XResetScreenSaver (display);
+ 	    XActivateScreenSaver (display);
+ 	}
+ 	StartSaver ();
+     }
+     for (;;) 
+     {
+ 	XtAppNextEvent (app_con, &event);
+ 	if (event.type == ss_event) {
+ 	    sevent = (XScreenSaverNotifyEvent *) &event;
+ 	    if (sevent->state == ScreenSaverOn) {
+ 		if (sevent->kind != ScreenSaverExternal) {
+ 	    	    XResetScreenSaver (display);
+ 	    	    XActivateScreenSaver (display);
+ 		} else {
+ 		    StartSaver ();
+ 		}
+ 	    } else if (sevent->state == ScreenSaverOff) {
+ 		StopSaver ();
+ 	    }
+ 	} else {
+ 	    XtDispatchEvent(&event);
+ 	}
+     }
+ }
+ 
+ static void quit (w, event, params, num_params)
+     Widget w;
+     XEvent *event;
+     String *params;
+     Cardinal *num_params;
+ {
+     if (event->type == ClientMessage &&
+ 	event->xclient.data.l[0] != wm_delete_window) {
+ 	XBell (XtDisplay(w), 0);
+ 	return;
+     }
+     XCloseDisplay (XtDisplay(w));
+     exit (0);
+ }
diff -c /dev/null xc/programs/beforelight/b4light.man:3.0
*** /dev/null	Mon Jan 30 17:43:24 1995
--- xc/programs/beforelight/b4light.man	Mon Jan 30 17:43:24 1995
***************
*** 0 ****
--- 1,37 ----
+ .\" $XFree86: xc/programs/beforelight/b4light.man,v 3.0 1994/07/15 07:05:57 dawes Exp $
+ .\" Permission is hereby granted, free of charge, to any person obtaining
+ .\" a copy of this software and associated documentation files (the
+ .\" "Software"), to deal in the Software without restriction, including
+ .\" without limitation the rights to use, copy, modify, merge, publish,
+ .\" distribute, sublicense, and/or sell copies of the Software, and to
+ .\" permit persons to whom the Software is furnished to do so, subject to
+ .\" the following conditions:
+ .\" 
+ .\" The above copyright notice and this permission notice shall be included
+ .\" in all copies or substantial portions of the Software.
+ .\" 
+ .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ .\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ .\" OTHER DEALINGS IN THE SOFTWARE.
+ .\" 
+ .\" Except as contained in this notice, the name of the X Consortium shall
+ .\" not be used in advertising or otherwise to promote the sale, use or
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .TH beforelight 1 "Release 6" "X Version 11"
+ .SH NAME
+ beforelight \- screen saver
+ .SH SYNOPSIS
+ .B beforelight
+ [
+ .I \-toolkitoption
+ \&.\|.\|. ]
+ .SH DESCRIPTION
+ The \fIbeforelight\fP program is a sample implementation of a screen saver
+ for X servers supporting the MIT-SCREEN-SAVER extension.
+ .SH AUTHORS
+ Keith Packard, MIT X Consortium.
diff -c xc/programs/bitmap/Imakefile:1.1.1.1 xc/programs/bitmap/Imakefile:3.1
*** xc/programs/bitmap/Imakefile:1.1.1.1	Mon Jan 30 17:43:27 1995
--- xc/programs/bitmap/Imakefile	Mon Jan 30 17:43:27 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.21 94/02/10 19:50:38 rws Exp $
+ XCOMM $XFree86: xc/programs/bitmap/Imakefile,v 3.1 1994/12/02 05:49:30 dawes Exp $
  BUTTONPICTURES = \
  	Dashes \
  	Down \
diff -c xc/programs/fstobdf/chars.c:1.1.1.1 xc/programs/fstobdf/chars.c:3.1
*** xc/programs/fstobdf/chars.c:1.1.1.1	Mon Jan 30 17:43:32 1995
--- xc/programs/fstobdf/chars.c	Mon Jan 30 17:43:32 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: chars.c,v 1.4 94/04/17 20:24:26 gildea Exp $ */
+ /* $XFree86: xc/programs/fstobdf/chars.c,v 3.1 1994/10/20 06:13:38 dawes Exp $ */
  /*
   
  Copyright (c) 1990  X Consortium
***************
*** 53,58 ****
--- 54,62 ----
  extern long pointSize;		/* font height in points */
  
  #define BIT_ORDER	BitmapFormatBitOrderMSB
+ #if defined(__NetBSD__) || defined(__EMX__)
+ #undef BYTE_ORDER
+ #endif
  #define BYTE_ORDER	BitmapFormatByteOrderMSB
  #define SCANLINE_UNIT	BitmapFormatScanlineUnit8
  #define SCANLINE_PAD	BitmapFormatScanlinePad8
diff -c xc/programs/mkfontdir/Imakefile:1.1.1.1 xc/programs/mkfontdir/Imakefile:3.1
*** xc/programs/mkfontdir/Imakefile:1.1.1.1	Mon Jan 30 17:43:34 1995
--- xc/programs/mkfontdir/Imakefile	Mon Jan 30 17:43:34 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.8 93/09/04 17:42:56 rws Exp $
+ XCOMM $XFree86: xc/programs/mkfontdir/Imakefile,v 3.1 1994/12/17 11:22:52 dawes Exp $
  LOCAL_LIBRARIES = $(FONTLIB)
  DEPLIBS = $(DEPFONTLIB)
  INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
***************
*** 7,9 ****
--- 8,15 ----
  OBJS = mkfontdir.o
  
  ComplexProgramTarget(mkfontdir)
+ 
+ #ifdef OS2Architecture
+ all:: mkfontdir.exe
+ 	$(CP) mkfontdir.exe /
+ #endif
diff -c xc/programs/rgb/Imakefile:1.1.1.3 xc/programs/rgb/Imakefile:3.2
*** xc/programs/rgb/Imakefile:1.1.1.3	Mon Jan 30 17:43:37 1995
--- xc/programs/rgb/Imakefile	Mon Jan 30 17:43:37 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.31 94/12/08 02:28:20 kaleb Exp $
+ XCOMM $XFree86: xc/programs/rgb/Imakefile,v 3.2 1995/01/28 16:16:16 dawes Exp $
  
  #if UseRgbTxt
     RGB_DEFINES = -DUSE_RGB_TXT
diff -c xc/programs/rgb/rgb.c:1.1.1.1 xc/programs/rgb/rgb.c:3.1
*** xc/programs/rgb/rgb.c:1.1.1.1	Mon Jan 30 17:43:38 1995
--- xc/programs/rgb/rgb.c	Mon Jan 30 17:43:38 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: rgb.c,v 11.19 94/04/17 20:24:45 rws Exp $ */
+ /* $XFree86: xc/programs/rgb/rgb.c,v 3.1 1994/05/21 23:59:21 dawes Exp $ */
  /*
  
  Copyright (c) 1985  X Consortium
***************
*** 45,52 ****
--- 46,57 ----
  #endif
  #define dbm_open(name,flags,mode) (!dbminit(name))
  #define dbm_store(db,key,content,flags) (store(key,content))
+ #ifdef SCO
+ #define dbm_close(db) /* */
+ #else
  #define dbm_close(db) dbmclose()
  #endif
+ #endif
  
  #undef NULL
  #include <stdio.h>
***************
*** 61,76 ****
  extern int errno;
  #endif
  
- extern int sys_nerr;
- extern char *sys_errlist[];
- 
  char *ProgramName;
  
- char *SysError ()
- {
-     return ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno] : "?");
- }
- 
  main(argc, argv)
      int argc;
      char **argv;
--- 66,73 ----
***************
*** 104,110 ****
      if (fd < 0) {
  	fprintf (stderr, 
  		 "%s:  unable to create dbm file \"%s\" (error %d, %s)\n",
! 		 ProgramName, name, errno, SysError());
  	exit (1);
      }
      (void) close (fd);
--- 101,107 ----
      if (fd < 0) {
  	fprintf (stderr, 
  		 "%s:  unable to create dbm file \"%s\" (error %d, %s)\n",
! 		 ProgramName, name, errno, strerror(errno));
  	exit (1);
      }
      (void) close (fd);
***************
*** 115,121 ****
      if (fd < 0) {
  	fprintf (stderr, 
  		 "%s:  unable to create dbm file \"%s\" (error %d, %s)\n",
! 		 ProgramName, name, errno, SysError());
  	exit (1);
      }
      (void) close (fd);
--- 112,118 ----
      if (fd < 0) {
  	fprintf (stderr, 
  		 "%s:  unable to create dbm file \"%s\" (error %d, %s)\n",
! 		 ProgramName, name, errno, strerror(errno));
  	exit (1);
      }
      (void) close (fd);
***************
*** 124,130 ****
      if (!rgb_dbm) {
  	fprintf (stderr,
  		 "%s:  unable to open dbm database \"%s\" (error %d, %s)\n",
! 		 ProgramName, dbname, errno, SysError());
  	exit (1);
      }
  
--- 121,127 ----
      if (!rgb_dbm) {
  	fprintf (stderr,
  		 "%s:  unable to open dbm database \"%s\" (error %d, %s)\n",
! 		 ProgramName, dbname, errno, strerror(errno));
  	exit (1);
      }
  
diff -c xc/programs/rgb/showrgb.c:1.1.1.1 xc/programs/rgb/showrgb.c:3.0
*** xc/programs/rgb/showrgb.c:1.1.1.1	Mon Jan 30 17:43:38 1995
--- xc/programs/rgb/showrgb.c	Mon Jan 30 17:43:38 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: showrgb.c,v 1.11 94/04/17 20:24:46 gildea Exp $
+  * $XFree86: xc/programs/rgb/showrgb.c,v 3.0 1994/05/21 23:59:23 dawes Exp $
   *
  Copyright (c) 1989  X Consortium
  
***************
*** 39,45 ****
--- 40,50 ----
  #define dbm_open(name,flags,mode) (!dbminit(name))
  #define dbm_firstkey(db) (firstkey())
  #define dbm_fetch(db,key) (fetch(key))
+ #ifdef SCO
+ #define dbm_close(db) /* */
+ #else
  #define dbm_close(db) dbmclose()
+ #endif
  #endif
  #endif /* USE_RGB_TXT */
  
diff -c xc/programs/rstart/Imakefile:1.1.1.2 xc/programs/rstart/Imakefile:3.3
*** xc/programs/rstart/Imakefile:1.1.1.2	Mon Jan 30 17:43:41 1995
--- xc/programs/rstart/Imakefile	Mon Jan 30 17:43:41 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.12 94/12/01 20:16:44 kaleb Exp $
+ XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.3 1995/01/28 16:16:20 dawes Exp $
  XCOMM
  XCOMM Copyright (c) 1993 Quarterdeck Office Systems
  XCOMM
***************
*** 83,97 ****
  #define MakeDirect(dir) if [ -d dir ]; then set +x;			\@@\
  		else (set -x; $(MKDIRHIER) dir); fi
  
! #define	FilterContext(src, dest)					\@@\
! 	RemoveFile(dest);						\@@\
  	sed								\@@\
  		-e 's,_PATH,$(DEFAULT_USER_PATH),g'			\@@\
  		-e 's,_MANPATH,$(DEFAULT_X_MANPATH),g'			\@@\
  		< src > dest
  
! #define	FilterCommand(src, dest)					\@@\
! 	RemoveFile(dest);						\@@\
  	sed								\@@\
  		-e 's,ENVPREFIX,$(ENVPREFIX),g'				\@@\
  		< src > dest;						\@@\
--- 84,96 ----
  #define MakeDirect(dir) if [ -d dir ]; then set +x;			\@@\
  		else (set -x; $(MKDIRHIER) dir); fi
  
! #define	FilterContext(src, dest) RemoveFile(dest);			\@@\
  	sed								\@@\
  		-e 's,_PATH,$(DEFAULT_USER_PATH),g'			\@@\
  		-e 's,_MANPATH,$(DEFAULT_X_MANPATH),g'			\@@\
  		< src > dest
  
! #define	FilterCommand(src, dest) RemoveFile(dest);			\@@\
  	sed								\@@\
  		-e 's,ENVPREFIX,$(ENVPREFIX),g'				\@@\
  		< src > dest;						\@@\
***************
*** 102,109 ****
  		chmod +x dest ;;					\@@\
  	esac
  
! #define	Recurse(src, dest, filefunc)					\@@\
! 	set -x;								\@@\
  	find src -print |						\@@\
  		while read name;					\@@\
  		do							\@@\
--- 101,107 ----
  		chmod +x dest ;;					\@@\
  	esac
  
! #define	Recurse(src, dest, filefunc) set -x;				\@@\
  	find src -print |						\@@\
  		while read name;					\@@\
  		do							\@@\
***************
*** 116,123 ****
   		done
  
  #if	HasSymLinks
! #define	InstallAliases()						\@@\
! 	set -x;								\@@\
   	cd $(DESTDIR)$(MYLIBDIR)/contexts;				\@@\
   		sed -e '/^$$/d' -e '/^#/d' @Aliases |			\@@\
   		while read real aliases;				\@@\
--- 114,120 ----
   		done
  
  #if	HasSymLinks
! #define	InstallAliases() set -x;					\@@\
   	cd $(DESTDIR)$(MYLIBDIR)/contexts;				\@@\
   		sed -e '/^$$/d' -e '/^#/d' @Aliases |			\@@\
   		while read real aliases;				\@@\
diff -c xc/programs/twm/Imakefile:1.1.1.2 xc/programs/twm/Imakefile:3.4
*** xc/programs/twm/Imakefile:1.1.1.2	Mon Jan 30 17:43:54 1995
--- xc/programs/twm/Imakefile	Mon Jan 30 17:43:54 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.41 94/07/06 16:15:19 mor Exp $
+ XCOMM $XFree86: xc/programs/twm/Imakefile,v 3.4 1995/01/27 04:54:15 dawes Exp $
  
           YFLAGS = -d
          DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
***************
*** 16,22 ****
--- 17,27 ----
  
  all::
  
+ #ifndef OS2Architecture
  SpecialCObjectRule(parse,$(_NOOP_),'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.twmrc"')
+ #else
+ SpecialCObjectRule(parse,$(_NOOP_),-DSYSTEM_INIT_FILE=\"$(TWMDIR)/system.twmrc\")
+ #endif
  #if !HasPutenv
  SpecialCObjectRule(util,$(_NOOP_),-DNOPUTENV)
  #endif
***************
*** 40,47 ****
  	echo ' */' >>$@
  	echo '' >>$@
  	echo 'char *defTwmrc[] = {' >>$@
! 	sed -e '/^#/d' -e 's/"/\\"/g' -e 's/^/    "/' -e 's/$$/",/' \
! 		system.twmrc >>$@
  	echo '    (char *) 0 };' >>$@
  
  ComplexProgramTarget(twm)
--- 45,51 ----
  	echo ' */' >>$@
  	echo '' >>$@
  	echo 'char *defTwmrc[] = {' >>$@
! 	sed -f deftwmrc.sed <system.twmrc >>$@
  	echo '    (char *) 0 };' >>$@
  
  ComplexProgramTarget(twm)
diff -c /dev/null xc/programs/twm/deftwmrc.sed:3.0
*** /dev/null	Mon Jan 30 17:43:55 1995
--- xc/programs/twm/deftwmrc.sed	Mon Jan 30 17:43:55 1995
***************
*** 0 ****
--- 1,4 ----
+ /^#/d
+ s/"/\\"/g
+ s/^/    "/
+ s/$/",/
diff -c xc/programs/twm/lex.l:1.1.1.2 xc/programs/twm/lex.l:3.3
*** xc/programs/twm/lex.l:1.1.1.2	Mon Jan 30 17:43:55 1995
--- xc/programs/twm/lex.l	Mon Jan 30 17:43:55 1995
***************
*** 54,59 ****
--- 54,60 ----
  /***********************************************************************
   *
   * $XConsortium: lex.l,v 1.69 94/11/21 18:33:32 kaleb Exp $
+  * $XFree86: xc/programs/twm/lex.l,v 3.3 1995/01/28 16:16:30 dawes Exp $
   *
   * .twmrc lex file
   *
***************
*** 67,75 ****
  extern char *ProgramName;
  
  extern int ParseError;
- #if defined(CSRG_BASED) || defined(linux)
- int yylineno;
  
  #undef YY_INPUT
  #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
  doinput (buf, size)
--- 68,76 ----
  extern char *ProgramName;
  
  extern int ParseError;
  
+ #if defined(CSRG_BASED) || defined(linux) || ((defined(AMOEBA) || defined(MINIX)) && defined(yywrap))
+ int yylineno;
  #undef YY_INPUT
  #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
  doinput (buf, size)
diff -c xc/programs/twm/twm.c:1.1.1.2 xc/programs/twm/twm.c:3.1
*** xc/programs/twm/twm.c:1.1.1.2	Mon Jan 30 17:43:56 1995
--- xc/programs/twm/twm.c	Mon Jan 30 17:43:56 1995
***************
*** 54,59 ****
--- 54,60 ----
  /***********************************************************************
   *
   * $XConsortium: twm.c,v 1.135 94/12/27 20:52:15 mor Exp $
+  * $XFree86: xc/programs/twm/twm.c,v 3.1 1995/01/27 04:54:18 dawes Exp $
   *
   * twm - "Tom's Window Manager"
   *
***************
*** 253,258 ****
--- 254,278 ----
  	exit (1);
      }
  
+ #ifdef MINIX
+     { int flags;
+     	if ((flags= fcntl(ConnectionNumber(dpy), F_GETFD)) == -1)
+     	{
+ 		fprintf (stderr, 
+ 		 "%s:  unable to mark display connection as close-on-exec\n",
+ 			 ProgramName);
+ 		exit (1);
+     	}
+ 	if (fcntl(ConnectionNumber(dpy), F_SETFD,
+ 					flags | FD_CLOEXEC) == -1)
+ 	{
+ 	    fprintf (stderr, 
+ 		"%s:  unable to mark display connection as close-on-exec\n",
+ 			 ProgramName);
+ 	    exit (1);
+ 	}
+     }
+ #else
      if (fcntl(ConnectionNumber(dpy), F_SETFD, 1) == -1) {
  	fprintf (stderr, 
  		 "%s:  unable to mark display connection as close-on-exec\n",
***************
*** 259,264 ****
--- 279,285 ----
  		 ProgramName);
  	exit (1);
      }
+ #endif
  
      if (restore_filename)
  	ReadWinConfigFile (restore_filename);
diff -c xc/programs/twm/twm.h:1.1.1.2 xc/programs/twm/twm.h:3.1
*** xc/programs/twm/twm.h:1.1.1.2	Mon Jan 30 17:43:57 1995
--- xc/programs/twm/twm.h	Mon Jan 30 17:43:57 1995
***************
*** 56,61 ****
--- 56,62 ----
  /***********************************************************************
   *
   * $XConsortium: twm.h,v 1.84 94/12/27 19:05:22 mor Exp $
+  * $XFree86: xc/programs/twm/twm.h,v 3.1 1995/01/27 04:54:22 dawes Exp $
   *
   * twm include file
   *
***************
*** 66,71 ****
--- 67,75 ----
  #ifndef _TWM_
  #define _TWM_
  
+ #ifdef MINIX
+ #include <X11/Xos.h>
+ #endif
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <X11/cursorfont.h>
diff -c xc/programs/xauth/Imakefile:1.1.1.1 xc/programs/xauth/Imakefile:3.1
*** xc/programs/xauth/Imakefile:1.1.1.1	Mon Jan 30 17:44:02 1995
--- xc/programs/xauth/Imakefile	Mon Jan 30 17:44:02 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.16 94/01/06 15:34:08 gildea Exp $
+ XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.1 1994/12/02 05:49:51 dawes Exp $
  DEPLIBS = $(DEPXAUTHLIB) $(DEPXMULIB)
  LOCAL_LIBRARIES = $(XAUTHLIB) $(XMULIB)
             SRCS = xauth.c gethost.c process.c parsedpy.c
diff -c xc/programs/xauth/gethost.c:1.1.1.2 xc/programs/xauth/gethost.c:3.3
*** xc/programs/xauth/gethost.c:1.1.1.2	Mon Jan 30 17:44:02 1995
--- xc/programs/xauth/gethost.c	Mon Jan 30 17:44:02 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: gethost.c,v 1.22 94/11/30 16:29:52 kaleb Exp $
+  * $XFree86: xc/programs/xauth/gethost.c,v 3.3 1995/01/28 16:16:34 dawes Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
***************
*** 49,54 ****
--- 50,56 ----
  #endif
  #ifndef WIN32
  #ifndef STREAMSCONN
+ #ifndef MINIX
  #include <sys/socket.h>
  #include <netdb.h>
  #include <netinet/in.h>
***************
*** 59,69 ****
--- 61,81 ----
  #endif /* !SCO */
  #endif /* i386 */
  #endif /* SYSV */
+ #else /* MINIX */
+ #include <net/gen/netdb.h>
+ #endif /* !MINIX */
  #endif /* !STREAMSCONN */
  #endif /* !WIN32 */
  #include <errno.h>
  #ifdef X_NOT_STDC_ENV
  extern int errno;
+ #endif
+ 
+ #ifdef MINIX
+ #ifdef MNX_TCPCONN
+ #define TCPCONN
+ #endif
+ #define EPROTOTYPE EGENERIC
  #endif
  
  #ifdef DNETCONN
diff -c xc/programs/xauth/process.c:1.1.1.1 xc/programs/xauth/process.c:3.0
*** xc/programs/xauth/process.c:1.1.1.1	Mon Jan 30 17:44:03 1995
--- xc/programs/xauth/process.c	Mon Jan 30 17:44:03 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: process.c,v 1.48 94/04/17 20:37:52 gildea Exp $ */
+ /* $XFree86: xc/programs/xauth/process.c,v 3.0 1994/10/20 06:14:32 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
***************
*** 815,821 ****
  			 ProgramName, tmpnam);
  	    } else {
  		(void) unlink (xauth_filename);
! #ifdef WIN32
  		if (rename(tmpnam, xauth_filename) == -1) {
  #else
  		if (link (tmpnam, xauth_filename) == -1) {
--- 816,822 ----
  			 ProgramName, tmpnam);
  	    } else {
  		(void) unlink (xauth_filename);
! #if defined(WIN32) || defined(__EMX__)
  		if (rename(tmpnam, xauth_filename) == -1) {
  #else
  		if (link (tmpnam, xauth_filename) == -1) {
diff -c xc/programs/xcmsdb/loadData.c:1.1.1.1 xc/programs/xcmsdb/loadData.c:3.0
*** xc/programs/xcmsdb/loadData.c:1.1.1.1	Mon Jan 30 17:44:09 1995
--- xc/programs/xcmsdb/loadData.c	Mon Jan 30 17:44:09 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: loadData.c,v 1.12 94/02/07 23:28:48 rws Exp $ */
+ /* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.0 1994/10/20 06:14:50 dawes Exp $ */
  
  /*
   * (c) Copyright 1990 Tektronix Inc.
***************
*** 52,58 ****
   *		files (external includes or internal includes).
   */
  
! #ifdef X_NOT_STDC_ENV
  extern char *strtok();
  extern char *strchr();
  #endif
--- 53,59 ----
   *		files (external includes or internal includes).
   */
  
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  extern char *strtok();
  extern char *strchr();
  #endif
diff -c xc/programs/xconsole/xconsole.c:1.1.1.2 xc/programs/xconsole/xconsole.c:3.4
*** xc/programs/xconsole/xconsole.c:1.1.1.2	Mon Jan 30 17:44:11 1995
--- xc/programs/xconsole/xconsole.c	Mon Jan 30 17:44:11 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: xconsole.c,v 1.21 95/01/05 21:04:06 kaleb Exp $
+  * $XFree86: xc/programs/xconsole/xconsole.c,v 3.4 1995/01/28 16:16:39 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 56,61 ****
--- 57,68 ----
  #include <X11/Shell.h>
  #include <ctype.h>
  
+ #ifdef MINIX
+ #define USE_FILE
+ #define FILE_NAME "/dev/log"
+ #define read(n,b,s) nbio_read(n,b,s)
+ #endif
+ 
  /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
  #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern FILE *fdopen(int, char const *);
***************
*** 159,167 ****
--- 166,176 ----
  	{
  	    struct stat sbuf;
  	    /* must be owner and have read/write permission */
+ #ifndef __NetBSD__
  	    if (!stat("/dev/console", &sbuf) &&
  		(sbuf.st_uid == getuid()) &&
  		!access("/dev/console", R_OK|W_OK))
+ #endif
  	    {
  #ifdef USE_FILE
  	    	input = fopen (FILE_NAME, "r");
***************
*** 218,223 ****
--- 227,237 ----
  
      if (input)
      {
+ #ifdef MINIX
+ 	fcntl(fileno (input), F_SETFD,
+ 		fcntl(fileno (input), F_GETFD) | FD_ASYNCHIO);
+ 	nbio_register(fileno (input));
+ #endif
  	input_id = XtAddInput (fileno (input), (XtPointer) XtInputReadMask,
  			       inputReady, (XtPointer) text);
      }
***************
*** 229,234 ****
--- 243,251 ----
  {
      if (input) {
  	XtRemoveInput (input_id);
+ #ifdef MINIX
+ 	nbio_unregister(fileno (input));
+ #endif
  	fclose (input);
      }
  #ifdef USE_PTY
***************
*** 399,404 ****
--- 416,426 ----
      n = read (*source, buffer, sizeof (buffer) - 1);
      if (n <= 0)
      {
+ #ifdef MINIX
+ 	if (n == -1 && errno == EAGAIN)
+ 		return;
+ 	nbio_unregister(fileno (input));
+ #endif
  	fclose (input);
  	XtRemoveInput (*id);
      }
***************
*** 771,776 ****
--- 793,805 ----
   * So this routine creates a streams-pty where one end reads the device and
   * sends the output to xconsole.
   */
+ 
+ #ifdef SCO
+ #define	OSM_DEVICE	"/dev/error"
+ #else
+ #define	OSM_DEVICE	"/dev/osm"
+ #endif
+ 
  FILE *
  osm_pipe()
  {
***************
*** 777,783 ****
    int tty;
    char ttydev[64];
      
!   if (access("/dev/osm", R_OK) < 0) return NULL;
    if ((tty = open("/dev/ptmx", O_RDWR)) < 0)  return NULL;
  
    grantpt(tty);
--- 806,812 ----
    int tty;
    char ttydev[64];
      
!   if (access(OSM_DEVICE, R_OK) < 0) return NULL;
    if ((tty = open("/dev/ptmx", O_RDWR)) < 0)  return NULL;
  
    grantpt(tty);
***************
*** 797,803 ****
      }
      pty = open(ttydev, O_RDWR);
      if (pty < 0) exit(1);
!     osm = open("/dev/osm", O_RDONLY);
      if (osm < 0) exit(1);
      for (nbytes = 0; skip > 0 && nbytes >= 0; skip -= nbytes) {
  	nbytes = skip;
--- 826,832 ----
      }
      pty = open(ttydev, O_RDWR);
      if (pty < 0) exit(1);
!     osm = open(OSM_DEVICE, O_RDONLY);
      if (osm < 0) exit(1);
      for (nbytes = 0; skip > 0 && nbytes >= 0; skip -= nbytes) {
  	nbytes = skip;
diff -c xc/programs/xdm/Imakefile:1.1.1.2 xc/programs/xdm/Imakefile:3.8
*** xc/programs/xdm/Imakefile:1.1.1.2	Mon Jan 30 17:44:15 1995
--- xc/programs/xdm/Imakefile	Mon Jan 30 17:44:15 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.76 95/01/05 20:57:42 kaleb Exp $
+ XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.8 1995/01/28 17:38:24 dawes Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
  
***************
*** 44,68 ****
  #if SystemV4 || HasShadowPasswd
  PWD_DEFINES = -DUSESHADOW
  #if SystemV || defined(SequentArchitecture)
! SYS_LIBRARIES = -lsec
  #endif
! #ifdef LinuxArchitecture
! SYS_LIBRARIES = -lshadow
  #endif
  #endif
  
  #if defined(UltrixArchitecture)
! SYS_LIBRARIES = -lauth
  #endif
  
  #if (defined(AIXArchitecture) && (OSMajorVersion >= 3))
! SYS_LIBRARIES = -ls
  #endif
  
! #if defined(XFree86Version) && HasLibCrypt
! SYS_LIBRARIES = -lcrypt
  #endif
  
  #if HasBSD44Sockets
  SOCK_DEFINES = -DBSD44SOCKETS
  #endif
--- 45,75 ----
  #if SystemV4 || HasShadowPasswd
  PWD_DEFINES = -DUSESHADOW
  #if SystemV || defined(SequentArchitecture)
! SYS_LIBRARIES1 = -lsec
  #endif
! #if defined(LinuxArchitecture)
! SYS_LIBRARIES1 = -lshadow
  #endif
  #endif
  
  #if defined(UltrixArchitecture)
! SYS_LIBRARIES1 = -lauth
  #endif
  
  #if (defined(AIXArchitecture) && (OSMajorVersion >= 3))
! SYS_LIBRARIES1 = -ls
  #endif
  
! #if defined(XFree86Version) && HasLibCrypt || defined(NetBSDArchitecture)
! #ifdef SpecialLibCrypt
! SYS_LIBRARIES2 = SpecialLibCrypt
! #else
! SYS_LIBRARIES2 = -lcrypt
! #endif
  #endif
  
+ SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2)
+ 
  #if HasBSD44Sockets
  SOCK_DEFINES = -DBSD44SOCKETS
  #endif
***************
*** 134,139 ****
--- 141,147 ----
  DEF_USER_PATH = DefaultUserPath		/* no leading spaces or imake will */
  DEF_SYSTEM_PATH = DefaultSystemPath	/* indent as rule */
  BOURNE_SHELL = DefaultSystemShell
+ #ifndef OS2Architecture
  RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \
  		  '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \
  		  '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \
***************
*** 145,150 ****
--- 153,159 ----
  		  '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
  		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
  		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
+ #endif
  
  ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
  NormalProgramTarget(xdmshell,$(OBJS2),NullParameter,NullParameter,NullParameter)
diff -c xc/programs/xdm/access.c:1.1.1.1 xc/programs/xdm/access.c:3.0
*** xc/programs/xdm/access.c:1.1.1.1	Mon Jan 30 17:44:15 1995
--- xc/programs/xdm/access.c	Mon Jan 30 17:44:15 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: access.c,v 1.15 94/04/17 20:03:32 hersh Exp $
+  * $XFree86: xc/programs/xdm/access.c,v 3.0 1994/06/28 12:32:25 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 41,49 ****
--- 42,54 ----
  # include   <X11/X.h>
  # include   <stdio.h>
  # include   <ctype.h>
+ #ifndef MINIX
  # include   <netinet/in.h>
  # include   <netdb.h>
  # include   <sys/socket.h>
+ #else /* MINIX */
+ # include   <net/gen/netdb.h>
+ #endif /* !MINIX */
  
  #define ALIAS_CHARACTER	    '%'
  #define NEGATE_CHARACTER    '!'
diff -c xc/programs/xdm/auth.c:1.1.1.4 xc/programs/xdm/auth.c:3.9
*** xc/programs/xdm/auth.c:1.1.1.4	Mon Jan 30 17:44:16 1995
--- xc/programs/xdm/auth.c	Mon Jan 30 17:44:16 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: auth.c,v 1.56.1.1 95/01/27 14:42:23 kaleb Exp $ */
+ /* $XFree86: xc/programs/xdm/auth.c,v 3.9 1995/01/30 03:28:54 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 42,84 ****
  #include <X11/X.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
  #ifndef ESIX
  # include <sys/ioctl.h>
  #endif /* !ESIX */
  
! #ifdef TCPCONN
  # include <netinet/in.h>
  #endif
  #ifdef DNETCONN
  # include <netdnet/dn.h>
  # include <netdnet/dnetdb.h>
  #endif
  
! #if (defined(_POSIX_SOURCE) && !defined(AIXV3)) || defined(hpux) || defined(USG) || defined(SVR4)
  #define NEED_UTSNAME
  #include <sys/utsname.h>
  #endif
  
! #if defined(SYSV) && defined(SYSV386)
  # include <sys/stream.h>
  # ifdef ISC
  #  include <sys/sioctl.h>
  # endif /* ISC */
  # ifdef ESIX
  #  include <lan/net_ioctl.h>
  # endif /* ESIX */
! #endif /* SYSV386 */
  
  #ifdef SVR4
  # include <netdb.h>
  # include <sys/sockio.h>
  #endif
  #ifdef __convex__
  # include <sync/queue.h>
  # include <sync/sema.h>
  #endif
  #include <net/if.h>
  
  extern int	MitInitAuth ();
  extern Xauth	*MitGetAuth ();
--- 43,105 ----
  #include <X11/X.h>
  #include <sys/types.h>
  #include <sys/stat.h>
+ #ifndef MINIX
  #include <sys/socket.h>
+ #endif
  #ifndef ESIX
  # include <sys/ioctl.h>
  #endif /* !ESIX */
  
! #if defined(TCPCONN) || defined(STREAMSCONN)
! #ifndef MINIX
  # include <netinet/in.h>
  #endif
+ #endif
  #ifdef DNETCONN
  # include <netdnet/dn.h>
  # include <netdnet/dnetdb.h>
  #endif
  
! #if (defined(_POSIX_SOURCE) && !defined(AIXV3)) || defined(hpux) || defined(USG) || defined(SVR4) || (defined(SYSV) && defined(i386) && !defined(SCO))
  #define NEED_UTSNAME
  #include <sys/utsname.h>
  #endif
  
! #if defined(SYSV) && defined(i386)
  # include <sys/stream.h>
  # ifdef ISC
+ #  include <stropts.h>
  #  include <sys/sioctl.h>
  # endif /* ISC */
  # ifdef ESIX
  #  include <lan/net_ioctl.h>
  # endif /* ESIX */
! #endif /* i386 */
  
  #ifdef SVR4
  # include <netdb.h>
  # include <sys/sockio.h>
+ # include <sys/stropts.h>
  #endif
  #ifdef __convex__
  # include <sync/queue.h>
  # include <sync/sema.h>
  #endif
+ #ifndef MINIX
  #include <net/if.h>
+ #else
+ #include <net/netlib.h>
+ #include <net/gen/netdb.h>
+ #endif /* !MINIX */
+ 
+ #if ((defined(SVR4) && !defined(sun)) || defined(ISC)) && defined(SIOCGIFCONF)
+ #define SYSV_SIOCGIFCONF
+ #endif
+ 
+ #ifdef __EMX__
+ #define link rename
+ #define chown(a,b,c)
+ #endif
  
  extern int	MitInitAuth ();
  extern Xauth	*MitGetAuth ();
***************
*** 675,680 ****
--- 696,783 ----
  #endif
  }
  
+ #ifdef SYSV_SIOCGIFCONF
+ 
+ /* Deal with different SIOCGIFCONF ioctl semantics on SYSV, SVR4 */
+ 
+ static int
+ ifioctl (fd, cmd, arg)
+     int fd;
+     int cmd;
+     char *arg;
+ {
+     struct strioctl ioc;
+     int ret;
+ 
+     bzero((char *) &ioc, sizeof(ioc));
+     ioc.ic_cmd = cmd;
+     ioc.ic_timout = 0;
+     if (cmd == SIOCGIFCONF)
+     {
+ 	ioc.ic_len = ((struct ifconf *) arg)->ifc_len;
+ 	ioc.ic_dp = ((struct ifconf *) arg)->ifc_buf;
+ #ifdef ISC
+ 	/* SIOCGIFCONF is somewhat brain damaged on ISC. The argument
+ 	 * buffer must contain the ifconf structure as header. Ifc_req
+ 	 * is also not a pointer but a one element array of ifreq
+ 	 * structures. On return this array is extended by enough
+ 	 * ifreq fields to hold all interfaces. The return buffer length
+ 	 * is placed in the buffer header.
+ 	 */
+         ((struct ifconf *) ioc.ic_dp)->ifc_len =
+                                          ioc.ic_len - sizeof(struct ifconf);
+ #endif
+     }
+     else
+     {
+ 	ioc.ic_len = sizeof(struct ifreq);
+ 	ioc.ic_dp = arg;
+     }
+     ret = ioctl(fd, I_STR, (char *) &ioc);
+     if (ret >= 0 && cmd == SIOCGIFCONF)
+ #ifdef SVR4
+ 	((struct ifconf *) arg)->ifc_len = ioc.ic_len;
+ #endif
+ #ifdef ISC
+     {
+ 	((struct ifconf *) arg)->ifc_len =
+ 				 ((struct ifconf *)ioc.ic_dp)->ifc_len;
+ 	((struct ifconf *) arg)->ifc_buf = 
+ 			(caddr_t)((struct ifconf *)ioc.ic_dp)->ifc_req;
+     }
+ #endif
+     return(ret);
+ }
+ #else /* SYSV_SIOCGIFCONF */
+ #define ifioctl ioctl
+ #endif /* SYSV_SIOCGIFCONF */
+ 
+ #if defined(STREAMSCONN) && !defined(SYSV_SIOCGIFCONF) && !defined(NCR)
+ 
+ #include <tiuser.h>
+ 
+ /* Define this host for access control.  Find all the hosts the OS knows about 
+  * for this fd and add them to the selfhosts list.
+  * TLI version, written without sufficient documentation.
+  */
+ static void
+ DefineSelf (fd, file, auth)
+     int fd;
+     FILE	*file;
+     Xauth	*auth;
+ {
+     struct netbuf	netb;
+     char		addrret[1024]; /* easier than t_alloc */
+     
+     netb.maxlen = sizeof(addrret);
+     netb.buf = addrret;
+     if (t_getname (fd, &netb, LOCALNAME) == -1)
+ 	t_error ("t_getname");
+     /* what a kludge */
+     writeAddr (FamilyInternet, 4, netb.buf+4, file, auth);
+ }
+ 
+ #else
  
  #ifdef NCR
  
***************
*** 689,699 ****
  #include <netinet/in.h>
  #include <netinet/in_var.h>
  
! static
  DefineSelf (fd, file, auth)
      int fd;
!     FILE	*file;
!     Xauth	*auth;
  {
      /*
       * The Wolongong drivers used by NCR SVR4/MP-RAS don't understand the
--- 792,802 ----
  #include <netinet/in.h>
  #include <netinet/in_var.h>
  
! static void
  DefineSelf (fd, file, auth)
      int fd;
!     FILE *file;
!     Xauth *auth;
  {
      /*
       * The Wolongong drivers used by NCR SVR4/MP-RAS don't understand the
***************
*** 706,712 ****
      struct in_ifaddr ifaddr;
      struct strioctl str;
      unsigned char *addr;
!     int	family, len, ipfd;
  
      if ((ipfd = open ("/dev/ip", O_RDWR, 0 )) < 0)
          LogError ("Getting interface configuration");
--- 809,815 ----
      struct in_ifaddr ifaddr;
      struct strioctl str;
      unsigned char *addr;
!     int	len, ipfd;
  
      if ((ipfd = open ("/dev/ip", O_RDWR, 0 )) < 0)
          LogError ("Getting interface configuration");
***************
*** 746,755 ****
  		continue;
  
  	writeAddr (FamilyInternet, 4, &(IA_SIN(&ifaddr)->sin_addr), file, auth);
-  
      }
      close(ipfd);
- 
  }
  
  #else /* NCR */
--- 849,856 ----
***************
*** 756,771 ****
  
  #ifdef SIOCGIFCONF
  
  /* Define this host for access control.  Find all the hosts the OS knows about 
   * for this fd and add them to the selfhosts list.
   */
! static
  DefineSelf (fd, file, auth)
      int fd;
      FILE	*file;
      Xauth	*auth;
  {
!     char		buf[2048];
      struct ifconf	ifc;
      register int	n;
      int 		len;
--- 857,881 ----
  
  #ifdef SIOCGIFCONF
  
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef AF_LINK
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+ 		     (p->ifr_addr.sa_len > sizeof (p->ifr_addr) ? \
+ 		      p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
+ #else
+ #define ifr_size(p) (sizeof (struct ifreq))
+ #endif
+ 
  /* Define this host for access control.  Find all the hosts the OS knows about 
   * for this fd and add them to the selfhosts list.
   */
! static void
  DefineSelf (fd, file, auth)
      int fd;
      FILE	*file;
      Xauth	*auth;
  {
!     char		buf[2048], *cp, *cplim;
      struct ifconf	ifc;
      register int	n;
      int 		len;
***************
*** 775,793 ****
      
      ifc.ifc_len = sizeof (buf);
      ifc.ifc_buf = buf;
!     if (ioctl (fd, SIOCGIFCONF, (char *) &ifc) < 0)
          LogError ("Trouble getting network interface configuration");
!     for (ifr = ifc.ifc_req
! #ifdef CSRG_BASED
! 	 ; (char *)ifr < ifc.ifc_buf + ifc.ifc_len;
! 	 ifr = (struct ifreq *)((char *)ifr + sizeof (struct ifreq) +
! 		   (ifr->ifr_addr.sa_len > sizeof (ifr->ifr_addr) ?
! 		    ifr->ifr_addr.sa_len - sizeof (ifr->ifr_addr) : 0))
  #else
! 	 , n = ifc.ifc_len / sizeof (struct ifreq); --n >= 0; ifr++
  #endif
! 	 )
      {
  #ifdef DNETCONN
  	/*
  	 * this is ugly but SIOCGIFCONF returns decnet addresses in
--- 885,904 ----
      
      ifc.ifc_len = sizeof (buf);
      ifc.ifc_buf = buf;
!     if (ifioctl (fd, SIOCGIFCONF, (char *) &ifc) < 0)
          LogError ("Trouble getting network interface configuration");
! 
! #ifdef ISC
! #define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf
  #else
! #define IFC_IFC_REQ ifc.ifc_req
  #endif
! 
!     cplim = (char *) IFC_IFC_REQ + ifc.ifc_len;
! 
!     for (cp = (char *) IFC_IFC_REQ; cp < cplim; cp += ifr_size (ifr))
      {
+ 	ifr = (struct ifreq *) cp;
  #ifdef DNETCONN
  	/*
  	 * this is ugly but SIOCGIFCONF returns decnet addresses in
***************
*** 833,839 ****
  /* Define this host for access control.  Find all the hosts the OS knows about 
   * for this fd and add them to the selfhosts list.
   */
! static
  DefineSelf (fd, file, auth)
      int fd;
  {
--- 944,950 ----
  /* Define this host for access control.  Find all the hosts the OS knows about 
   * for this fd and add them to the selfhosts list.
   */
! static void
  DefineSelf (fd, file, auth)
      int fd;
  {
***************
*** 873,880 ****
  }
  
  #endif /* SIOCGIFCONF else */
! 
! #endif /* NCR */
  
  
  static
--- 984,991 ----
  }
  
  #endif /* SIOCGIFCONF else */
! #endif /* NCR else */
! #endif /* STREAMSCONN && !SYSV_SIOCGIFCONF else */
  
  
  static
***************
*** 914,919 ****
--- 1025,1033 ----
      char	*name;
  {
      int	fd;
+ #ifdef MINIX
+     char *tcp_device;
+ #endif
  
      Debug ("writeLocalAuth: %s %.*s\n", name, auth->name_length, auth->name);
      setAuthNumber (auth, name);
***************
*** 925,931 ****
--- 1039,1052 ----
      t_close (fd);
  #endif
  #ifdef TCPCONN
+ #ifdef MINIX
+     tcp_device= getenv("TCP_DEVICE");
+     if (tcp_device == NULL)
+     	tcp_device= TCP_DEVICE;
+     fd = open(tcp_device, O_RDWR);
+ #else
      fd = socket (AF_INET, SOCK_STREAM, 0);
+ #endif
      DefineSelf (fd, file, auth);
      close (fd);
  #endif
diff -c xc/programs/xdm/choose.c:1.1.1.2 xc/programs/xdm/choose.c:3.3
*** xc/programs/xdm/choose.c:1.1.1.2	Mon Jan 30 17:44:17 1995
--- xc/programs/xdm/choose.c	Mon Jan 30 17:44:17 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: choose.c,v 1.16 94/06/03 16:34:38 mor Exp $
+  * $XFree86: xc/programs/xdm/choose.c,v 3.3 1994/08/31 04:50:49 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 39,47 ****
--- 40,58 ----
  
  #include <X11/X.h>
  #include <sys/types.h>
+ #ifndef MINIX
  #include <sys/socket.h>
  #include <netinet/in.h>
+ #ifndef X_NO_SYS_UN
  #include <sys/un.h>
+ #endif
+ #else /* MINIX */
+ #include <sys/ioctl.h>
+ #include <net/netlib.h>
+ #include <net/gen/in.h>
+ #include <net/gen/tcp.h>
+ #include <net/gen/tcp_io.h>
+ #endif /* !MINIX */
  #include <ctype.h>
  #if defined(STREAMSCONN)
  # include       <tiuser.h>
***************
*** 55,60 ****
--- 66,76 ----
  #define Time_t time_t
  #endif
  
+ #ifdef MINIX
+ int listen_inprogress;
+ int listen_completed;
+ #endif
+ 
  static
  FormatBytes (data, length, buf, buflen)
      unsigned char *data;
***************
*** 376,381 ****
--- 392,403 ----
      struct t_call *call;
      int flags=0;
  #endif
+ #ifdef MINIX
+     nwio_tcpconf_t tcpconf;
+     nwio_tcpcl_t tcpcl;
+     char *tcp_device;
+     int new_fd, flags, r;
+ #endif /* MINIX */
  
      Debug ("Process chooser socket\n");
      len = sizeof (buf);
***************
*** 420,426 ****
--- 442,524 ----
  	return;
      }
  #else
+ #ifdef MINIX
+     if (listen_inprogress) abort();
+     /* If the listen succeeded save the filedescriptor */
+     if (listen_completed)
+     {
+     	client_fd= dup(fd);
+     	if (client_fd == -1)
+     	{
+ 		LogError ("Dup failed: %s\n", strerror(errno));
+ 		return;
+     	}
+     }
+     else
+     	client_fd= -1;
+ 
+     /* Try to setup a new tcp device at the same filedescriptor as the old
+      * one.
+      */
+     if (ioctl(fd, NWIOGTCPCONF, &tcpconf) == -1)
+     {
+ 	LogError ("NWIOGTCPCONF failed: %s\n", strerror(errno));
+ 	return;
+     }
+     close(fd);
+     tcp_device= getenv("TCP_DEVICE");
+     if (tcp_device == NULL)
+     	tcp_device= TCP_DEVICE;
+     new_fd= open(tcp_device, O_RDWR);
+     if (new_fd == -1)
+     {
+ 	LogError ("open '%s' failed: %s\n", tcp_device, strerror(errno));
+ 	return;
+     }
+     if (new_fd != fd)
+     {
+     	dup2(new_fd, fd);
+     	close(new_fd);
+     }
+     if ((flags= fcntl(fd, F_GETFD)) == -1)
+     {
+ 	LogError ("F_GETFD failed: %s\n", strerror(errno));
+ 	return;
+     }
+     if (fcntl(fd, F_SETFD, flags | FD_ASYNCHIO) == -1)
+     {
+ 	LogError ("F_SETFD failed: %s\n", strerror(errno));
+ 	return;
+     }
+     tcpconf.nwtc_flags= NWTC_EXCL | NWTC_LP_SET | NWTC_UNSET_RA | NWTC_UNSET_RP;
+     if (ioctl(fd, NWIOSTCPCONF, &tcpconf) == -1)
+     {
+ 	LogError ("NWIOSTCPCONF failed: %s\n", strerror(errno));
+ 	return;
+     }
+     listen_inprogress= 0;
+     listen_completed= 0;
+ 
+     tcpcl.nwtcl_flags= 0;
+     r= ioctl(fd, NWIOTCPLISTEN, &tcpcl);
+     if (r == -1 && errno == EINPROGRESS)
+     {
+     	listen_inprogress= 1;
+     	nbio_inprogress(fd, ASIO_IOCTL, 1 /* read */, 1 /* write */,
+     		0 /* except */);
+     }
+     else if (r == -1)
+     {
+ 	LogError ("NWIOTCPLISTEN failed: %s\n", strerror(errno));
+ 	return;
+     }
+     else
+     	listen_completed= 1;
+     if (client_fd == -1)
+     	return;
+ #else /* !MINIX */
      client_fd = accept (fd, (struct sockaddr *)buf, &len);
+ #endif /* MINIX */
      if (client_fd == -1)
      {
  	LogError ("Cannot accept chooser connection\n");
***************
*** 499,501 ****
--- 597,612 ----
  }
  
  #endif /* XDMCP */
+ 
+ #ifdef MINIX
+ void tcp_listen_cb(nbio_ref_t ref, int res, int err)
+ {
+ 	if (!listen_inprogress)
+ 		abort();
+ 	if (res == 0)
+ 		listen_completed= 1;
+ 	else
+     		LogError("listen error: %s\n", strerror(err));
+ 	listen_inprogress= 0;
+ }
+ #endif
diff -c xc/programs/xdm/chooser.c:1.1.1.3 xc/programs/xdm/chooser.c:3.5
*** xc/programs/xdm/chooser.c:1.1.1.3	Mon Jan 30 17:44:18 1995
--- xc/programs/xdm/chooser.c	Mon Jan 30 17:44:18 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: chooser.c,v 1.21 94/11/21 18:33:11 kaleb Exp $
+  * $XFree86: xc/programs/xdm/chooser.c,v 3.5 1995/01/28 16:16:48 dawes Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 72,79 ****
--- 73,98 ----
  #ifdef SVR4
  #include    <sys/sockio.h>
  #endif
+ #if defined(SYSV) && defined(i386)
+ #include    <sys/stream.h>
+ #ifdef ISC
+ #include    <sys/sioctl.h>
+ #endif
+ #endif
+ #ifndef MINIX
  #include    <sys/socket.h>
  #include    <netinet/in.h>
+ #else /* MINIX */
+ #include <net/hton.h>
+ #include <net/netlib.h>
+ #include <net/gen/in.h>
+ #include <net/gen/netdb.h>
+ #include <net/gen/tcp.h>
+ #include <net/gen/tcp_io.h>
+ #include <net/gen/udp.h>
+ #include <net/gen/udp_io.h>
+ #include <sys/nbio.h>
+ #endif /* !MINIX */
  #include    <sys/ioctl.h>
  #if defined(STREAMSCONN)
  #if defined(NCR)
***************
*** 99,109 ****
--- 118,139 ----
  # include <sync/queue.h>
  # include <sync/sema.h>
  #endif
+ #ifndef MINIX
  # include <net/if.h>
+ #endif
  #endif /* hpux */
  
+ #ifndef MINIX
  #include    <netdb.h>
+ #endif
  
+ #ifdef MINIX
+ static char read_buffer[XDM_MAX_MSGLEN+sizeof(udp_io_hdr_t)];
+ static int read_inprogress;
+ static int read_size;
+ static void read_cb(nbio_ref_t ref, int res, int err);
+ #endif
+ 
  Widget	    toplevel, label, viewport, paned, list, box, cancel, acceptit, ping;
  
  static void	CvtStringToARRAY8();
***************
*** 164,169 ****
--- 194,256 ----
  static XdmcpBuffer	directBuffer, broadcastBuffer;
  static XdmcpBuffer	buffer;
  
+ #if ((defined(SVR4) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
+ 
+ /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
+ 
+ static int
+ ifioctl (fd, cmd, arg)
+     int fd;
+     int cmd;
+     char *arg;
+ {
+     struct strioctl ioc;
+     int ret;
+ 
+     bzero((char *) &ioc, sizeof(ioc));
+     ioc.ic_cmd = cmd;
+     ioc.ic_timout = 0;
+     if (cmd == SIOCGIFCONF)
+     {
+ 	ioc.ic_len = ((struct ifconf *) arg)->ifc_len;
+ 	ioc.ic_dp = ((struct ifconf *) arg)->ifc_buf;
+ #ifdef ISC
+ 	/* SIOCGIFCONF is somewhat brain damaged on ISC. The argument
+ 	 * buffer must contain the ifconf structure as header. Ifc_req
+ 	 * is also not a pointer but a one element array of ifreq
+ 	 * structures. On return this array is extended by enough
+ 	 * ifreq fields to hold all interfaces. The return buffer length
+ 	 * is placed in the buffer header.
+ 	 */
+         ((struct ifconf *) ioc.ic_dp)->ifc_len =
+                                          ioc.ic_len - sizeof(struct ifconf);
+ #endif
+     }
+     else
+     {
+ 	ioc.ic_len = sizeof(struct ifreq);
+ 	ioc.ic_dp = arg;
+     }
+     ret = ioctl(fd, I_STR, (char *) &ioc);
+     if (ret >= 0 && cmd == SIOCGIFCONF)
+ #ifdef SVR4
+ 	((struct ifconf *) arg)->ifc_len = ioc.ic_len;
+ #endif
+ #ifdef ISC
+     {
+ 	((struct ifconf *) arg)->ifc_len =
+ 				 ((struct ifconf *)ioc.ic_dp)->ifc_len;
+ 	((struct ifconf *) arg)->ifc_buf = 
+ 			(caddr_t)((struct ifconf *)ioc.ic_dp)->ifc_req;
+     }
+ #endif
+     return(ret);
+ }
+ #else /* ((SVR4 && !sun && !NCR) || ISC) && SIOCGIFCONF */
+ #define ifioctl ioctl
+ #endif /* ((SVR4 && !sun) || ISC) && SIOCGIFCONF */
+ 
+ 
  /* ARGSUSED */
  static void
  PingHosts (closure, id)
***************
*** 386,395 ****
--- 473,514 ----
      int		    saveHostname = 0;
      struct sockaddr addr;
      int		    addrlen;
+ #ifdef MINIX
+     int r;
+ #endif
+ 
+ #ifdef MINIX
+     if (read_inprogress) abort();
+     if (read_size == 0)
+     {
+     	r= read(socketFD, read_buffer, sizeof(read_buffer));
+     	if (r == -1 && errno == EINPROGRESS)
+     	{
+     		read_inprogress= 1;
+     		nbio_inprogress(socketFD, ASIO_READ, 1 /* read */,
+     			0 /* write */, 0 /* exception */);
+     	}
+     	else if (r <= 0)
+     	{
+     		fprintf(stderr, "chooser: read error: %s\n", r == 0 ?
+     			"EOF" : strerror(errno));
+ 		return;
+ 	}
+     }
+ #endif
  
      addrlen = sizeof (addr);
+ #ifdef MINIX
+     if (!MNX_XdmcpFill (socketFD, &buffer, &addr, &addrlen,
+     	read_buffer, read_size))
+     {
+ 	return;
+     }
+     read_size= 0;
+ #else
      if (!XdmcpFill (socketFD, &buffer, &addr, &addrlen))
  	return;
+ #endif
      if (!XdmcpReadHeader (&buffer, &header))
  	return;
      if (header.version != XDM_PROTOCOL_VERSION)
***************
*** 466,471 ****
--- 585,601 ----
   *  addresses on the local host.
   */
  
+ #ifndef MINIX
+ 
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef AF_LINK
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+ 		     (p->ifr_addr.sa_len > sizeof (p->ifr_addr) ? \
+ 		      p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
+ #else
+ #define ifr_size(p) (sizeof (struct ifreq))
+ #endif
+ 
  RegisterHostname (name)
      char    *name;
  {
***************
*** 474,480 ****
      struct ifconf	ifc;
      register struct ifreq *ifr;
      struct sockaddr	broad_addr;
!     char		buf[2048];
      int			n;
  
      if (!strcmp (name, BROADCAST_HOSTNAME))
--- 604,610 ----
      struct ifconf	ifc;
      register struct ifreq *ifr;
      struct sockaddr	broad_addr;
!     char		buf[2048], *cp, *cplim;
      int			n;
  
      if (!strcmp (name, BROADCAST_HOSTNAME))
***************
*** 506,532 ****
  	    return;
  	    }
  
! 	for (ifr = ifcp->ifc_req,
! n = ifcp->ifc_len / sizeof (struct ifreq);
  	    --n >= 0;
  	    ifr++)
  #else
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_buf = buf;
! 	if (ioctl (socketFD, (int) SIOCGIFCONF, (char *) &ifc) < 0)
  	    return;
! 	for (ifr = ifc.ifc_req
! #ifdef CSRG_BASED
! 	     ; (char *)ifr < ifc.ifc_buf + ifc.ifc_len;
! 	     ifr = (struct ifreq *)((char *)ifr + sizeof (struct ifreq) +
! 		(ifr->ifr_addr.sa_len > sizeof (ifr->ifr_addr) ?
! 		 ifr->ifr_addr.sa_len - sizeof (ifr->ifr_addr) : 0))
  #else
! 	     , n = ifc.ifc_len / sizeof (struct ifreq); --n >= 0; ifr++
  #endif
! 	     )
  #endif /* STREAMSCONN && NCR */
  	{
  	    if (ifr->ifr_addr.sa_family != AF_INET)
  		continue;
  
--- 636,664 ----
  	    return;
  	    }
  
! 	for (ifr = ifcp->ifc_req, n = ifcp->ifc_len / sizeof (struct ifreq);
  	    --n >= 0;
  	    ifr++)
  #else
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_buf = buf;
! 	if (ifioctl (socketFD, (int) SIOCGIFCONF, (char *) &ifc) < 0)
  	    return;
! 
! #ifdef ISC
! #define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf
  #else
! #define IFC_IFC_REQ ifc.ifc_req
  #endif
! 
! 	cplim = (char *) IFC_IFC_REQ + ifc.ifc_len;
! 
! 	for (cp = (char *) IFC_IFC_REQ; cp < cplim; cp += ifr_size (ifr))
  #endif /* STREAMSCONN && NCR */
  	{
+ #ifndef NCR
+ 	    ifr = (struct ifreq *) cp;
+ #endif
  	    if (ifr->ifr_addr.sa_family != AF_INET)
  		continue;
  
***************
*** 546,552 ****
  
  		if (ioctl (ipfd, I_STR, (char *) &ioc) != -1 &&
  #else
! 		if (ioctl (socketFD, SIOCGIFFLAGS, (char *) &broad_req) != -1 &&
  #endif
  		    (broad_req.ifr_flags & IFF_BROADCAST) &&
  		    (broad_req.ifr_flags & IFF_UP)
--- 678,684 ----
  
  		if (ioctl (ipfd, I_STR, (char *) &ioc) != -1 &&
  #else
! 		if (ifioctl (socketFD, SIOCGIFFLAGS, (char *) &broad_req) != -1 &&
  #endif
  		    (broad_req.ifr_flags & IFF_BROADCAST) &&
  		    (broad_req.ifr_flags & IFF_UP)
***************
*** 561,567 ****
  
  		    if (ioctl (ipfd, I_STR, (char *) &ioc) != -1)
  #else
! 		    if (ioctl (socketFD, SIOCGIFBRDADDR, &broad_req) != -1)
  #endif
  			broad_addr = broad_req.ifr_addr;
  		    else
--- 693,699 ----
  
  		    if (ioctl (ipfd, I_STR, (char *) &ioc) != -1)
  #else
! 		    if (ifioctl (socketFD, SIOCGIFBRDADDR, &broad_req) != -1)
  #endif
  			broad_addr = broad_req.ifr_addr;
  		    else
***************
*** 611,616 ****
--- 743,792 ----
      }
  }
  
+ #else /* MINIX */
+ 
+ RegisterHostname (name)
+     char    *name;
+ {
+     struct hostent	*hostent;
+     struct sockaddr_in	in_addr;
+ 
+     if (!strcmp (name, BROADCAST_HOSTNAME))
+     {
+ 	    in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
+ 	    in_addr.sin_port = htons (XDM_UDP_PORT);
+ 	    RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+ 			      BROADCAST_QUERY);
+     }
+     else
+     {
+ 
+ 	/* address as hex string, e.g., "12180022" (depreciated) */
+ 	if (strlen(name) == 8 &&
+ 	    FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
+ 	{
+ 	    in_addr.sin_family = AF_INET;
+ 	}
+ 	/* Per RFC 1123, check first for IP address in dotted-decimal form */
+ 	else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
+ 	    in_addr.sin_family = AF_INET;
+ 	else
+ 	{
+ 	    hostent = gethostbyname (name);
+ 	    if (!hostent)
+ 		return;
+ 	    if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
+ 	    	return;
+ 	    in_addr.sin_family = hostent->h_addrtype;
+ 	    memmove( &in_addr.sin_addr, hostent->h_addr, 4);
+ 	}
+ 	in_addr.sin_port = htons (XDM_UDP_PORT);
+ 	RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+ 			  QUERY);
+     }
+ }
+ #endif /* !MINIX */
+ 
  static ARRAYofARRAY8	AuthenticationNames;
  
  RegisterAuthenticationName (name, namelen)
***************
*** 634,639 ****
--- 810,821 ----
      XdmcpHeader	header;
      int	i;
      int optlen;
+ #ifdef MINIX
+     char *udp_device;
+     nwio_udpopt_t udpopt;
+     int flags;
+     nbio_ref_t ref;
+ #endif
  
      header.version = XDM_PROTOCOL_VERSION;
      header.opcode = (CARD16) BROADCAST_QUERY;
***************
*** 652,668 ****
      XdmcpWriteARRAYofARRAY8 (&directBuffer, &AuthenticationNames);
  #if defined(STREAMSCONN)
      if ((socketFD = t_open ("/dev/udp", O_RDWR, 0)) < 0)
!         return 0;
      t_bind( socketFD, NULL, NULL );
  #else
      if ((socketFD = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
  	return 0;
  #endif
  #ifdef SO_BROADCAST
      soopts = 1;
      if (setsockopt (socketFD, SOL_SOCKET, SO_BROADCAST, (char *)&soopts, sizeof (soopts)) < 0)
  	perror ("setsockopt");
  #endif
      
      XtAddInput (socketFD, (XtPointer) XtInputReadMask, ReceivePacket,
  		(XtPointer) 0);
--- 834,881 ----
      XdmcpWriteARRAYofARRAY8 (&directBuffer, &AuthenticationNames);
  #if defined(STREAMSCONN)
      if ((socketFD = t_open ("/dev/udp", O_RDWR, 0)) < 0)
! 	return 0;
      t_bind( socketFD, NULL, NULL );
  #else
+ #ifdef MINIX
+     udp_device= getenv("UDP_DEVICE");
+     if (udp_device == NULL)
+     	udp_device= UDP_DEVICE;
+     if ((socketFD = open(udp_device, O_RDWR)) == -1)
+     	return 0;
+     udpopt.nwuo_flags= NWUO_SHARED | NWUO_LP_SEL | NWUO_EN_LOC |
+ 	NWUO_EN_BROAD | NWUO_RP_ANY | NWUO_RA_ANY | NWUO_RWDATALL |
+ 	NWUO_DI_IPOPT;
+     if (ioctl(socketFD, NWIOSUDPOPT, &udpopt) == -1)
+     {
+     	close(socketFD);
+     	return 0;
+     }
+     if ((flags= fcntl(socketFD, F_GETFD)) == -1)
+     {
+     	close(socketFD);
+     	return 0;
+     }
+     if (fcntl(socketFD, F_SETFD, flags | FD_ASYNCHIO) == -1)
+     {
+     	close(socketFD);
+     	return 0;
+     }
+     nbio_register(socketFD);
+     ref.ref_int= socketFD;
+     nbio_setcallback(socketFD, ASIO_READ, read_cb, ref);
+ #else /* !MINIX */
      if ((socketFD = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
  	return 0;
+ #endif /* MINIX */
  #endif
+ #ifndef STREAMSCONN
  #ifdef SO_BROADCAST
      soopts = 1;
      if (setsockopt (socketFD, SOL_SOCKET, SO_BROADCAST, (char *)&soopts, sizeof (soopts)) < 0)
  	perror ("setsockopt");
  #endif
+ #endif
      
      XtAddInput (socketFD, (XtPointer) XtInputReadMask, ReceivePacket,
  		(XtPointer) 0);
***************
*** 693,698 ****
--- 906,916 ----
  #if defined(STREAMSCONN)
          struct  t_call  call, rcv;
  #endif
+ #ifdef MINIX
+ 	char		*tcp_device;
+ 	nwio_tcpconf_t	tcpconf;
+ 	nwio_tcpcl_t	tcpcl;
+ #endif
  
  	xdm = (char *) app_resources.xdmAddress->data;
  	family = (xdm[0] << 8) + xdm[1];
***************
*** 738,743 ****
--- 956,986 ----
  	    exit (REMANAGE_DISPLAY);
  	}
  #else
+ #ifdef MINIX
+ 	tcp_device= getenv("TCP_DEVICE");
+ 	if (tcp_device == NULL)
+ 		tcp_device= TCP_DEVICE;
+ 	if ((fd= open(tcp_device, O_RDWR)) == -1)
+ 	{
+ 	    fprintf (stderr, "Cannot open '%s': %s\n", tcp_device,
+ 	    	strerror(errno));
+ 	    exit (REMANAGE_DISPLAY);
+ 	}
+ 	tcpconf.nwtc_flags= NWTC_EXCL | NWTC_LP_SEL | NWTC_SET_RA | NWTC_SET_RP;
+ 	tcpconf.nwtc_remport= in_addr.sin_port;
+ 	tcpconf.nwtc_remaddr= in_addr.sin_addr.s_addr;
+ 	if (ioctl(fd, NWIOSTCPCONF, &tcpconf) == -1)
+ 	{
+ 	    fprintf (stderr, "NWIOSTCPCONF failed: %s\n", strerror(errno));
+ 	    exit (REMANAGE_DISPLAY);
+ 	}
+ 	tcpcl.nwtcl_flags= 0;
+ 	if (ioctl(fd, NWIOTCPCONN, &tcpcl) == -1)
+ 	{
+ 	    fprintf (stderr, "NWIOTCPCONN failed: %s\n", strerror(errno));
+ 	    exit (REMANAGE_DISPLAY);
+ 	}
+ #else /* !MINIX */
  	if ((fd = socket (family, SOCK_STREAM, 0)) == -1)
  	{
  	    fprintf (stderr, "Cannot create response socket\n");
***************
*** 748,753 ****
--- 991,997 ----
  	    fprintf (stderr, "Cannot connect to xdm\n");
  	    exit (REMANAGE_DISPLAY);
  	}
+ #endif /* MINIX */
  #endif
  	buffer.data = (BYTE *) buf;
  	buffer.size = sizeof (buf);
***************
*** 963,965 ****
--- 1207,1228 ----
      toVal->addr = (caddr_t) &dest;
      toVal->size = sizeof (ARRAY8Ptr);
  }
+ 
+ #ifdef MINIX
+ static void read_cb(nbio_ref_t ref, int res, int err)
+ {
+ 	if (!read_inprogress)
+ 		abort();
+ 	if (res > 0)
+ 	{
+ 		read_size= res;
+ 	}
+ 	else
+     	{
+     		fprintf(stderr, "chooser: read error: %s\n", res == 0 ?
+     			"EOF" : strerror(err));
+ 		read_size= 0;
+ 	}
+ 	read_inprogress= 0;
+ }
+ #endif
diff -c xc/programs/xdm/daemon.c:1.1.1.2 xc/programs/xdm/daemon.c:3.5
*** xc/programs/xdm/daemon.c:1.1.1.2	Mon Jan 30 17:44:19 1995
--- xc/programs/xdm/daemon.c	Mon Jan 30 17:44:19 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: daemon.c,v 1.16 94/12/01 17:10:49 kaleb Exp $ */
+ /* $XFree86: xc/programs/xdm/daemon.c,v 3.5 1995/01/28 16:16:50 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 41,47 ****
  #else
  #include <sys/ioctl.h>
  #endif
! #if defined(__osf__) || defined(linux)
  #define setpgrp setpgid
  #endif
  #ifdef hpux
--- 42,48 ----
  #else
  #include <sys/ioctl.h>
  #endif
! #if defined(__osf__) || defined(linux) || defined(MINIX)
  #define setpgrp setpgid
  #endif
  #ifdef hpux
***************
*** 95,103 ****
--- 96,106 ----
  	stat = 0;	/* don't know how to set child's process group */
  #else
  	stat = setpgrp(child_id, child_id);
+ #ifndef MINIX
  	if (stat != 0)
  	    LogError("setting process grp for daemon failed, errno = %d\n",
  		     errno);
+ #endif /* MINIX */
  #endif
  #endif
  	exit (0);
***************
*** 122,127 ****
--- 125,141 ----
      close (1);
      close (2);
  
+ #ifndef __EMX__
+ #ifdef MINIX
+ #if 0
+     /* Use setsid() to get rid of our controlling tty, this requires an extra
+      * fork though.
+      */
+     setsid();
+     if (fork() > 0)
+     	_exit(0);
+ #endif
+ #else /* !MINIX */
  #if !((defined(SYSV) || defined(SVR4)) && defined(i386))
      if ((i = open ("/dev/tty", O_RDWR)) >= 0) {	/* did open succeed? */
  #if defined(USG) && defined(TCCLRCTTY)
***************
*** 137,143 ****
  #endif
  	(void) close (i);
      }
! #endif /* !i386 */
  
      /*
       * Set up the standard file descriptors.
--- 151,159 ----
  #endif
  	(void) close (i);
      }
! #endif /* !((SYSV || SVR4) && i386) */
! #endif /* MINIX */
! #endif /* !__EMX__ */
  
      /*
       * Set up the standard file descriptors.
diff -c xc/programs/xdm/dm.c:1.1.1.1 xc/programs/xdm/dm.c:3.1
*** xc/programs/xdm/dm.c:1.1.1.1	Mon Jan 30 17:44:20 1995
--- xc/programs/xdm/dm.c	Mon Jan 30 17:44:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: dm.c,v 1.70 94/04/17 20:03:36 gildea Exp $ */
+ /* $XFree86: xc/programs/xdm/dm.c,v 3.1 1994/10/20 06:15:09 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 152,158 ****
--- 153,163 ----
  	InitErrorLog ();
  
      /* Clean up any old Authorization files */
+ #ifdef MINIX
+     sprintf(cmdbuf, "/usr/bin/rm -f %s/A*", authDir);
+ #else
      sprintf(cmdbuf, "/bin/rm -f %s/A*", authDir);
+ #endif
      system(cmdbuf);
  
  #ifdef XDMCP
***************
*** 380,386 ****
      int		pid;
      struct display	*d;
      waitType	status;
! #ifndef X_NOT_POSIX
      sigset_t mask, omask;
  #else
      int		omask;
--- 385,391 ----
      int		pid;
      struct display	*d;
      waitType	status;
! #if !defined(X_NOT_POSIX) && !defined(__EMX__)
      sigset_t mask, omask;
  #else
      int		omask;
***************
*** 709,717 ****
--- 714,730 ----
  
      for (fd = 0; fd <= max; fd++)
  	if (FD_ISSET (fd, &CloseMask))
+ 	{
+ #ifdef MINIX
+ 	    nbio_unregister(fd);
+ #endif
  	    close (fd);
+         }
      FD_ZERO (&CloseMask);
      max = 0;
+ #ifdef MINIX
+     { extern int chooserFd; nbio_unregister(chooserFd); }
+ #endif
  }
  
  static int  pidFd;
diff -c xc/programs/xdm/dm.h:1.1.1.2 xc/programs/xdm/dm.h:3.7
*** xc/programs/xdm/dm.h:1.1.1.2	Mon Jan 30 17:44:21 1995
--- xc/programs/xdm/dm.h	Mon Jan 30 17:44:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: dm.h,v 1.63.1.1 95/01/26 19:31:18 kaleb Exp $ */
+ /* $XFree86: xc/programs/xdm/dm.h,v 3.7 1995/01/28 16:16:51 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 38,43 ****
--- 39,50 ----
   * public interfaces for greet/verify functionality
   */
  
+ #ifdef MINIX
+ #ifdef MNX_TCPCONN
+ #define TCPCONN
+ #endif
+ #endif /* MINIX */
+ 
  #include <X11/Xos.h>
  #include <X11/Xfuncs.h>
  #include <X11/Xmd.h>
***************
*** 48,54 ****
  #include <setjmp.h>
  #include <limits.h>
  #undef _POSIX_C_SOURCE
! #elif defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
  #include <setjmp.h>
  #include <limits.h>
  #else
--- 55,62 ----
  #include <setjmp.h>
  #include <limits.h>
  #undef _POSIX_C_SOURCE
! #else
! #if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
  #include <setjmp.h>
  #include <limits.h>
  #else
***************
*** 57,62 ****
--- 65,71 ----
  #include <limits.h>
  #undef _POSIX_SOURCE
  #endif
+ #endif
  
  /* If XDMCP symbol defined, compile to run XDMCP protocol */
  
***************
*** 352,359 ****
  #define SIGVAL void
  #endif
  
! #ifdef X_NOT_POSIX
! #ifdef SYSV
  #define SIGNALS_RESET_WHEN_CAUGHT
  #define UNRELIABLE_SIGNALS
  #endif
--- 361,368 ----
  #define SIGVAL void
  #endif
  
! #if defined(X_NOT_POSIX) || defined(__EMX__) || defined(__NetBSD__) && defined(__sparc__)
! #if defined(SYSV) || defined(__EMX__)
  #define SIGNALS_RESET_WHEN_CAUGHT
  #define UNRELIABLE_SIGNALS
  #endif
***************
*** 367,369 ****
--- 376,384 ----
  #endif
  
  SIGVAL (*Signal())();
+ 
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ void udp_read_cb(nbio_ref_t ref, int res, int err);
+ void tcp_listen_cb(nbio_ref_t ref, int res, int err);
+ #endif
diff -c xc/programs/xdm/genauth.c:1.1.1.2 xc/programs/xdm/genauth.c:3.2
*** xc/programs/xdm/genauth.c:1.1.1.2	Mon Jan 30 17:44:21 1995
--- xc/programs/xdm/genauth.c	Mon Jan 30 17:44:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: genauth.c,v 1.18.1.1 94/11/21 19:57:04 kaleb Exp $ */
+ /* $XFree86: xc/programs/xdm/genauth.c,v 3.2 1995/01/28 16:16:53 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
diff -c xc/programs/xdm/netaddr.c:1.1.1.1 xc/programs/xdm/netaddr.c:3.1
*** xc/programs/xdm/netaddr.c:1.1.1.1	Mon Jan 30 17:44:22 1995
--- xc/programs/xdm/netaddr.c	Mon Jan 30 17:44:22 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: netaddr.c,v 1.8 94/04/17 20:03:41 rws Exp $ */
+ /* $XFree86: xc/programs/xdm/netaddr.c,v 3.1 1994/08/31 04:50:51 dawes Exp $ */
  /*
  
  Copyright (c) 1991  X Consortium
***************
*** 41,51 ****
--- 42,56 ----
  
  #ifdef XDMCP
  
+ #ifndef MINIX
  #include <sys/socket.h>		/* struct sockaddr */
  #include <netinet/in.h>		/* struct sockaddr_in */
+ #endif
  
  #ifdef UNIXCONN
+ #ifndef X_NO_SYS_UN
  #include <sys/un.h>		/* struct sockaddr_un */
+ #endif
  #endif
  #ifdef DNETCONN
  #include <netdnet/dn.h>		/* struct sockaddr_dn */
diff -c xc/programs/xdm/policy.c:1.1.1.1 xc/programs/xdm/policy.c:3.0
*** xc/programs/xdm/policy.c:1.1.1.1	Mon Jan 30 17:44:22 1995
--- xc/programs/xdm/policy.c	Mon Jan 30 17:44:22 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: policy.c,v 1.12 94/04/17 20:03:41 hersh Exp $ */
+ /* $XFree86: xc/programs/xdm/policy.c,v 3.0 1994/06/28 12:32:38 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 41,49 ****
--- 42,52 ----
  #ifdef XDMCP
  
  # include <X11/X.h>
+ #ifndef MINIX
  # include <sys/socket.h>
  #ifdef AF_INET
  # include <netinet/in.h>
+ #endif
  #endif
  
  static ARRAY8 noAuthentication = { (CARD16) 0, (CARD8Ptr) 0 };
diff -c xc/programs/xdm/resource.c:1.1.1.1 xc/programs/xdm/resource.c:3.1
*** xc/programs/xdm/resource.c:1.1.1.1	Mon Jan 30 17:44:23 1995
--- xc/programs/xdm/resource.c	Mon Jan 30 17:44:23 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: resource.c,v 1.47 94/04/17 20:03:43 gildea Exp $ */
+ /* $XFree86: xc/programs/xdm/resource.c,v 3.1 1994/12/29 10:22:27 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 69,74 ****
--- 70,76 ----
   * parameters set util/imake.includes/site.def (or *.macros in that directory
   * if it is server-specific).  DO NOT CHANGE THESE DEFINITIONS!
   */
+ #ifndef __EMX__
  #ifndef DEF_SERVER_LINE 
  #define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
  #endif
***************
*** 121,126 ****
--- 123,185 ----
  #ifndef DEF_GREETER_LIB
  #define DEF_GREETER_LIB "/X11/lib/X11/xdm/libXdmGreet.so"
  #endif
+ #else
+ /* unfortunately I have to declare all of them, because there is a limit
+  * in argument size in OS/2
+  * but everything needs to be fixed again
+  */
+ #define DEF_SERVER_LINE ":0 local /XFree86/bin/X :0"
+ #ifndef XRDB_PROGRAM
+ #define XRDB_PROGRAM "/XFree86/bin/xrdb"
+ #endif
+ #ifndef DEF_SESSION
+ #define DEF_SESSION "/XFree86/bin/xterm -ls"
+ #endif
+ #ifndef DEF_USER_PATH
+ #define DEF_USER_PATH "c:\\os2;c:\\os2\apps;\\XFree86\\bin"
+ #endif
+ #ifndef DEF_SYSTEM_PATH
+ #define DEF_SYSTEM_PATH "c:\\os2;c:\\os2\apps;\\XFree86\\bin"
+ #endif
+ #ifndef DEF_SYSTEM_SHELL
+ #define DEF_SYSTEM_SHELL "sh"
+ #endif
+ #ifndef DEF_FAILSAFE_CLIENT
+ #define DEF_FAILSAFE_CLIENT "/XFree86/bin/xterm"
+ #endif
+ #ifndef DEF_XDM_CONFIG
+ #define DEF_XDM_CONFIG "/XFree86/lib/X11/xdm/xdm-config"
+ #endif
+ #ifndef DEF_CHOOSER
+ #define DEF_CHOOSER "/XFree86/lib/X11/xdm/chooser"
+ #endif
+ #ifndef DEF_AUTH_NAME
+ #ifdef HASXDMAUTH
+ #define DEF_AUTH_NAME	"XDM-AUTHORIZATION-1 MIT-MAGIC-COOKIE-1"
+ #else
+ #define DEF_AUTH_NAME	"MIT-MAGIC-COOKIE-1"
+ #endif
+ #endif
+ #ifndef DEF_AUTH_DIR
+ #define DEF_AUTH_DIR "/XFree86/lib/X11/xdm"
+ #endif
+ #ifndef DEF_USER_AUTH_DIR
+ #define DEF_USER_AUTH_DIR	"/tmp"
+ #endif
+ #ifndef DEF_KEY_FILE
+ #define DEF_KEY_FILE	""
+ #endif
+ #ifndef DEF_ACCESS_FILE
+ #define DEF_ACCESS_FILE	""
+ #endif
+ #ifndef DEF_RANDOM_FILE
+ #define DEF_RANDOM_FILE ""
+ #endif
+ #ifndef DEF_GREETER_LIB
+ #define DEF_GREETER_LIB "/XFree86/lib/X11/xdm/libXdmGreet.so"
+ #endif
+ 
+ #endif /* __EMX__ */
  
  #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
  
***************
*** 185,191 ****
  "openRepeat",	"OpenRepeat",	DM_INT,		boffset(openRepeat),
  				"5",
  "openTimeout",	"OpenTimeout",	DM_INT,		boffset(openTimeout),
! 				"30",
  "startAttempts","StartAttempts",DM_INT,		boffset(startAttempts),
  				"4",
  "pingInterval",	"PingInterval",	DM_INT,		boffset(pingInterval),
--- 244,250 ----
  "openRepeat",	"OpenRepeat",	DM_INT,		boffset(openRepeat),
  				"5",
  "openTimeout",	"OpenTimeout",	DM_INT,		boffset(openTimeout),
! 				"120",
  "startAttempts","StartAttempts",DM_INT,		boffset(startAttempts),
  				"4",
  "pingInterval",	"PingInterval",	DM_INT,		boffset(pingInterval),
diff -c xc/programs/xdm/server.c:1.1.1.1 xc/programs/xdm/server.c:3.1
*** xc/programs/xdm/server.c:1.1.1.1	Mon Jan 30 17:44:24 1995
--- xc/programs/xdm/server.c	Mon Jan 30 17:44:24 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: server.c,v 1.19 94/04/17 20:03:44 hersh Exp $ */
+ /* $XFree86: xc/programs/xdm/server.c,v 3.1 1994/06/28 12:32:39 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 43,48 ****
--- 44,56 ----
  # include	<signal.h>
  # include	<errno.h>
  
+ #ifdef MINIX
+ #include <sys/ioctl.h>
+ #include <net/gen/in.h>
+ #include <net/gen/tcp.h>
+ #include <net/gen/tcp_io.h>
+ #endif
+ 
  static receivedUsr1;
  
  #ifdef X_NOT_STDC_ENV
***************
*** 65,80 ****
      ++receivedUsr1;
  }
  
- static char *_SysErrorMsg (n)
-     int n;
- {
-     extern char *sys_errlist[];
-     extern int sys_nerr;
-     char *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
- 
-     return (s ? s : "no such error");
- }
- 
  StartServerOnce (d)
  struct display	*d;
  {
--- 73,78 ----
***************
*** 266,271 ****
--- 264,272 ----
  #ifdef STREAMSCONN
      struct netbuf	netb;
  #endif
+ #ifdef MINIX
+     nwio_tcpconf_t tcpconf;
+ #endif
  
      if (d->peer)
  	free ((char *) d->peer);
***************
*** 276,283 ****
--- 277,302 ----
      len = 8;
      /* lucky for us, t_getname returns something that looks like a sockaddr */
  #else
+ #ifdef MINIX
+     if (ioctl(fd, NWIOGTCPCONF, &tcpconf) == -1)
+     {
+     	LogError("NWIOGTCPCONF failed: %s\n", strerror(errno));
+     	len= 0;
+     }
+     else
+     {
+     	struct sockaddr_in *sinp;
+ 
+     	sinp= (struct sockaddr_in *)buf;
+     	len= sizeof(*sinp);
+     	sinp->sin_family= AF_INET;
+     	sinp->sin_port= tcpconf.nwtc_remport;
+     	sinp->sin_addr.s_addr= tcpconf.nwtc_remaddr;
+     }
+ #else
      getpeername (fd, (struct sockaddr *) buf, &len);
  #endif
+ #endif
      d->peerlen = 0;
      if (len)
      {
***************
*** 340,346 ****
  	    	return 1;
  	    } else {
  	    	Debug ("OpenDisplay failed %d (%s) on \"%s\"\n",
! 		       errno, _SysErrorMsg (errno), d->name);
  	    }
  	    Debug ("waiting for server to start %d\n", i);
  	    sleep ((unsigned) d->openDelay);
--- 359,365 ----
  	    	return 1;
  	    } else {
  	    	Debug ("OpenDisplay failed %d (%s) on \"%s\"\n",
! 		       errno, strerror (errno), d->name);
  	    }
  	    Debug ("waiting for server to start %d\n", i);
  	    sleep ((unsigned) d->openDelay);
diff -c xc/programs/xdm/session.c:1.1.1.1 xc/programs/xdm/session.c:3.4
*** xc/programs/xdm/session.c:1.1.1.1	Mon Jan 30 17:44:25 1995
--- xc/programs/xdm/session.c	Mon Jan 30 17:44:25 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: session.c,v 1.72 94/04/17 20:03:45 gildea Exp $ */
+ /* $XFree86: xc/programs/xdm/session.c,v 3.4 1994/11/26 12:49:31 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 62,67 ****
--- 63,72 ----
  #endif
  #endif
  
+ #ifdef CSRG_BASED
+ #include <sys/param.h>
+ #endif
+ 
  extern	int	PingServer();
  extern	int	SessionPingFailed();
  extern	int	Debug();
***************
*** 223,232 ****
  IOErrorHandler (dpy)
      Display *dpy;
  {
!     extern char *sys_errlist[];
!     extern int sys_nerr;
!     char *s = ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno]
! 						: "unknown error");
  
      LogError("fatal IO error %d (%s)\n", errno, s);
      exit(RESERVER_DISPLAY);
--- 228,234 ----
  IOErrorHandler (dpy)
      Display *dpy;
  {
!     char *s = strerror(errno);
  
      LogError("fatal IO error %d (%s)\n", errno, s);
      exit(RESERVER_DISPLAY);
***************
*** 547,552 ****
--- 549,561 ----
  	    return (0);
  	}
  #endif
+ #if (BSD >= 199103)
+ 	if (setlogin(name) < 0)
+ 	{
+ 	    LogError("setlogin for \"%s\" failed, errno=%d", name, errno);
+ 	    return(0);
+ 	}
+ #endif
  	if (setuid(verify->uid) < 0)
  	{
  	    LogError("setuid %d (user \"%s\") failed, errno=%d\n",
***************
*** 838,844 ****
--- 847,858 ----
      if (home)
  	env = setEnv (env, "HOME", home);
      if (user)
+     {
  	env = setEnv (env, "USER", user);
+ #if defined(SYSV) || defined(SVR4)
+ 	env = setEnv (env, "LOGNAME", user);
+ #endif
+     }
      env = setEnv (env, "PATH", d->systemPath);
      env = setEnv (env, "SHELL", d->systemShell);
      if (d->authFile)
***************
*** 845,847 ****
--- 859,869 ----
  	    env = setEnv (env, "XAUTHORITY", d->authFile);
      return env;
  }
+ 
+ #if defined(SCO) && !defined(SCO_USA)
+ char *crypt(s1, s2)
+ 	char	*s1, *s2;
+ {
+ 	return(s2);
+ }
+ #endif
diff -c xc/programs/xdm/sessreg.c:1.1.1.3 xc/programs/xdm/sessreg.c:3.4
*** xc/programs/xdm/sessreg.c:1.1.1.3	Mon Jan 30 17:44:26 1995
--- xc/programs/xdm/sessreg.c	Mon Jan 30 17:44:26 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: sessreg.c,v 1.17 95/01/29 12:07:22 kaleb Exp $
+  * $XFree86: xc/programs/xdm/sessreg.c,v 3.4 1995/01/30 03:28:58 dawes Exp $
   *
   * Copyright (c) 1990  X Consortium
   * 
***************
*** 57,65 ****
--- 58,75 ----
  #define NO_LASTLOG
  #endif
  
+ /* Disable LASTLOG for now because it isn't implemented portably */
  #ifndef NO_LASTLOG
+ #define NO_LASTLOG
+ #endif
+ 
+ #ifndef NO_LASTLOG
  # include	<lastlog.h>
  # include	<pwd.h>
+ #endif
+ 
+ #ifdef linux
+ #define SYSV
  #endif
  
  #ifdef SVR4
diff -c xc/programs/xdm/socket.c:1.1.1.1 xc/programs/xdm/socket.c:3.1
*** xc/programs/xdm/socket.c:1.1.1.1	Mon Jan 30 17:44:26 1995
--- xc/programs/xdm/socket.c	Mon Jan 30 17:44:26 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: socket.c,v 1.34 94/04/17 20:03:47 gildea Exp $ */
+ /* $XFree86: xc/programs/xdm/socket.c,v 3.1 1994/08/31 04:50:53 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 42,51 ****
--- 43,66 ----
  #ifndef STREAMSCONN
  
  #include <errno.h>
+ #ifndef MINIX
  #include <sys/socket.h>
  #include <netinet/in.h>
+ #ifndef X_NO_SYS_UN
  #include <sys/un.h>
+ #endif
  #include <netdb.h>
+ #else /* MINIX */
+ #include <net/hton.h>
+ #include <net/netlib.h>
+ #include <net/gen/in.h>
+ #include <net/gen/tcp.h>
+ #include <net/gen/tcp_io.h>
+ #include <net/gen/udp.h>
+ #include <net/gen/udp_io.h>
+ #include <sys/ioctl.h>
+ #include <sys/nbio.h>
+ #endif /* !MINIX */
  
  #ifdef X_NOT_STDC_ENV
  extern int errno;
***************
*** 60,72 ****
--- 75,102 ----
  
  CreateWellKnownSockets ()
  {
+ #ifndef MINIX
      struct sockaddr_in	sock_addr;
+ #else /* MINIX */
+     char *tcp_device, *udp_device;
+     nwio_udpopt_t udpopt;
+     nwio_tcpconf_t tcpconf;
+     int flags;
+     nbio_ref_t ref;
+ #endif /* !MINIX */
      char		*name, *localHostname();
  
      if (request_port == 0)
  	    return;
      Debug ("creating socket %d\n", request_port);
+ #ifdef MINIX
+     udp_device= getenv("UDP_DEVICE");
+     if (udp_device == NULL)
+     	udp_device= UDP_DEVICE;
+     xdmcpFd = open(udp_device, O_RDWR);
+ #else
      xdmcpFd = socket (AF_INET, SOCK_DGRAM, 0);
+ #endif
      if (xdmcpFd == -1) {
  	LogError ("XDMCP socket creation failed, errno %d\n", errno);
  	return;
***************
*** 74,79 ****
--- 104,139 ----
      name = localHostname ();
      registerHostname (name, strlen (name));
      RegisterCloseOnFork (xdmcpFd);
+ #ifdef MINIX
+     udpopt.nwuo_flags= NWUO_SHARED | NWUO_LP_SET | NWUO_EN_LOC |
+ 	NWUO_EN_BROAD | NWUO_RP_ANY | NWUO_RA_ANY | NWUO_RWDATALL |
+ 	NWUO_DI_IPOPT;
+     udpopt.nwuo_locport= htons(request_port);
+     if (ioctl(xdmcpFd, NWIOSUDPOPT, &udpopt) == -1)
+     {
+ 	LogError ("error %d binding socket address %d\n", errno, request_port);
+ 	close (xdmcpFd);
+ 	xdmcpFd = -1;
+ 	return;
+     }
+     if ((flags= fcntl(xdmcpFd, F_GETFD)) == -1)
+     {
+ 	LogError ("F_GETFD failed: %s\n", strerror(errno));
+ 	close (xdmcpFd);
+ 	xdmcpFd = -1;
+ 	return;
+     }
+     if (fcntl(xdmcpFd, F_SETFD, flags | FD_ASYNCHIO) == -1)
+     {
+ 	LogError ("F_SETFD failed: %s\n", strerror(errno));
+ 	close (xdmcpFd);
+ 	xdmcpFd = -1;
+ 	return;
+     }
+     nbio_register(xdmcpFd);
+     ref.ref_int= xdmcpFd;
+     nbio_setcallback(xdmcpFd, ASIO_READ, udp_read_cb, ref);
+ #else
      /* zero out the entire structure; this avoids 4.4 incompatibilities */
      bzero ((char *) &sock_addr, sizeof (sock_addr));
  #ifdef BSD44SOCKETS
***************
*** 89,98 ****
--- 149,166 ----
  	xdmcpFd = -1;
  	return;
      }
+ #endif
      WellKnownSocketsMax = xdmcpFd;
      FD_SET (xdmcpFd, &WellKnownSocketsMask);
  
+ #ifdef MINIX
+     tcp_device= getenv("TCP_DEVICE");
+     if (tcp_device == NULL)
+     	tcp_device= TCP_DEVICE;
+     chooserFd = open(tcp_device, O_RDWR);
+ #else
      chooserFd = socket (AF_INET, SOCK_STREAM, 0);
+ #endif
      Debug ("Created chooser socket %d\n", chooserFd);
      if (chooserFd == -1)
      {
***************
*** 99,110 ****
--- 167,209 ----
  	LogError ("chooser socket creation failed, errno %d\n", errno);
  	return;
      }
+ #ifdef MINIX
+     tcpconf.nwtc_flags= NWTC_EXCL | NWTC_LP_SEL | NWTC_UNSET_RA |
+     	NWTC_UNSET_RP;
+     if (ioctl(chooserFd, NWIOSTCPCONF, &tcpconf) == -1)
+     {
+     	LogError("NWIOSTCPCONF failed: %s\n", strerror(errno));
+     	close(chooserFd);
+     	chooserFd= -1;
+     	return;
+     }
+     GetChooserAddr(NULL, NULL);
+     if ((flags= fcntl(chooserFd, F_GETFD)) == -1)
+     {
+ 	LogError ("F_GETFD failed: %s\n", strerror(errno));
+ 	close (chooserFd);
+ 	chooserFd = -1;
+ 	return;
+     }
+     if (fcntl(chooserFd, F_SETFD, flags | FD_ASYNCHIO) == -1)
+     {
+ 	LogError ("F_SETFD failed: %s\n", strerror(errno));
+ 	close (chooserFd);
+ 	chooserFd = -1;
+ 	return;
+     }
+     nbio_register(chooserFd);
+     ref.ref_int= chooserFd;
+     nbio_setcallback(chooserFd, ASIO_IOCTL, tcp_listen_cb, ref);
+ #else
      listen (chooserFd, 5);
+ #endif
      if (chooserFd > WellKnownSocketsMax)
  	WellKnownSocketsMax = chooserFd;
      FD_SET (chooserFd, &WellKnownSocketsMask);
  }
  
+ #ifndef MINIX
  GetChooserAddr (addr, lenp)
      char	*addr;
      int		*lenp;
***************
*** 119,124 ****
--- 218,253 ----
      *lenp = len;
      return 0;
  }
+ #else /* MINIX */
+ GetChooserAddr (addr, lenp)
+     char	*addr;
+     int		*lenp;
+ {
+     static struct sockaddr_in	in_addr;
+     static int first_time= 1;
+     int			len;
+     nwio_tcpconf_t tcpconf;
+ 
+     if (first_time)
+     {
+     	    first_time= 0;
+ 	    if (ioctl(chooserFd, NWIOGTCPCONF, &tcpconf) == -1)
+ 	    {
+ 		LogError("NWIOGTCPCONF failed: %s\n", strerror(errno));
+ 		return -1;
+ 	    }
+ 	    in_addr.sin_family= AF_INET;
+ 	    in_addr.sin_port= tcpconf.nwtc_locport;
+ 	    in_addr.sin_addr.s_addr= tcpconf.nwtc_locaddr;
+ 	    if (addr == NULL)
+ 	    	return 0;
+     }
+     len = sizeof in_addr;
+     memmove( addr, (char *) &in_addr, len);
+     *lenp = len;
+     return 0;
+ }
+ #endif /* !MINIX */
  
  #endif /* !STREAMSCONN */
  #endif /* XDMCP */
diff -c xc/programs/xdm/streams.c:1.1.1.2 xc/programs/xdm/streams.c:3.1
*** xc/programs/xdm/streams.c:1.1.1.2	Mon Jan 30 17:44:27 1995
--- xc/programs/xdm/streams.c	Mon Jan 30 17:44:27 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: streams.c,v 1.5 94/06/03 16:34:41 mor Exp $ */
+ /* $XFree86: xc/programs/xdm/streams.c,v 3.1 1994/06/09 10:56:15 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
diff -c xc/programs/xdm/util.c:1.1.1.2 xc/programs/xdm/util.c:3.5
*** xc/programs/xdm/util.c:1.1.1.2	Mon Jan 30 17:44:27 1995
--- xc/programs/xdm/util.c	Mon Jan 30 17:44:28 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: util.c,v 1.18 94/11/21 18:33:11 kaleb Exp $ */
+ /* $XFree86: xc/programs/xdm/util.c,v 3.5 1995/01/28 16:16:57 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
***************
*** 52,58 ****
  #undef _POSIX_SOURCE
  #endif
  #endif
! #if defined(__osf__) || defined(linux)
  #define setpgrp setpgid
  #endif
  
--- 53,59 ----
  #undef _POSIX_SOURCE
  #endif
  #endif
! #if defined(__osf__) || defined(linux) || defined(MINIX)
  #define setpgrp setpgid
  #endif
  
***************
*** 219,229 ****
--- 220,240 ----
  CleanUpChild ()
  {
  #if defined(SYSV) || defined(SVR4)
+ #if !(defined(SVR4) && defined(i386))
  	setpgrp ();
+ #endif
  #else
  	setpgrp (0, getpid ());
+ #ifdef MINIX /* actually POSIX */
+ 	{
+ 		sigset_t ss; 
+ 		sigemptyset(&ss);
+ 		sigprocmask(SIG_SETMASK, &ss, NULL);
+ 	}
+ #else
  	sigsetmask (0);
  #endif
+ #endif
  #ifdef SIGCHLD
  	(void) Signal (SIGCHLD, SIG_DFL);
  #endif
***************
*** 252,258 ****
      int sig;
      SIGVAL (*handler)();
  {
! #ifndef X_NOT_POSIX
      struct sigaction sigact, osigact;
      sigact.sa_handler = handler;
      sigemptyset(&sigact.sa_mask);
--- 263,269 ----
      int sig;
      SIGVAL (*handler)();
  {
! #if !defined(X_NOT_POSIX) && !defined(__EMX__)
      struct sigaction sigact, osigact;
      sigact.sa_handler = handler;
      sigemptyset(&sigact.sa_mask);
diff -c xc/programs/xdm/xdmcp.c:1.1.1.2 xc/programs/xdm/xdmcp.c:3.2
*** xc/programs/xdm/xdmcp.c:1.1.1.2	Mon Jan 30 17:44:28 1995
--- xc/programs/xdm/xdmcp.c	Mon Jan 30 17:44:29 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xdmcp.c,v 1.15 94/09/19 20:16:38 converse Exp $ */
+ /* $XFree86: xc/programs/xdm/xdmcp.c,v 3.2 1995/01/12 05:57:08 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 45,54 ****
--- 46,62 ----
  # include	<sys/types.h>
  # include	<ctype.h>
  
+ #ifndef MINIX
  #include	<sys/socket.h>
  #include	<netinet/in.h>
+ #ifndef X_NO_SYS_UN
  #include	<sys/un.h>
+ #endif
  #include	<netdb.h>
+ #else /* MINIX */
+ #include <net/hton.h>
+ #include <net/gen/netdb.h>
+ #endif /* !MINIX */
  
  #ifdef X_NOT_STDC_ENV
  #define Time_t long
***************
*** 58,63 ****
--- 66,83 ----
  #define Time_t time_t
  #endif
  
+ #ifdef MINIX
+ struct sockaddr_un
+ {
+ 	u16_t   sun_family;
+ 	char    sun_path[62];
+ };
+ static char read_buffer[XDM_MAX_MSGLEN+sizeof(udp_io_hdr_t)];
+ static int read_inprogress;
+ static int read_size;
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  #define getString(name,len)	((name = malloc (len + 1)) ? 1 : 0)
  
  /*
***************
*** 261,273 ****
--- 281,325 ----
      XdmcpHeader		header;
      struct sockaddr_in	addr;
      int			addrlen = sizeof addr;
+ #ifdef MINIX
+     int			r;
+ #endif
+ 
+ #ifdef MINIX
+     if (read_inprogress) abort();
+     if (read_size == 0)
+     {
+     	r= read(xdmcpFd, read_buffer, sizeof(read_buffer));
+     	if (r == -1 && errno == EINPROGRESS)
+     	{
+     		read_inprogress= 1;
+     		nbio_inprogress(xdmcpFd, ASIO_READ, 1 /* read */,
+     			0 /* write */, 0 /* exception */);
+     	}
+     	else if (r <= 0)
+     	{
+     		LogError("read error: %s\n",
+     			r == 0 ?  "EOF" : strerror(errno));
+ 		return;
+ 	}
+     }
+ #endif
  
      Debug ("ProcessRequestSocket\n");
      bzero ((char *) &addr, sizeof (addr));
+ #ifdef MINIX
+     if (!MNX_XdmcpFill (xdmcpFd, &buffer, &addr, &addrlen,
+     	read_buffer, read_size))
+     {
+ 	return;
+     }
+     read_size= 0;
+ #else
      if (!XdmcpFill (xdmcpFd, &buffer, &addr, &addrlen)) {
  	Debug ("XdmcpFill failed\n");
  	return;
      }
+ #endif
      if (!XdmcpReadHeader (&buffer, &header)) {
  	Debug ("XdmcpReadHeader failed\n");
  	return;
***************
*** 313,319 ****
--- 365,381 ----
      Debug ("WaitForSomething\n");
      if (AnyWellKnownSockets () && !ChildReady) {
  	reads = WellKnownSocketsMask;
+ #ifdef MINIX__NOT
+ 	{
+ 		struct timeval tv;
+ 		tv.tv_sec= 5;
+ 		tv.tv_usec= 0;
+ 		nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv);
+ 		ChildReady= 1;
+ 	}
+ #else
  	nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, 0);
+ #endif
  	Debug ("select returns %d.  Rescan: %d  ChildReady: %d\n",
  		nready, Rescan, ChildReady);
  	if (nready > 0)
***************
*** 1219,1221 ****
--- 1281,1302 ----
  }
  
  #endif /* XDMCP */
+ 
+ #ifdef MINIX
+ void udp_read_cb(nbio_ref_t ref, int res, int err)
+ {
+ 	if (!read_inprogress)
+ 		abort();
+ 	if (res > 0)
+ 	{
+ 		read_size= res;
+ 	}
+ 	else
+     	{
+     		LogError("read error: %s\n",
+     			res == 0 ?  "EOF" : strerror(err));
+ 		read_size= 0;
+ 	}
+ 	read_inprogress= 0;
+ }
+ #endif
diff -c xc/programs/xdm/xdmshell.c:1.1.1.2 xc/programs/xdm/xdmshell.c:3.2
*** xc/programs/xdm/xdmshell.c:1.1.1.2	Mon Jan 30 17:44:29 1995
--- xc/programs/xdm/xdmshell.c	Mon Jan 30 17:44:29 1995
***************
*** 37,42 ****
--- 37,44 ----
   * bring down X when you are finished.
   */
  
+ /* $XFree86: xc/programs/xdm/xdmshell.c,v 3.2 1995/01/28 16:16:58 dawes Exp $ */
+ 
  #include <stdio.h>
  #include "dm.h"
  #include <errno.h>
***************
*** 65,78 ****
  
  char *ProgramName;
  
- static char *SysErrorMsg (n)
-     int n;
- {
-     char *s = strerror(n);
-     return (s ? s : "unknown error");
- }
- 
- 
  static int exec_args (filename, args)
      char *filename;
      char **args;
--- 67,72 ----
***************
*** 200,206 ****
      args[4] = NULL;
      if (exec_args (cmdbuf, args) == -1) {
  	fprintf (stderr, "%s:  unable to execute %s (error %d, %s)\r\n",
! 		 ProgramName, cmdbuf, errno, SysErrorMsg(errno));
  	exit (1);
      }
  
--- 194,200 ----
      args[4] = NULL;
      if (exec_args (cmdbuf, args) == -1) {
  	fprintf (stderr, "%s:  unable to execute %s (error %d, %s)\r\n",
! 		 ProgramName, cmdbuf, errno, strerror(errno));
  	exit (1);
      }
  
diff -c xc/programs/xdm/greeter/verify.c:1.1.1.1 xc/programs/xdm/greeter/verify.c:3.0
*** xc/programs/xdm/greeter/verify.c:1.1.1.1	Mon Jan 30 17:44:32 1995
--- xc/programs/xdm/greeter/verify.c	Mon Jan 30 17:44:32 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: verify.c,v 1.32 94/04/17 20:03:55 gildea Exp $ */
+ /* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.0 1994/06/26 13:12:06 dawes Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 66,71 ****
--- 67,76 ----
      "SYS_CODE",
      "TZ",
  #endif
+ #if (defined(SVR4) || defined(SYSV)) && defined(i386) && !defined(sun)
+     "TZ",
+     "XLOCAL",
+ #endif
      NULL
  };
  
***************
*** 84,89 ****
--- 89,97 ----
      env = setEnv (env, "DISPLAY", d->name);
      env = setEnv (env, "HOME", home);
      env = setEnv (env, "USER", user);
+ #if defined(SYSV) || defined(SVR4)
+     env = setEnv (env, "LOGNAME", user);
+ #endif
      env = setEnv (env, "PATH", useSystemPath ? d->systemPath : d->userPath);
      env = setEnv (env, "SHELL", shell);
      for (envvar = envvars; *envvar; envvar++)
diff -c xc/programs/xfs/Imakefile:1.1.1.1 xc/programs/xfs/Imakefile:3.0
*** xc/programs/xfs/Imakefile:1.1.1.1	Mon Jan 30 17:44:35 1995
--- xc/programs/xfs/Imakefile	Mon Jan 30 17:44:35 1995
***************
*** 1,12 ****
  XCOMM $XConsortium: Imakefile,v 1.26 94/02/10 21:47:08 rws Exp $
  #undef ServerDefines
  #include <Server.tmpl>
  #define	IHaveSubdirs
  
  OSDIR = os
- OSLIB = $(OSDIR)/libos.a
  DIFSDIR = difs
  DIFSLIB = $(DIFSDIR)/libdifs.a
  SYSLIBS = MathLibrary
  #ifdef i386SVR3Architecture
  BSDEMUL = $(DEPXBSDLIB)
--- 1,18 ----
  XCOMM $XConsortium: Imakefile,v 1.26 94/02/10 21:47:08 rws Exp $
+ XCOMM $XFree86: xc/programs/xfs/Imakefile,v 3.0 1994/10/20 06:15:23 dawes Exp $
  #undef ServerDefines
  #include <Server.tmpl>
  #define	IHaveSubdirs
  
  OSDIR = os
  DIFSDIR = difs
+ #ifndef OS2Architecture
+ OSLIB = $(OSDIR)/libos.a
  DIFSLIB = $(DIFSDIR)/libdifs.a
+ #else
+ OSLIB = $(OSDIR)/os.a
+ DIFSLIB = $(DIFSDIR)/difs.a
+ #endif
  SYSLIBS = MathLibrary
  #ifdef i386SVR3Architecture
  BSDEMUL = $(DEPXBSDLIB)
diff -c xc/programs/xfs/os/access.c:1.1.1.1 xc/programs/xfs/os/access.c:3.0
*** xc/programs/xfs/os/access.c:1.1.1.1	Mon Jan 30 17:44:41 1995
--- xc/programs/xfs/os/access.c	Mon Jan 30 17:44:41 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: access.c,v 1.11 94/04/17 19:56:02 kaleb Exp $ */
+ /* $XFree86: xc/programs/xfs/os/access.c,v 3.0 1994/06/28 12:33:00 dawes Exp $ */
  /*
   
  Copyright (c) 1990, 1991  X Consortium
***************
*** 46,55 ****
--- 47,60 ----
   */
  
  #include	<X11/Xos.h>
+ #ifndef MINIX
  #include        <sys/param.h>
  #include	<sys/socket.h>
  #include	<netdb.h>
  #include	<netinet/in.h>
+ #else
+ #include <net/gen/netdb.h>
+ #endif /* !MINIX */
  #include	"clientstr.h"
  #include	"misc.h"
  #include	"site.h"
diff -c xc/programs/xfs/os/connection.c:1.1.1.1 xc/programs/xfs/os/connection.c:3.2
*** xc/programs/xfs/os/connection.c:1.1.1.1	Mon Jan 30 17:44:42 1995
--- xc/programs/xfs/os/connection.c	Mon Jan 30 17:44:42 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: connection.c,v 1.29 94/04/17 19:56:05 mor Exp $ */
+ /* $XFree86: xc/programs/xfs/os/connection.c,v 3.2 1994/10/20 06:15:32 dawes Exp $ */
  /*
   * handles connections
   */
***************
*** 73,83 ****
--- 74,90 ----
  #include	"misc.h"
  #include	<stdio.h>
  #include	<errno.h>
+ #ifndef MINIX
  #include	<sys/param.h>
  #include	<sys/socket.h>
  #include	<sys/uio.h>
+ #endif
  #include	<signal.h>
  
+ #ifdef __EMX__
+ #define _NFILE  NOFILE
+ #endif
+ 
  #include	"FS.h"
  #include	"FSproto.h"
  #include	"clientstr.h"
***************
*** 86,91 ****
--- 93,103 ----
  #include	"osstruct.h"
  #include	"servermd.h"
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  #ifdef X_NOT_STDC_ENV
  extern int errno;
  #endif
***************
*** 190,196 ****
      for (i = 0; i < MAXSOCKS; i++)
  	ConnectionTranslation[i] = 0;
  
! #if defined(hpux) || defined(SVR4)
      lastfdesc = _NFILE - 1;
  #else
      lastfdesc = getdtablesize() - 1;
--- 202,208 ----
      for (i = 0; i < MAXSOCKS; i++)
  	ConnectionTranslation[i] = 0;
  
! #if defined(hpux) || defined(SVR4) || defined(__EMX__)
      lastfdesc = _NFILE - 1;
  #else
      lastfdesc = getdtablesize() - 1;
diff -c xc/programs/xfs/os/io.c:1.1.1.1 xc/programs/xfs/os/io.c:3.2
*** xc/programs/xfs/os/io.c:1.1.1.1	Mon Jan 30 17:44:43 1995
--- xc/programs/xfs/os/io.c	Mon Jan 30 17:44:43 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: io.c,v 1.16 94/04/17 19:56:06 mor Exp $ */
+ /* $XFree86: xc/programs/xfs/os/io.c,v 3.2 1994/06/28 12:33:03 dawes Exp $ */
  /*
   * i/o functions
   */
***************
*** 52,59 ****
--- 53,62 ----
  #include	<stdio.h>
  #include	<errno.h>
  #include	<sys/types.h>
+ #ifndef MINIX
  #include	<sys/param.h>
  #include	<sys/uio.h>
+ #endif
  
  #include	"FSproto.h"
  #include	"clientstr.h"
***************
*** 205,214 ****
  	result = _FontTransRead(oc->trans_conn, oci->buffer + oci->bufcnt,
  		      oci->size - oci->bufcnt);
  	if (result <= 0) {
  	    if ((result < 0) && ETEST(errno)) {
  		yield_control_no_input();
  		return 0;
! 	    } else {
  		yield_control_death();
  		return -1;
  	    }
--- 208,221 ----
  	result = _FontTransRead(oc->trans_conn, oci->buffer + oci->bufcnt,
  		      oci->size - oci->bufcnt);
  	if (result <= 0) {
+ #if !(defined(SVR4) && defined(i386) && !defined(sun))
  	    if ((result < 0) && ETEST(errno)) {
  		yield_control_no_input();
  		return 0;
! 	    } else
! #endif
! 	    {
! 
  		yield_control_death();
  		return -1;
  	    }
diff -c xc/programs/xfs/os/osglue.c:1.1.1.1 xc/programs/xfs/os/osglue.c:3.0
*** xc/programs/xfs/os/osglue.c:1.1.1.1	Mon Jan 30 17:44:43 1995
--- xc/programs/xfs/os/osglue.c	Mon Jan 30 17:44:43 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: osglue.c,v 1.10 94/04/17 19:56:07 dpw Exp $ */
+ /* $XFree86: xc/programs/xfs/os/osglue.c,v 3.0 1994/10/20 06:15:34 dawes Exp $ */
  /*
  Copyright (c) 1987  X Consortium
  
***************
*** 60,65 ****
--- 61,69 ----
  #include <stdio.h>
  #define  XK_LATIN1
  #include <X11/keysymdef.h>
+ #ifdef __EMX__
+ #define _NFILE NOFILE
+ #endif
  
  Bool        drone_server = FALSE;
  extern Bool CloneSelf;
***************
*** 302,308 ****
  
      old_listen_arg[0] = '\0';
  
! #if defined(hpux) || defined(SVR4)
      lastfdesc = _NFILE - 1;
  #else
      lastfdesc = getdtablesize() - 1;
--- 306,312 ----
  
      old_listen_arg[0] = '\0';
  
! #if defined(hpux) || defined(SVR4) || defined(__EMX__)
      lastfdesc = _NFILE - 1;
  #else
      lastfdesc = getdtablesize() - 1;
diff -c xc/programs/xfs/os/waitfor.c:1.1.1.1 xc/programs/xfs/os/waitfor.c:3.1
*** xc/programs/xfs/os/waitfor.c:1.1.1.1	Mon Jan 30 17:44:44 1995
--- xc/programs/xfs/os/waitfor.c	Mon Jan 30 17:44:44 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: waitfor.c,v 1.13 94/04/17 19:56:09 dpw Exp $ */
+ /* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.1 1994/11/26 12:49:46 dawes Exp $ */
  /*
   * waits for input
   */
***************
*** 56,66 ****
--- 57,74 ----
  
  #include	<stdio.h>
  #include	<errno.h>
+ #ifndef MINIX
  #include	<sys/param.h>
+ #endif
  
  #include	"clientstr.h"
  #include	"globals.h"
  #include	"osdep.h"
+ 
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
  
  extern WorkQueuePtr workQueue;
  
diff -c xc/programs/xhost/xhost.c:1.1.1.1 xc/programs/xhost/xhost.c:3.0
*** xc/programs/xhost/xhost.c:1.1.1.1	Mon Jan 30 17:44:45 1995
--- xc/programs/xhost/xhost.c	Mon Jan 30 17:44:45 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xhost.c,v 11.62 94/04/17 20:23:18 rws Exp $ */
+ /* $XFree86: xc/programs/xhost/xhost.c,v 3.0 1994/04/28 12:45:28 dawes Exp $ */
  /*
  
  Copyright (c) 1985, 1986, 1987  X Consortium
***************
*** 29,35 ****
  
  */
  
! #if defined(TCPCONN) || defined(STREAMSCONN)
  #define NEEDSOCKETS
  #endif
  #ifdef UNIXCONN
--- 30,36 ----
  
  */
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
  #define NEEDSOCKETS
  #endif
  #ifdef UNIXCONN
***************
*** 60,68 ****
--- 61,77 ----
  #include <interlan/netdb.h>
  #include <interlan/in.h>
  #else
+ #ifndef AMOEBA
  #include <sys/socket.h>
  #include <netdb.h>
  #include <netinet/in.h>
+ #else
+ #include <server/ip/gen/socket.h>
+ #include <server/ip/types.h>
+ #include <server/ip/gen/in.h>
+ #include <server/ip/gen/inet.h>
+ #include <server/ip/gen/netdb.h>
+ #endif
  #endif
  #endif /* NEEDSOCKETS */
  
***************
*** 288,294 ****
--- 297,307 ----
      krb5_data kbuf;
  #endif
  #ifdef NEEDSOCKETS
+ #ifndef AMTCPCONN
      static struct in_addr addr;	/* so we can point at it */
+ #else
+     static ipaddr_t addr;
+ #endif
  #endif
      char *cp;
  #ifdef DNETCONN
***************
*** 308,314 ****
  	lname[i] = tolower(name[i]);
      }
      if (!strncmp("inet:", lname, 5)) {
! #if defined(TCPCONN) || defined(STREAMSCONN)
  	family = FamilyInternet;
  	name += 5;
  #else
--- 321,327 ----
  	lname[i] = tolower(name[i]);
      }
      if (!strncmp("inet:", lname, 5)) {
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
  	family = FamilyInternet;
  	name += 5;
  #else
***************
*** 462,468 ****
--- 475,485 ----
      /*
       * First see if inet_addr() can grok the name; if so, then use it.
       */
+ #ifndef AMTCPCONN
      if ((addr.s_addr = inet_addr(name)) != -1) {
+ #else
+     if ((addr = inet_addr(name)) != -1) {
+ #endif
  	ha.family = FamilyInternet;
  	ha.length = 4;		/* but for Cray would be sizeof(addr.s_addr) */
  	ha.address = (char *)&addr; /* but for Cray would be &addr.s_addr */
***************
*** 526,532 ****
  static char *get_hostname (ha)
      XHostAddress *ha;
  {
! #if defined(TCPCONN) || defined(STREAMSCONN)
      struct hostent *hp = NULL;
      char *inet_ntoa();
  #endif
--- 543,549 ----
  static char *get_hostname (ha)
      XHostAddress *ha;
  {
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
      struct hostent *hp = NULL;
      char *inet_ntoa();
  #endif
***************
*** 541,547 ****
      static char kname_out[255];
  #endif
  
! #if defined(TCPCONN) || defined(STREAMSCONN)
      if (ha->family == FamilyInternet) {
  #ifdef CRAY
  	struct in_addr t_addr;
--- 558,564 ----
      static char kname_out[255];
  #endif
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
      if (ha->family == FamilyInternet) {
  #ifdef CRAY
  	struct in_addr t_addr;
***************
*** 563,569 ****
--- 580,590 ----
  	alarm(0);
  	if (hp)
  	    return (hp->h_name);
+ #ifndef AMTCPCONN
  	else return (inet_ntoa(*((struct in_addr *)(ha->address))));
+ #else
+ 	else return (inet_ntoa(*((ipaddr_t *)(ha->address))));
+ #endif
      }
  #endif
      if (ha->family == FamilyNetname) {
diff -c xc/programs/xieperf/events.c:1.1.1.1 xc/programs/xieperf/events.c:3.1
*** xc/programs/xieperf/events.c:1.1.1.1	Mon Jan 30 17:44:49 1995
--- xc/programs/xieperf/events.c	Mon Jan 30 17:44:49 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: events.c,v 1.11 94/04/17 20:39:17 rws Exp $ */
+ /* $XFree86: xc/programs/xieperf/events.c,v 3.1 1994/05/08 05:26:29 dawes Exp $ */
  /**** module events.c ****/
  /******************************************************************************
  
***************
*** 94,99 ****
--- 95,105 ----
  #undef BOOL
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  static XieExtensionInfo *xieInfo=NULL;
  static int timeout = 60;        /* in seconds */
  
***************
*** 220,225 ****
--- 226,232 ----
  			tv.tv_sec = delta;  
  			tv.tv_usec = 0L;
  			XFlush( xp->d );
+ #ifndef AMOEBA
  #ifdef WIN32
  			FD_ZERO(&rd);
  			FD_SET(Xsocket, &rd);
***************
*** 227,232 ****
--- 234,243 ----
  			rd = 1 << Xsocket;
  #endif
  			select( Xsocket + 1, ( int * ) &rd, ( int * ) NULL, ( int * ) NULL, &tv );
+ #else  /* AMOEBA */
+ 			(void) _X11TransAmSelect(ConnectionNumber(xp->d),
+ 						 delta * 1000);
+ #endif /* AMOEBA */
  			continue;
  		}	
  		xie_event = event.type - xieInfo->first_event;
diff -c xc/programs/xinit/Imakefile:1.1.1.1 xc/programs/xinit/Imakefile:3.1
*** xc/programs/xinit/Imakefile:1.1.1.1	Mon Jan 30 17:44:53 1995
--- xc/programs/xinit/Imakefile	Mon Jan 30 17:44:53 1995
***************
*** 1,9 ****
  XCOMM $XConsortium: Imakefile,v 1.24 93/09/21 17:58:25 kaleb Exp $
  #if HasVFork
    VFORK_DEFINES = -DHAS_VFORK
  #endif
          DEFINES = ConnectionFlags $(VFORK_DEFINES) $(SIGNAL_DEFINES) \
! 			-DBINDIR=\"$(BINDIR)\"
          DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
  LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
            SRCS1 = xinit.c 
--- 1,13 ----
  XCOMM $XConsortium: Imakefile,v 1.24 93/09/21 17:58:25 kaleb Exp $
+ XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.1 1994/05/22 00:02:27 dawes Exp $
  #if HasVFork
    VFORK_DEFINES = -DHAS_VFORK
  #endif
+ #ifdef XFree86Version
+         OS_DEFS = -DXFREE86
+ #endif
          DEFINES = ConnectionFlags $(VFORK_DEFINES) $(SIGNAL_DEFINES) \
! 			-DBINDIR=\"$(BINDIR)\" $(OS_DEFS)
          DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
  LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
            SRCS1 = xinit.c 
***************
*** 15,21 ****
--- 19,30 ----
  ComplexProgramTarget_1(xinit,$(LOCAL_LIBRARIES),NullParameter)
  
  MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR))
+ 
+ #ifdef i386ScoArchitecture
+ MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DBINDIR=$(BINDIR))
+ #else
  MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR))
+ #endif
  
  InstallNamedProg(startx,startx,$(BINDIR))
  InstallManPage(startx,$(MANDIR))
diff -c xc/programs/xinit/startx.cpp:1.1.1.1 xc/programs/xinit/startx.cpp:3.0
*** xc/programs/xinit/startx.cpp:1.1.1.1	Mon Jan 30 17:44:53 1995
--- xc/programs/xinit/startx.cpp	Mon Jan 30 17:44:53 1995
***************
*** 1,6 ****
--- 1,7 ----
  XCOMM!/bin/sh
  
  XCOMM $XConsortium: startx.cpp,v 1.4 91/08/22 11:41:29 rws Exp $
+ XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.0 1994/05/22 00:02:28 dawes Exp $
  XCOMM 
  XCOMM This is just a sample implementation of a slightly less primitive 
  XCOMM interface than xinit.  It looks for user .xinitrc and .xserverrc
***************
*** 12,17 ****
--- 13,54 ----
  XCOMM Site administrators are STRONGLY urged to write nicer versions.
  XCOMM 
  
+ #ifdef SCO
+ 
+ XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.
+ XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin
+ XCOMM and people may use X without changing their PATH
+ 
+ XCOMM First our compiled path
+ 
+ bindir=BINDIR
+ if expr $PATH : ".*`echo $bindir | sed 's?/?\\/?g'`.*" > /dev/null 2>&1; then
+ 	:
+ else
+ 	PATH=$PATH:BINDIR
+ fi
+ 
+ XCOMM Now the "SCO" compiled path
+ 
+ if expr $PATH : '.*\/usr\/bin\/X11.*' > /dev/null 2>&1; then
+ 	:
+ else
+ 	PATH=$PATH:/usr/bin/X11
+ fi
+ 
+ XCOMM Set up the XMERGE env var so that dos merge is happy under X
+ 
+ if [ -f /usr/lib/merge/xmergeset.sh ]; then
+ 	. /usr/lib/merge/xmergeset.sh
+ else if [ -f /usr/lib/merge/console.disp ]; then
+ 	XMERGE=`cat /usr/lib/merge/console.disp`
+ 	export XMERGE
+ fi
+ fi
+ 
+ scoclientrc=$HOME/.startxrc
+ #endif
+ 
  userclientrc=$HOME/.xinitrc
  userserverrc=$HOME/.xserverrc
  sysclientrc=XINITDIR/xinitrc
***************
*** 19,24 ****
--- 56,66 ----
  clientargs=""
  serverargs=""
  
+ #ifdef SCO
+ if [ -f $scoclientrc ]; then
+     clientargs=$scoclientrc
+ else
+ #endif
  if [ -f $userclientrc ]; then
      clientargs=$userclientrc
  else if [ -f $sysclientrc ]; then
***************
*** 25,30 ****
--- 67,75 ----
      clientargs=$sysclientrc
  fi
  fi
+ #ifdef SCO
+ fi
+ #endif
  
  if [ -f $userserverrc ]; then
      serverargs=$userserverrc
diff -c xc/programs/xinit/xinit.c:1.1.1.2 xc/programs/xinit/xinit.c:3.5
*** xc/programs/xinit/xinit.c:1.1.1.2	Mon Jan 30 17:44:54 1995
--- xc/programs/xinit/xinit.c	Mon Jan 30 17:44:54 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xinit.c,v 11.61 95/01/09 21:20:29 kaleb Exp $ */
+ /* $XFree86: xc/programs/xinit/xinit.c,v 3.5 1995/01/28 16:17:13 dawes Exp $ */
  
  /*
  
***************
*** 47,52 ****
--- 48,60 ----
  extern char **environ;
  char **newenviron = NULL;
  
+ #ifdef __EMX__
+ #define setpgid(a,b)
+ #define setuid(a)
+ #define setgid(a)
+ 
+ #endif
+ 
  #ifndef SHELL
  #define SHELL "sh"
  #endif
***************
*** 125,131 ****
  char *program;
  Display *xd;			/* server connection */
  #ifndef SYSV
! #if defined(SVR4) || defined(_POSIX_SOURCE) || defined(CSRG_BASED)
  int status;
  #else
  union wait	status;
--- 133,139 ----
  char *program;
  Display *xd;			/* server connection */
  #ifndef SYSV
! #if defined(SVR4) || defined(_POSIX_SOURCE) || defined(CSRG_BASED) || defined(__EMX__)
  int status;
  #else
  union wait	status;
***************
*** 384,390 ****
  	static char	*laststring;
  
  	for (;;) {
! #ifdef SYSV
  		alarm(1);
  		if ((pidfound = wait(NULL)) == serverpid)
  			break;
--- 392,398 ----
  	static char	*laststring;
  
  	for (;;) {
! #if defined(SYSV) || defined(__EMX__)
  		alarm(1);
  		if ((pidfound = wait(NULL)) == serverpid)
  			break;
***************
*** 440,446 ****
--- 448,456 ----
  		 * prevent server from getting sighup from vhangup()
  		 * if client is xterm -L
  		 */
+ #ifndef __EMX__
  		setpgrp(0,getpid());
+ #endif
  
  		Execute (server);
  		Error ("no server \"%s\" in PATH\n", server[0]);
***************
*** 633,638 ****
  	char	*fmt;
  {
  	fprintf(stderr, "%s:  ", program);
! 	fprintf (stderr, "%s (errno %d):  ", strerror(errno), errno);
  	fprintf(stderr, fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9);
  }
--- 643,649 ----
  	char	*fmt;
  {
  	fprintf(stderr, "%s:  ", program);
! 	if (errno > 0)
! 	  fprintf (stderr, "%s (errno %d):  ", strerror(errno), errno);
  	fprintf(stderr, fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9);
  }
diff -c xc/programs/xkbcomp/xkbparse.y:1.1.1.1 xc/programs/xkbcomp/xkbparse.y:3.0
*** xc/programs/xkbcomp/xkbparse.y:1.1.1.1	Mon Jan 30 17:44:57 1995
--- xc/programs/xkbcomp/xkbparse.y	Mon Jan 30 17:44:57 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xkbparse.y,v 1.3 94/04/08 15:30:22 erik Exp $ */
+ /* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.0 1995/01/26 04:33:43 dawes Exp $ */
  /************************************************************
   Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
  
***************
*** 356,363 ****
  			{ $$= (ExprDef *)AppendStmt(&$1->common,&$3->common); }
  		|	Expr
  			{ $$= $1; }
- 		;
- 
  		;
  
  Expr		:	Expr DIVIDE Expr
--- 357,362 ----
diff -c xc/programs/xlogo/xlogo.c:1.1.1.1 xc/programs/xlogo/xlogo.c:3.0
*** xc/programs/xlogo/xlogo.c:1.1.1.1	Mon Jan 30 17:45:10 1995
--- xc/programs/xlogo/xlogo.c	Mon Jan 30 17:45:10 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: xlogo.c,v 1.20 94/04/17 20:24:10 converse Exp $
+  * $XFree86: xc/programs/xlogo/xlogo.c,v 3.0 1994/06/28 12:33:21 dawes Exp $
   *
  Copyright (c) 1989  X Consortium
  
***************
*** 145,147 ****
--- 146,155 ----
  	die(w, NULL, NULL);
      }
  }
+ 
+ #ifdef MINIX
+ SmcCloseStatus SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
+ {
+ 	return SmcClosedNow;
+ }
+ #endif
diff -c xc/programs/xmag/Scale.c:1.1.1.2 xc/programs/xmag/Scale.c:3.2
*** xc/programs/xmag/Scale.c:1.1.1.2	Mon Jan 30 17:45:15 1995
--- xc/programs/xmag/Scale.c	Mon Jan 30 17:45:15 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Scale.c,v 1.20 95/01/05 19:49:01 kaleb Exp $ */
+ /* $XFree86: xc/programs/xmag/Scale.c,v 3.2 1995/01/28 16:17:27 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
diff -c xc/programs/xmh/command.c:1.1.1.2 xc/programs/xmh/command.c:3.2
*** xc/programs/xmh/command.c:1.1.1.2	Mon Jan 30 17:45:18 1995
--- xc/programs/xmh/command.c	Mon Jan 30 17:45:19 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: command.c,v 2.47 94/05/14 19:10:18 rws Exp $ */
+ /* $XFree86: xc/programs/xmh/command.c,v 3.2 1994/06/28 12:33:31 dawes Exp $ */
  
  /*
   *			  COPYRIGHT 1987, 1989
***************
*** 42,47 ****
--- 43,58 ----
  #endif
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ 
+ typedef struct
+ {
+ 	long fds_bits[2];
+ } fd_set;
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  /* number of user input events to queue before malloc */
  #define TYPEAHEADSIZE 20
  
***************
*** 85,95 ****
  static void SystemError(text)
      char* text;
  {
-     extern int sys_nerr;
-     extern char* sys_errlist[];
      char msg[BUFSIZ];
!     sprintf( msg, "%s; errno = %d %s", text, errno, 
! 	     (errno < sys_nerr) ? sys_errlist[errno] : NULL );
      XtWarning( msg );
  }
  
--- 96,103 ----
  static void SystemError(text)
      char* text;
  {
      char msg[BUFSIZ];
!     sprintf( msg, "%s; errno = %d %s", text, errno, strerror(errno));
      XtWarning( msg );
  }
  
diff -c xc/programs/xmh/miscfuncs.c:1.1.1.2 xc/programs/xmh/miscfuncs.c:3.1
*** xc/programs/xmh/miscfuncs.c:1.1.1.2	Mon Jan 30 17:45:19 1995
--- xc/programs/xmh/miscfuncs.c	Mon Jan 30 17:45:19 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */
+ /* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.1 1995/01/28 16:17:33 dawes Exp $ */
  
  #include <X11/Xos.h>
  
***************
*** 24,30 ****
  
  
  
! #if defined(SYSV) && (defined(i386) || defined(MOTOROLA))
  
  /* These systems don't have the ftruncate() system call, so we emulate it.
   * This emulation can only shorten, not lengthen.
--- 25,31 ----
  
  
  
! #if defined(SYSV) && (defined(i386) || defined(MOTOROLA)) || defined(MINIX)
  
  /* These systems don't have the ftruncate() system call, so we emulate it.
   * This emulation can only shorten, not lengthen.
diff -c xc/programs/xmh/toc.c:1.1.1.2 xc/programs/xmh/toc.c:3.1
*** xc/programs/xmh/toc.c:1.1.1.2	Mon Jan 30 17:45:20 1995
--- xc/programs/xmh/toc.c	Mon Jan 30 17:45:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: toc.c,v 2.59 95/01/09 16:52:53 swick Exp $
+  * $XFree86: xc/programs/xmh/toc.c,v 3.1 1995/01/27 04:55:00 dawes Exp $
   *
   *
   *			  COPYRIGHT 1987
***************
*** 31,36 ****
--- 32,41 ----
  #include "toc.h"
  #include "tocutil.h"
  #include <sys/stat.h>
+ 
+ #ifdef MINIX
+ #define S_IWRITE S_IWUSR
+ #endif
  
  static int IsDir(name)
  char *name;
diff -c xc/programs/xmh/tocutil.c:1.1.1.2 xc/programs/xmh/tocutil.c:3.1
*** xc/programs/xmh/tocutil.c:1.1.1.2	Mon Jan 30 17:45:20 1995
--- xc/programs/xmh/tocutil.c	Mon Jan 30 17:45:21 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: tocutil.c,v 2.60 95/01/09 16:52:53 swick Exp $
+  * $XFree86: xc/programs/xmh/tocutil.c,v 3.1 1995/01/27 04:55:04 dawes Exp $
   *
   *
   *			COPYRIGHT 1987, 1989
***************
*** 501,507 ****
      if (fid < 0 && toc->length != toc->origlength)
  	fid = myopen(toc->scanfile, O_RDWR, 0666);
      if (fid >= 0) {
! #if defined(SYSV) && (defined(i386) || defined(MOTOROLA))
  	(void) ftruncate_emu(fid, toc->length, toc->scanfile);
  #else
  	(void) ftruncate(fid, toc->length);
--- 502,508 ----
      if (fid < 0 && toc->length != toc->origlength)
  	fid = myopen(toc->scanfile, O_RDWR, 0666);
      if (fid >= 0) {
! #if defined(SYSV) && (defined(i386) || defined(MOTOROLA)) || defined(MINIX)
  	(void) ftruncate_emu(fid, toc->length, toc->scanfile);
  #else
  	(void) ftruncate(fid, toc->length);
diff -c xc/programs/xmh/util.c:1.1.1.1 xc/programs/xmh/util.c:3.1
*** xc/programs/xmh/util.c:1.1.1.1	Mon Jan 30 17:45:21 1995
--- xc/programs/xmh/util.c	Mon Jan 30 17:45:21 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: util.c,v 2.44 94/03/30 19:55:04 gildea Exp $
+  * $XFree86: xc/programs/xmh/util.c,v 3.1 1994/09/22 16:38:39 dawes Exp $
   *
   *
   *			  COPYRIGHT 1987
***************
*** 32,37 ****
--- 33,39 ----
  #include <errno.h>
  #include <ctype.h>
  #include <X11/cursorfont.h>
+ #include <X11/Xos.h>
  
  #ifndef abs
  #define abs(x)		((x) < 0 ? (-(x)) : (x))
***************
*** 40,50 ****
  static char *SysErrorMsg (n)
      int n;
  {
!     extern char *sys_errlist[];
!     extern int sys_nerr;
!     char *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
! 
!     return (s ? s : "no such error");
  }
  
  /* Something went wrong; panic and quit. */
--- 42,48 ----
  static char *SysErrorMsg (n)
      int n;
  {
! 	return strerror(n);
  }
  
  /* Something went wrong; panic and quit. */
diff -c xc/programs/xrdb/Imakefile:1.1.1.1 xc/programs/xrdb/Imakefile:3.1
*** xc/programs/xrdb/Imakefile:1.1.1.1	Mon Jan 30 17:45:24 1995
--- xc/programs/xrdb/Imakefile	Mon Jan 30 17:45:24 1995
***************
*** 1,8 ****
--- 1,14 ----
  XCOMM $XConsortium: Imakefile,v 1.8 92/09/14 18:53:12 rws Exp $
+ XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.1 1994/12/17 10:10:44 dawes Exp $
  #if PatheticCpp
          CPPDEFS = -DPATHETICCPP
  #endif
+ XCOMM Due to ill make parsing the cpp is passed directly in source file
+ #ifdef OS2Architecture
+         DEFINES = $(CPPDEFS)
+ #else
          DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
+ #endif
          DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
  LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
  
diff -c xc/programs/xrdb/xrdb.c:1.1.1.1 xc/programs/xrdb/xrdb.c:3.0
*** xc/programs/xrdb/xrdb.c:1.1.1.1	Mon Jan 30 17:45:25 1995
--- xc/programs/xrdb/xrdb.c	Mon Jan 30 17:45:25 1995
***************
*** 2,7 ****
--- 2,8 ----
   * xrdb - X resource manager database utility
   *
   * $XConsortium: xrdb.c,v 11.75 94/03/27 14:42:02 rws Exp $
+  * $XFree86: xc/programs/xrdb/xrdb.c,v 3.0 1994/12/17 10:10:46 dawes Exp $
   */
  
  /*
***************
*** 46,53 ****
  #include <X11/Xos.h>
  #include <stdio.h>
  #include <ctype.h>
  
! #ifdef X_NOT_STDC_ENV
  extern int errno;
  #endif
  
--- 47,55 ----
  #include <X11/Xos.h>
  #include <stdio.h>
  #include <ctype.h>
+ #include <errno.h>	/* hv: for OS/2, shouldn't declare errno explicitly */
  
! #if !defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  extern int errno;
  #endif
  
***************
*** 59,65 ****
--- 61,72 ----
  #define SCREEN_RESOURCES "SCREEN_RESOURCES"
  
  #ifndef CPP
+ #ifdef __EMX__
+ /* expected to be in path */
+ #define CPP "cpp"
+ #else
  #define CPP "/usr/lib/cpp"
+ #endif /* __EMX__ */
  #endif /* CPP */
  
  #define INIT_BUFFER_SIZE 10000
***************
*** 1255,1266 ****
      int x1, x2, x3, x4, x5, x6;
  #endif
  {
-     extern int errno;
  #if NeedVarargsPrototypes
      va_list args;
  #endif
  
!     if (errno)
  	perror(ProgramName);
  #if NeedVarargsPrototypes
      va_start(args, msg);
--- 1262,1272 ----
      int x1, x2, x3, x4, x5, x6;
  #endif
  {
  #if NeedVarargsPrototypes
      va_list args;
  #endif
  
!     if (errno != 0)
  	perror(ProgramName);
  #if NeedVarargsPrototypes
      va_start(args, msg);
diff -c xc/programs/xterm/Imakefile:1.1.1.1 xc/programs/xterm/Imakefile:3.2
*** xc/programs/xterm/Imakefile:1.1.1.1	Mon Jan 30 17:45:31 1995
--- xc/programs/xterm/Imakefile	Mon Jan 30 17:45:32 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.62 94/04/10 16:02:56 rws Exp $
+ XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.2 1995/01/21 07:20:51 dawes Exp $
  XCOMM
  XCOMM                         Attention xterm porters
  XCOMM
***************
*** 20,39 ****
           PTYLIB = -lpucc
  #endif
  
   OSMAJORVERSION = OSMajorVersion
   OSMINORVERSION = OSMinorVersion
  
!    MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
  		  -DOSMAJORVERSION=$(OSMAJORVERSION) \
  		  -DOSMINORVERSION=$(OSMINORVERSION)
     MISC_DEFINES = /* -DALLOWLOGFILEEXEC */
  
            SRCS1 = button.c charproc.c cursor.c data.c input.c \
  		  main.c menu.c misc.c screen.c scrollbar.c tabs.c \
! 		  TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
            OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
  		  screen.o scrollbar.o button.o Tekproc.o misc.o \
! 		  VTPrsTbl.o TekPrsTbl.o data.o menu.o
            SRCS2 = resize.c
            OBJS2 = resize.o
             SRCS = $(SRCS1) $(SRCS2)
--- 21,51 ----
           PTYLIB = -lpucc
  #endif
  
+ #if XtermWithI18N
+         I18NDEF = -DI18N
+ #endif
+ 
   OSMAJORVERSION = OSMajorVersion
   OSMINORVERSION = OSMinorVersion
  
! #ifndef AmoebaArchitecture
!         UTMPDEF = -DUTMP
! #else
!         EXTRASRC = ttysvr.c
!         EXTRAOBJ = ttysvr.o
! #endif
!    MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) \
  		  -DOSMAJORVERSION=$(OSMAJORVERSION) \
  		  -DOSMINORVERSION=$(OSMINORVERSION)
     MISC_DEFINES = /* -DALLOWLOGFILEEXEC */
+         DEFINES = $(I18NDEF)
  
            SRCS1 = button.c charproc.c cursor.c data.c input.c \
  		  main.c menu.c misc.c screen.c scrollbar.c tabs.c \
! 		  TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c $(EXTRASRC)
            OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
  		  screen.o scrollbar.o button.o Tekproc.o misc.o \
! 		  VTPrsTbl.o TekPrsTbl.o data.o menu.o $(EXTRAOBJ)
            SRCS2 = resize.c
            OBJS2 = resize.o
             SRCS = $(SRCS1) $(SRCS2)
diff -c xc/programs/xterm/Tekproc.c:1.1.1.1 xc/programs/xterm/Tekproc.c:3.1
*** xc/programs/xterm/Tekproc.c:1.1.1.1	Mon Jan 30 17:45:32 1995
--- xc/programs/xterm/Tekproc.c	Mon Jan 30 17:45:33 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Tekproc.c,v 1.115 94/04/17 20:23:23 rws Exp $
+  * $XFree86: xc/programs/xterm/Tekproc.c,v 3.1 1994/05/08 05:26:51 dawes Exp $
   *
   * Warning, there be crufty dragons here.
   */
***************
*** 80,85 ****
--- 81,94 ----
  #define Time_t time_t
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ 
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #define read(f,b,s) nbio_read(f,b,s)
+ #define write(f,b,s) nbio_write(f,b,s)
+ #endif
+ 
  /*
   * Check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
   * systems are broken and return EWOULDBLOCK when they should return EAGAIN.
***************
*** 705,716 ****
--- 714,738 ----
  			(void) select (max_plus1, &Tselect_mask, (int *) NULL,
  				       (int *) NULL, &crocktimeout);
  #endif
+ #ifndef AMOEBA
  			if(Tselect_mask & pty_mask) {
+ #else
+ 			/* XXX resolve polling since it wastes CPU cycles */
+ 			if ((Tbcnt = cb_full(screen->tty_outq)) > 0) {
+ #endif /* AMOEBA */
  #ifdef ALLOWLOGGING
  				if(screen->logging)
  					FlushLog(screen);
  #endif
+ #ifndef AMOEBA
  				Tbcnt = read(screen->respond, (char *)(Tbptr = Tbuffer), BUF_SIZE);
+ #else
+ 				Tbptr = Tbuffer;
+ 				if ((Tbcnt = cb_gets(screen->tty_outq, Tbptr, Tbcnt, BUF_SIZE)) == 0) {
+ 					errno = EIO;
+ 					Tbcnt = -1;
+ 				}
+ #endif /* AMOEBA */
  				if(Tbcnt < 0) {
  					if(errno == EIO)
  						Cleanup (0);
***************
*** 719,725 ****
--- 741,751 ----
  				 "Tinput:read returned unexpected error (%d)\n",
  						 errno);
  				} else if(Tbcnt == 0)
+ #ifdef MINIX
+ 					Cleanup (0);
+ #else
  					Panic("input: read returned zero\n", 0);
+ #endif
  				else {
  				    if (!screen->output_eight_bits) {
  					register int bc = Tbcnt;
***************
*** 736,741 ****
--- 762,768 ----
  				TCursorToggle(TOGGLE);
  				Ttoggled = FALSE;
  			}
+ #ifndef AMOEBA
  			if(QLength(screen->display))
  				Tselect_mask = X_mask;
  			else {
***************
*** 749,754 ****
--- 776,800 ----
  					continue;
  				}
  			}
+ #else
+ 			XFlush(screen->display);
+ 			i = _X11TransAmSelect(ConnectionNumber(screen->display),
+ 					      1);
+ 			/* if there are X events already in our queue,
+                            it counts as being readable */
+ 			if (QLength(screen->display) || i > 0) {
+ 				xevents();
+ 				continue;
+ 			} else if (i < 0) {
+ 				extern int exiting;
+ 				if (errno != EINTR && !exiting)
+ 					SysError(ERROR_SELECT);
+ 			}
+ 			if (Tbcnt > 0)
+ 				goto again;
+ 			if (cb_full(screen->tty_outq) <= 0)
+ 				SleepMainThread();
+ #endif /* AMOEBA */
  			if(Tselect_mask & X_mask) {
  				xevents();
  				if(Tbcnt > 0)
diff -c xc/programs/xterm/button.c:1.1.1.1 xc/programs/xterm/button.c:3.0
*** xc/programs/xterm/button.c:1.1.1.1	Mon Jan 30 17:45:33 1995
--- xc/programs/xterm/button.c	Mon Jan 30 17:45:34 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: button.c,v 1.69 94/04/02 12:41:50 gildea Exp $ */
+ /* $XFree86: xc/programs/xterm/button.c,v 3.0 1994/05/08 05:26:54 dawes Exp $ */
  /*
   * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
   *
***************
*** 32,37 ****
--- 33,42 ----
  #include "ptyx.h"		/* Xlib headers included here. */
  #include <X11/Xatom.h>
  #include <stdio.h>
+ 
+ #ifdef MINIX
+ #include <X11/Xos.h>
+ #endif
  
  #include <X11/Xmu/Atoms.h>
  #include <X11/Xmu/StdSel.h>
diff -c xc/programs/xterm/charproc.c:1.1.1.2 xc/programs/xterm/charproc.c:3.4
*** xc/programs/xterm/charproc.c:1.1.1.2	Mon Jan 30 17:45:35 1995
--- xc/programs/xterm/charproc.c	Mon Jan 30 17:45:35 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: charproc.c,v 1.182 94/08/10 21:53:24 gildea Exp $
+  * $XFree86: xc/programs/xterm/charproc.c,v 3.4 1995/01/21 07:20:54 dawes Exp $
   */
  
  /*
***************
*** 67,77 ****
--- 68,89 ----
  #include <X11/Xmu/Atoms.h>
  #include <X11/Xmu/CharSet.h>
  #include <X11/Xmu/Converters.h>
+ #ifdef I18N
+ #include <X11/Xaw/XawImP.h>
+ #endif
  #include <stdio.h>
  #include <errno.h>
  #include <setjmp.h>
  #include <ctype.h>
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ 
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #define read(f,b,s) nbio_read(f,b,s)
+ #define write(f,b,s) nbio_write(f,b,s)
+ #endif
+ 
  /*
   * Check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
   * systems are broken and return EWOULDBLOCK when they should return EAGAIN.
***************
*** 517,522 ****
--- 529,545 ----
  {"font6", "Font6", XtRString, sizeof(String),
  	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font6]),
  	XtRString, (XtPointer) NULL},
+ #ifdef I18N
+   {XtNinputMethod, XtCInputMethod, XtRString, sizeof(char*),
+                 XtOffsetOf(XtermWidgetRec, misc.input_method),
+                 XtRString, (XtPointer)NULL},
+   {XtNpreeditType, XtCPreeditType, XtRString, sizeof(char*),
+                 XtOffsetOf(XtermWidgetRec, misc.preedit_type),
+                 XtRString, (XtPointer)"Root"},
+   {XtNopenIm, XtCOpenIm, XtRBoolean, sizeof(Boolean),
+                 XtOffsetOf(XtermWidgetRec, misc.open_im),
+                 XtRImmediate, (XtPointer)TRUE},
+ #endif
  };
  
  static void VTClassInit();
***************
*** 526,531 ****
--- 549,557 ----
  static void VTResize();
  static void VTDestroy();
  static Boolean VTSetValues();
+ #ifdef I18N
+ static void VTInitI18N();
+ #endif
  
  static WidgetClassRec xtermClassRec = {
    {
***************
*** 1186,1193 ****
--- 1212,1224 ----
  	}
  #endif
  
+ #ifndef AMOEBA
  	if ((1 << f) != pty_mask)
  		return(write(f, d, len));
+ #else
+ 	if (term->screen.respond != f)
+ 		return(write(f, d, len));
+ #endif
  
  	/*
  	 * Append to the block we already have.
***************
*** 1260,1268 ****
--- 1291,1305 ----
  #define MAX_PTY_WRITE 128	/* 1/2 POSIX minimum MAX_INPUT */
  
  	if (v_bufptr > v_bufstr) {
+ #ifndef AMOEBA
  	    riten = write(f, v_bufstr, v_bufptr - v_bufstr <= MAX_PTY_WRITE ?
  			  	       v_bufptr - v_bufstr : MAX_PTY_WRITE);
  	    if (riten < 0) {
+ #else
+ 	    riten = v_bufptr - v_bufstr <= MAX_PTY_WRITE ?
+ 		    v_bufptr - v_bufstr : MAX_PTY_WRITE;
+ 	    if (cb_puts(term->screen.tty_inq, v_bufstr, riten) != 0) {
+ #endif /* AMOEBA */
  #ifdef DEBUG
  		if (debug) perror("write");
  #endif
***************
*** 1317,1330 ****
      static struct timeval select_timeout;
  
      for( ; ; ) {
  	if (select_mask & pty_mask && eventMode == NORMAL) {
  #ifdef ALLOWLOGGING
  	    if (screen->logging)
  		FlushLog(screen);
  #endif
  	    bcnt = read(screen->respond, (char *)(bptr = buffer), BUF_SIZE);
! 	    if (bcnt < 0) {
  		if (errno == EIO)
  		    Cleanup (0);
  		else if (!E_TEST(errno))
  		    Panic(
--- 1354,1388 ----
      static struct timeval select_timeout;
  
      for( ; ; ) {
+ #ifndef AMOEBA
  	if (select_mask & pty_mask && eventMode == NORMAL) {
+ #else
+ 	if ((bcnt = cb_full(screen->tty_outq)) > 0 && eventMode == NORMAL) {
+ #endif
  #ifdef ALLOWLOGGING
  	    if (screen->logging)
  		FlushLog(screen);
  #endif
+ #ifndef AMOEBA
  	    bcnt = read(screen->respond, (char *)(bptr = buffer), BUF_SIZE);
! #else
! 	    bptr = buffer;
! 	    if ((bcnt = cb_gets(screen->tty_outq, bptr, bcnt, BUF_SIZE)) == 0) {
! 		errno = EIO;
! 		bcnt = -1;
! 	    }
! #endif
! 	    if (bcnt <= 0) {
! /*
!  * Yes, I know this is a majorly f*ugly hack, however it seems to be
!  * necessary for Solaris x86.   DWH 11/15/94
!  * Dunno why though..
!  */
! #if defined(i386) && defined(SVR4) && defined(sun)
! 		if (errno == EIO || errno == 0 )
! #else
  		if (errno == EIO)
+ #endif
  		    Cleanup (0);
  		else if (!E_TEST(errno))
  		    Panic(
***************
*** 1331,1337 ****
--- 1389,1399 ----
  			  "input: read returned unexpected error (%d)\n",
  			  errno);
  	    } else if (bcnt == 0)
+ #ifdef MINIX
+ 		Cleanup(0);
+ #else
  		Panic("input: read returned zero\n", 0);
+ #endif
  	    else {
  		/* read from pty was successful */
  		if (!screen->output_eight_bits) {
***************
*** 1372,1377 ****
--- 1434,1440 ----
  
  	XFlush(screen->display); /* always flush writes before waiting */
  
+ #ifndef AMOEBA
  	/* Update the masks and, unless X events are already in the queue,
  	   wait for I/O to be possible. */
  	select_mask = Select_mask;
***************
*** 1397,1402 ****
--- 1460,1480 ----
  	if (QLength(screen->display) || (select_mask & X_mask)) {
  	    xevents();
  	}
+ #else  /* AMOEBA */
+ 	i = _X11TransAmSelect(ConnectionNumber(screen->display), 1);
+ 	/* if there are X events already in our queue,
+ 	   it counts as being readable */
+ 	if (QLength(screen->display) || i > 0) {
+ 	    xevents();
+ 	    continue;
+ 	} else if (i < 0) {
+ 	    extern int exiting;
+ 	    if (errno != EINTR && !exiting)
+ 		SysError(ERROR_SELECT);
+ 	}
+ 	if (cb_full(screen->tty_outq) <= 0)
+ 	    SleepMainThread();
+ #endif /* AMOENA */
  
      }
      bcnt--;
***************
*** 1996,2001 ****
--- 2074,2082 ----
  	register i = 1;
  	extern XtermWidget term;
  
+ #ifdef AMOEBA
+ 	if (ttypreprocess(c)) return;
+ #endif
  	if((buf[0] = c) == '\r' && (term->flags & LINEFEED)) {
  		buf[1] = '\n';
  		i++;
***************
*** 2471,2476 ****
--- 2552,2561 ----
  		InputOutput, CopyFromParent,	
  		*valuemask|CWBitGravity, values);
  
+ #ifdef I18N
+ 	VTInitI18N();
+ #endif
+ 
  	set_cursor_gcs (screen);
  
  	/* Reset variables used by ANSI emulation. */
***************
*** 2513,2518 ****
--- 2598,2726 ----
  	CursorSave (term, &screen->sc);
  	return;
  }
+ 
+ #ifdef I18N
+ 
+ static void VTInitI18N()
+ {
+     int		i,
+ 		ic_cnt = 0;
+     char       *p,
+ 	       *s,
+ 	       *ns,
+ 	       *end,
+ 		tmp[1024],
+ 	  	buf[32];
+     XIM		xim;
+     XIMStyles  *xim_styles;
+     XIMStyle	input_style;
+     Boolean	found;
+ 
+     term->screen.xic = NULL;
+ 
+     if (!term->misc.open_im) return;
+ 
+     if (term->misc.input_method) {
+ 	strcpy(tmp, term->misc.input_method);
+ 	for(s=tmp; *s;) {
+ 	    while (*s && isspace(*s)) s++;
+ 	    if (!*s) break;
+ 	    if (!(ns = end = index(s, ',')))
+ 		end = s + strlen(s);
+ 	    while (isspace(*end)) end--;
+ 	    *end = '\0';
+ 
+ 	    strcpy(buf, "@im=");
+ 	    strcat(buf, s);
+ 	    if ((p = XSetLocaleModifiers(buf)) != NULL && *p
+ 		&& (xim = XOpenIM(XtDisplay(term), NULL, NULL, NULL)) != NULL)
+ 		break;
+ 
+ 	    s = ns + 1;
+ 	}
+     } else {
+ 	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+ 	    xim = XOpenIM(XtDisplay(term), NULL, NULL, NULL);
+     }
+ 
+     if (xim == NULL && (p = XSetLocaleModifiers("")) != NULL && *p)
+ 	xim = XOpenIM(XtDisplay(term), NULL, NULL, NULL);
+     
+     if (!xim) {
+ 	fprintf(stderr, "Failed to open input method");
+ 	return;
+     }
+ 
+     if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
+         || !xim_styles) {
+ 	fprintf(stderr, "input method doesn't support any style\n");
+         XCloseIM(xim);
+         return;
+     }
+ 
+     found = False;
+     strcpy(tmp, term->misc.preedit_type);
+     for(s = tmp; s && !found;) {
+ 	while (*s && isspace(*s)) s++;
+ 	if (!*s) break;
+ 	if (ns = end = index(s, ','))
+ 	    ns++;
+ 	else
+ 	    end = s + strlen(s);
+ 	while (isspace(*end)) end--;
+ 	*end = '\0';
+ 
+ 	if (!strcmp(s, "OverTheSpot")) {
+ 	    input_style = (XIMPreeditPosition | XIMStatusArea);
+ 	} else if (!strcmp(s, "OffTheSpot")) {
+ 	    input_style = (XIMPreeditArea | XIMStatusArea);
+ 	} else if (!strcmp(s, "Root")) {
+ 	    input_style = (XIMPreeditNothing | XIMStatusNothing);
+ 	}
+ 	for (i = 0; (unsigned short)i < xim_styles->count_styles; i++)
+ 	    if (input_style == xim_styles->supported_styles[i]) {
+ 		found = True;
+ 		break;
+ 	    }
+ 
+ 	s = ns;
+     }
+     XFree(xim_styles);
+ 
+     if (!found) {
+ 	fprintf(stderr, "input method doesn't support my preedit type\n");
+ 	XCloseIM(xim);
+ 	return;
+     }
+ 
+     /*
+      * This program only understands the Root preedit_style yet
+      * Then misc.preedit_type should default to:
+      *		"OverTheSpot,OffTheSpot,Root"
+      *
+      *	/MaF
+      */
+     if (input_style != (XIMPreeditNothing | XIMStatusNothing)) {
+ 	fprintf(stderr,"This program only supports the 'Root' preedit type\n");
+ 	XCloseIM(xim);
+ 	return;
+     }
+ 
+     term->screen.xic = XCreateIC(xim, XNInputStyle, input_style,
+ 				      XNClientWindow, term->core.window,
+ 				      XNFocusWindow, term->core.window,
+ 				      NULL);
+ 
+     if (!term->screen.xic) {
+ 	fprintf(stderr,"Failed to create input context\n");
+ 	XCloseIM(xim);
+     }
+ 
+     return;
+ }
+ 
+ #endif
+ 
  
  static Boolean VTSetValues (cur, request, new, args, num_args)
      Widget cur, request, new;
diff -c xc/programs/xterm/input.c:1.1.1.2 xc/programs/xterm/input.c:3.1
*** xc/programs/xterm/input.c:1.1.1.2	Mon Jan 30 17:45:37 1995
--- xc/programs/xterm/input.c	Mon Jan 30 17:45:37 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   *	$XConsortium: input.c,v 1.18 94/05/14 15:53:34 gildea Exp $
+  *	$XFree86: xc/programs/xterm/input.c,v 3.1 1995/01/21 13:19:18 dawes Exp $
   */
  
  /*
***************
*** 70,76 ****
--- 71,81 ----
      Bool eightbit;
  {
  
+ #ifdef I18N
+ #define STRBUFSIZE 500
+ #else
  #define STRBUFSIZE 100
+ #endif
  
  	char strbuf[STRBUFSIZE];
  	register char *string;
***************
*** 77,87 ****
  	register int key = FALSE;
  	int	pty	= screen->respond;
  	int	nbytes;
! 	KeySym  keysym;
  	ANSI	reply;
! 
  	nbytes = XLookupString (event, strbuf, STRBUFSIZE,
  				&keysym, &compose_status);
  
  	string = &strbuf[0];
  	reply.a_pintro = 0;
--- 82,104 ----
  	register int key = FALSE;
  	int	pty	= screen->respond;
  	int	nbytes;
! 	KeySym  keysym = 0;
  	ANSI	reply;
! #ifdef I18N
! 	Status	status_return;
! #endif
! 
! #ifdef I18N
! 	if (screen->xic)
! 	    nbytes = XmbLookupString (screen->xic, event, strbuf, STRBUFSIZE,
! 				      &keysym, &status_return);
! 	else
! 	    nbytes = XLookupString (event, strbuf, STRBUFSIZE,
! 				    &keysym, &compose_status);
! #else
  	nbytes = XLookupString (event, strbuf, STRBUFSIZE,
  				&keysym, &compose_status);
+ #endif
  
  	string = &strbuf[0];
  	reply.a_pintro = 0;
diff -c xc/programs/xterm/main.c:1.1.1.2 xc/programs/xterm/main.c:3.14
*** xc/programs/xterm/main.c:1.1.1.2	Mon Jan 30 17:45:38 1995
--- xc/programs/xterm/main.c	Mon Jan 30 17:45:39 1995
***************
*** 1,6 ****
--- 1,7 ----
  #ifndef lint
  static char *rid="$XConsortium: main.c,v 1.225.1.1 95/01/13 21:13:04 kaleb Exp $";
  #endif /* lint */
+ /* $XFree86: xc/programs/xterm/main.c,v 3.14 1995/01/29 02:10:18 dawes Exp $ */
  
  /*
   * 				 W A R N I N G
***************
*** 73,78 ****
--- 74,82 ----
  #include "menu.h"
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
+ #ifdef I18N
+ #include <X11/Xlocale.h>
+ #endif
  
  #include <X11/Xos.h>
  #include <X11/cursorfont.h>
***************
*** 80,85 ****
--- 84,123 ----
  #include <pwd.h>
  #include <ctype.h>
  
+ #ifdef AMOEBA
+ #include <amoeba.h>
+ #include <cmdreg.h>
+ #include <stderr.h>
+ #include <thread.h>
+ #define  _POSIX_SOURCE
+ #include <limits.h>
+ #include <module/proc.h>
+ #include <module/name.h>
+ 
+ #define USE_TERMIOS
+ #define USE_POSIX_WAIT
+ #define NILCAP ((capability *)NULL)
+ #endif
+ 
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ 
+ #define setpgrp(pid, pgid) setpgid(pid, pgid)
+ #define USE_TERMIOS
+ #define HAS_UTMP_UT_HOST
+ #define MNX_LASTLOG
+ #define WTMP
+ /* Remap or define non-existing termios flags */
+ #define OCRNL	0
+ #define ONLRET	0
+ #define NLDLY	0
+ #define CRDLY	0
+ #define TABDLY	0
+ #define BSDLY	0
+ #define VTDLY	0
+ #define FFDLY	0
+ #endif
+ 
  #ifdef att
  #define ATT
  #endif
***************
*** 112,118 ****
  #define USE_HANDSHAKE
  #endif
  
! #if defined(SYSV) && !defined(SVR4)
  /* older SYSV systems cannot ignore SIGHUP.
     Shell hangs, or you get extra shells, or something like that */
  #define USE_SYSV_SIGHUP
--- 150,156 ----
  #define USE_HANDSHAKE
  #endif
  
! #if defined(SYSV) && !defined(SVR4) && !defined(ISC22) && !defined(ISC30)
  /* older SYSV systems cannot ignore SIGHUP.
     Shell hangs, or you get extra shells, or something like that */
  #define USE_SYSV_SIGHUP
***************
*** 147,152 ****
--- 185,193 ----
  #else /* USE_TERMIOS */
  #ifdef SYSV
  #include <sys/termio.h>
+ #ifdef SCO /* broken TIOCSWINSZ ioctl so disable it */
+ #undef TIOCSWINSZ
+ #endif
  #endif /* SYSV */
  #endif /* USE_TERMIOS else */
  
***************
*** 153,158 ****
--- 194,200 ----
  #ifdef SVR4
  #undef TIOCSLTC				/* defined, but not useable */
  #endif
+ #define USE_TERMCAP_ENVVARS	/* every one uses this except SYSV maybe */
  
  #if defined(sgi) && OSMAJORVERSION >= 5
  #undef TIOCLSET				/* defined, but not useable */
***************
*** 171,176 ****
--- 213,221 ----
  #define USE_SYSV_SIGNALS
  #define	USE_SYSV_PGRP
  #define USE_SYSV_ENVVARS		/* COLUMNS/LINES vs. TERMCAP */
+ #ifndef SCO
+ #undef USE_TERMCAP_ENVVARS	/* SCO wants both TERMCAP and TERMINFO env */
+ #endif
  /*
   * now get system-specific includes
   */
***************
*** 208,216 ****
  #define HAS_UTMP_UT_HOST
  #endif
  #else /* } !SYSV { */			/* BSD systems */
  #ifndef linux
  #include <sgtty.h>
- #endif
  #include <sys/resource.h>
  #define HAS_UTMP_UT_HOST
  #define HAS_BSD_GROUPS
--- 253,262 ----
  #define HAS_UTMP_UT_HOST
  #endif
  #else /* } !SYSV { */			/* BSD systems */
+ #ifdef MINIX /* { */
+ #else /* } !MINIX { */
  #ifndef linux
  #include <sgtty.h>
  #include <sys/resource.h>
  #define HAS_UTMP_UT_HOST
  #define HAS_BSD_GROUPS
***************
*** 218,230 ****
--- 264,291 ----
  #define USE_SYSV_UTMP
  #define setpgrp setpgid
  #endif
+ #endif /* !linux */
+ #endif /* } MINIX */
  #endif	/* } !SYSV */
  
  #ifdef _POSIX_SOURCE
  #define USE_POSIX_WAIT
+ #define HAS_POSIX_SAVED_IDS
  #endif
  #ifdef SVR4
  #define USE_POSIX_WAIT
+ #define HAS_POSIX_SAVED_IDS
+ #endif
+ 
+ #if !defined(MINIX) && !defined(WIN32)
+ #include <sys/param.h>	/* for NOFILE */
+ #endif
+ 
+ #if (BSD >= 199103)
+ #define USE_POSIX_WAIT
+ #define LASTLOG
+ #define WTMP
+ #define HAS_POSIX_SAVED_IDS
  #endif
  
  #include <stdio.h>
***************
*** 256,261 ****
--- 317,325 ----
  #define endutent endutxent
  #define pututline pututxline
  #else
+ #ifdef ISC
+ #include <sys/types.h>
+ #endif
  #include <utmp.h>
  #if defined(_CRAY) && OSMAJORVERSION < 8
  extern struct utmp *getutid __((struct utmp *_Id));
***************
*** 262,271 ****
  #endif
  #endif
  
! #ifdef LASTLOG
  #include <lastlog.h>
  #endif
! #include <sys/param.h>	/* for NOFILE */
  
  #ifdef  PUCC_PTYD
  #include <local/openpty.h>
--- 326,339 ----
  #endif
  #endif
  
! #ifndef ISC
! #ifdef UTMP
! #include <utmp.h>
! #endif
! #if defined(LASTLOG) && (BSD < 199103)
  #include <lastlog.h>
  #endif
! #endif
  
  #ifdef  PUCC_PTYD
  #include <local/openpty.h>
***************
*** 280,298 ****
  #ifdef UTMP_FILE
  #define UTMP_FILENAME UTMP_FILE
  #else
  #define UTMP_FILENAME "/etc/utmp"
  #endif
  #endif
  
  #ifndef LASTLOG_FILENAME
  #define LASTLOG_FILENAME "/usr/adm/lastlog"  /* only on BSD systems */
  #endif
  
  #ifndef WTMP_FILENAME
  #ifdef WTMP_FILE
  #define WTMP_FILENAME WTMP_FILE
  #else
! #ifdef SYSV
  #define WTMP_FILENAME "/etc/wtmp"
  #else
  #define WTMP_FILENAME "/usr/adm/wtmp"
--- 348,377 ----
  #ifdef UTMP_FILE
  #define UTMP_FILENAME UTMP_FILE
  #else
+ #if defined(_PATH_UTMP)
+ #define UTMP_FILENAME _PATH_UTMP
+ #else
  #define UTMP_FILENAME "/etc/utmp"
  #endif
  #endif
+ #endif
  
  #ifndef LASTLOG_FILENAME
+ #ifdef _PATH_LASTLOG
+ #define LASTLOG_FILENAME _PATH_LASTLOG
+ #else
  #define LASTLOG_FILENAME "/usr/adm/lastlog"  /* only on BSD systems */
  #endif
+ #endif
  
  #ifndef WTMP_FILENAME
  #ifdef WTMP_FILE
  #define WTMP_FILENAME WTMP_FILE
  #else
! #if defined(_PATH_WTMP)
! #define WTMP_FILENAME _PATH_WTMP
! #else
! #if defined(SYSV)
  #define WTMP_FILENAME "/etc/wtmp"
  #else
  #define WTMP_FILENAME "/usr/adm/wtmp"
***************
*** 299,304 ****
--- 378,384 ----
  #endif
  #endif
  #endif
+ #endif
  
  #include <signal.h>
  
***************
*** 327,333 ****
  #include <unistd.h>
  #else
  extern long lseek();
! #ifdef USG
  extern unsigned sleep();
  #else
  extern void sleep();
--- 407,413 ----
  #include <unistd.h>
  #else
  extern long lseek();
! #if defined(USG) || defined(SCO324)
  extern unsigned sleep();
  #else
  extern void sleep();
***************
*** 448,458 ****
  extern struct utmp *getutent();
  extern struct utmp *getutid();
  extern struct utmp *getutline();
  extern void pututline();
  extern void setutent();
  extern void endutent();
  extern void utmpname();
! #endif /* !SVR4 */
  
  #ifdef X_NOT_STDC_ENV		/* could remove paragraph unconditionally? */
  extern struct passwd *getpwent();
--- 528,540 ----
  extern struct utmp *getutent();
  extern struct utmp *getutid();
  extern struct utmp *getutline();
+ #ifndef SCO324
  extern void pututline();
  extern void setutent();
  extern void endutent();
  extern void utmpname();
! #endif /* SCO324 */
! #endif /* X_NOT_STDC_ENV || AIXV3 */
  
  #ifdef X_NOT_STDC_ENV		/* could remove paragraph unconditionally? */
  extern struct passwd *getpwent();
***************
*** 465,474 ****
  extern struct passwd *fgetpwent();
  #else	/* not USE_SYSV_UTMP */
  static char etc_utmp[] = UTMP_FILENAME;
  #ifdef LASTLOG
  static char etc_lastlog[] = LASTLOG_FILENAME;
  #endif 
- #endif	/* USE_SYSV_UTMP */
  
  #ifdef WTMP
  static char etc_wtmp[] = WTMP_FILENAME;
--- 547,557 ----
  extern struct passwd *fgetpwent();
  #else	/* not USE_SYSV_UTMP */
  static char etc_utmp[] = UTMP_FILENAME;
+ #endif	/* USE_SYSV_UTMP */
+ 
  #ifdef LASTLOG
  static char etc_lastlog[] = LASTLOG_FILENAME;
  #endif 
  
  #ifdef WTMP
  static char etc_wtmp[] = WTMP_FILENAME;
***************
*** 846,853 ****
--- 929,941 ----
  	char *base_name();
  	int xerror(), xioerror();
  
+ #ifdef I18N
+ 	setlocale(LC_ALL, NULL);
+ #endif
+ 
  	ProgramName = argv[0];
  
+ #ifndef AMOEBA
  	ttydev = (char *) malloc (strlen (TTYDEV) + 1);
  	ptydev = (char *) malloc (strlen (PTYDEV) + 1);
  	if (!ttydev || !ptydev) {
***************
*** 859,864 ****
--- 947,974 ----
  	strcpy (ttydev, TTYDEV);
  	strcpy (ptydev, PTYDEV);
  
+ #ifdef MINIX
+ 	d_tio.c_iflag= TINPUT_DEF;
+ 	d_tio.c_oflag= TOUTPUT_DEF;
+ 	d_tio.c_cflag= TCTRL_DEF;
+ 	d_tio.c_lflag= TLOCAL_DEF;
+ 	cfsetispeed(&d_tio, TSPEED_DEF);
+ 	cfsetispeed(&d_tio, TSPEED_DEF);
+ 	d_tio.c_cc[VEOF]= TEOF_DEF;
+ 	d_tio.c_cc[VEOL]= TEOL_DEF;
+ 	d_tio.c_cc[VERASE]= TERASE_DEF;
+ 	d_tio.c_cc[VINTR]= TINTR_DEF;
+ 	d_tio.c_cc[VKILL]= TKILL_DEF;
+ 	d_tio.c_cc[VMIN]= TMIN_DEF;
+ 	d_tio.c_cc[VQUIT]= TQUIT_DEF;
+ 	d_tio.c_cc[VTIME]= TTIME_DEF;
+ 	d_tio.c_cc[VSUSP]= TSUSP_DEF;
+ 	d_tio.c_cc[VSTART]= TSTART_DEF;
+ 	d_tio.c_cc[VSTOP]= TSTOP_DEF;
+ 	d_tio.c_cc[VREPRINT]= TREPRINT_DEF;
+ 	d_tio.c_cc[VLNEXT]= TLNEXT_DEF;
+ 	d_tio.c_cc[VDISCARD]= TDISCARD_DEF;
+ #else /* !MINIX */
  #ifdef USE_SYSV_TERMIO
  	/* Initialization is done here rather than above in order
  	** to prevent any assumptions about the order of the contents
***************
*** 975,990 ****
  #endif	/* TIOCLSET */
  #endif  /* macII */
  #endif	/* USE_SYSV_TERMIO */
  
  	/* Init the Toolkit. */
! 	XtSetErrorHandler(xt_error);
! 	toplevel = XtAppInitialize (&app_con, "XTerm", 
! 				    optionDescList, XtNumber(optionDescList), 
! 				    &argc, argv, fallback_resources, NULL, 0);
! 
! 	XtGetApplicationResources(toplevel, (XtPointer) &resource,
! 				  application_resources,
! 				  XtNumber(application_resources), NULL, 0);
  
  	waiting_for_initial_map = resource.wait_for_map;
  
--- 1085,1132 ----
  #endif	/* TIOCLSET */
  #endif  /* macII */
  #endif	/* USE_SYSV_TERMIO */
+ #endif /* MINIX */
+ #endif  /* AMOEBA */
  
  	/* Init the Toolkit. */
! 	{
! #ifdef HAS_POSIX_SAVED_IDS
! 	    uid_t euid = geteuid();
! 	    gid_t egid = getegid();
! 	    uid_t ruid = getuid();
! 	    gid_t rgid = getgid();
! 
! 	    if (setegid(ruid) == -1)
! 		(void) fprintf(stderr, "setegid(%d): %s\n",
! 			       rgid, strerror(errno));
! 
! 	    if (seteuid(ruid) == -1)
! 		(void) fprintf(stderr, "seteuid(%d): %s\n",
! 			       ruid, strerror(errno));
! #endif
! 
! 	    XtSetErrorHandler(xt_error);
! 	    toplevel = XtAppInitialize (&app_con, "XTerm", 
! 					optionDescList,
! 					XtNumber(optionDescList), 
! 					&argc, argv, fallback_resources,
! 					NULL, 0);
! 
! 	    XtGetApplicationResources(toplevel, (XtPointer) &resource,
! 				      application_resources,
! 				      XtNumber(application_resources), NULL, 0);
! 
! #ifdef HAS_POSIX_SAVED_IDS
! 	    if (seteuid(euid) == -1)
! 		(void) fprintf(stderr, "seteuid(%d): %s\n",
! 			       euid, strerror(errno));
! 
! 	    if (setegid(egid) == -1)
! 		(void) fprintf(stderr, "setegid(%d): %s\n",
! 			       egid, strerror(errno));
! #endif
! 	}
! 
  
  	waiting_for_initial_map = resource.wait_for_map;
  
***************
*** 1154,1159 ****
--- 1296,1302 ----
  	if(screen->TekEmu && !TekInit())
  		exit(ERROR_INIT);
  
+ #ifndef MINIX
  #ifdef DEBUG
      {
  	/* Set up stderr properly.  Opening this log file cannot be
***************
*** 1192,1197 ****
--- 1335,1341 ----
  	}
      }
  #endif	/* DEBUG */
+ #endif /* MINIX */
  
  	/* open a terminal for client */
  	get_terminal ();
***************
*** 1201,1206 ****
--- 1345,1351 ----
  
  	/* Realize procs have now been executed */
  
+ #ifndef AMOEBA
  	Xsocket = ConnectionNumber(screen->display);
  	pty = screen->respond;
  
***************
*** 1213,1218 ****
--- 1358,1364 ----
  				      XtWindow (XtParent (term)));
  	    write (pty, buf, strlen (buf));
  	}
+ #endif /* !AMOEBA */
  
  #ifdef ALLOWLOGGING
  	if (term->misc.log_on) {
***************
*** 1239,1244 ****
--- 1385,1399 ----
  		SysError(ERROR_TIOCSETP);
  	}
  #endif
+ #ifndef AMOEBA
+ #ifdef MINIX
+ 	if ((mode = fcntl(pty, F_GETFD, 0)) == -1)
+ 		Error();
+ 	mode |= FD_ASYNCHIO;
+ 	if (fcntl(pty, F_SETFD, mode) == -1)
+ 		Error();
+ 	nbio_register(pty);
+ #else /* !MINIX */
  #ifdef USE_SYSV_TERMIO
  	if (0 > (mode = fcntl(pty, F_GETFL, 0)))
  		Error();
***************
*** 1253,1258 ****
--- 1408,1415 ----
  	mode = 1;
  	if (ioctl (pty, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO);
  #endif	/* USE_SYSV_TERMIO */
+ #endif /* MINIX */
+ #endif  /* AMOEBA */
  	
  	pty_mask = 1 << pty;
  	X_mask = 1 << Xsocket;
***************
*** 1281,1286 ****
--- 1438,1444 ----
  	return(cp ? cp + 1 : name);
  }
  
+ #ifndef AMOEBA
  /* This function opens up a pty master and stuffs its value into pty.
   * If it finds one, it returns a value of 0.  If it does not find one,
   * it returns a value of !0.  This routine is designed to be re-entrant,
***************
*** 1322,1328 ****
  	if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0) {
  	    return 1;
  	}
! #if defined(SVR4) || defined(i386)
  	strcpy(ttydev, ptsname(*pty));
  #if defined (SYSV) && defined(i386) && !defined(SVR4)
  	IsPts = True;
--- 1480,1486 ----
  	if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0) {
  	    return 1;
  	}
! #if defined(SVR4) || (defined(i386) && defined(SYSV))
  	strcpy(ttydev, ptsname(*pty));
  #if defined (SYSV) && defined(i386) && !defined(SVR4)
  	IsPts = True;
***************
*** 1451,1456 ****
--- 1609,1615 ----
       */
      return 1;
  }
+ #endif /* AMOEBA */
  
  get_terminal ()
  /* 
***************
*** 1587,1592 ****
--- 1746,1752 ----
  #endif /* USE_HANDSHAKE else !USE_HANDSHAKE */
  
  
+ #ifndef AMOEBA
  spawn ()
  /* 
   *  Inits pty and tty and forks a login process.
***************
*** 1767,1772 ****
--- 1927,1938 ----
  				jtc = d_jtc;
  #endif /* sony */
  #endif	/* USE_SYSV_TERMIO */
+ #ifdef MINIX
+ 			/* Editing shells interfere with xterms started in
+ 			 * the background.
+ 			 */
+ 			tio = d_tio;
+ #endif
  			close (tty);
  			/* tty is no longer an open fd! */
  			tty = -1;
***************
*** 2118,2123 ****
--- 2284,2293 ----
  #ifdef OPOST
  		    tio.c_oflag |= OPOST;
  #endif /* OPOST */		    
+ #ifdef MINIX	/* should be ifdef _POSIX_SOURCE */
+ 		    cfsetispeed(&tio, B9600);
+ 		    cfsetospeed(&tio, B9600);
+ #else /* !MINIX */
  #ifdef BAUD_0
  		    /* baud rate is 0 (don't care) */
  		    tio.c_cflag &= ~(CBAUD);
***************
*** 2126,2131 ****
--- 2296,2302 ----
  		    tio.c_cflag &= ~(CBAUD);
  		    tio.c_cflag |= B9600;
  #endif	/* !BAUD_0 */
+ #endif /* MINIX */
  		    /* enable signals, canonical processing (erase, kill, etc),
  		    ** echo
  		    */
***************
*** 2288,2293 ****
--- 2459,2465 ----
  
  		signal(SIGTERM, SIG_DFL);
  
+ #ifndef AMOEBA
  		/* this is the time to go and set up stdin, out, and err
  		 */
  		{
***************
*** 2330,2335 ****
--- 2502,2509 ----
  		setpgrp (0, pgrp);
  #endif /* !USE_SYSV_PGRP */
  
+ #endif /* AMOEBA */
+ 
  #ifdef UTMP
  		pw = getpwuid(screen->uid);
  		if (pw && pw->pw_name)
***************
*** 2431,2436 ****
--- 2605,2614 ----
  					       sizeof(utmp.ut_line));
  				(void) strncpy(utmp.ut_name, pw->pw_name,
  					       sizeof(utmp.ut_name));
+ #ifdef MINIX
+ 				utmp.ut_pid = getpid();
+ 				utmp.ut_type = USER_PROCESS;
+ #endif /* MINIX */
  #ifdef HAS_UTMP_UT_HOST
  				(void) strncpy(utmp.ut_host, 
  					       XDisplayString (screen->display),
***************
*** 2450,2455 ****
--- 2628,2655 ----
  				    status = close(i);
  				}
  #endif /* WTMP */
+ #ifdef MNX_LASTLOG
+ 				if (term->misc.login_shell &&
+ 				(i = open(_U_LASTLOG, O_WRONLY)) >= 0) {
+ 				    lseek(i, (long)(screen->uid *
+ 					sizeof (struct utmp)), 0);
+ 				    write(i, (char *)&utmp,
+ 					sizeof (struct utmp));
+ 				    close(i);
+ 				}
+ #endif /* MNX_LASTLOG */
+ 			} else
+ 				tslot = -tslot;
+ 		}
+ 
+ 		/* Let's pass our ttyslot to our parent so that it can
+ 		 * clean up after us.
+ 		 */
+ #ifdef USE_HANDSHAKE
+ 		handshake.tty_slot = tslot;
+ #endif /* USE_HANDSHAKE */
+ #endif /* USE_SYSV_UTMP */
+ 
  #ifdef LASTLOG
  				if (term->misc.login_shell &&
  				(i = open(etc_lastlog, O_WRONLY)) >= 0) {
***************
*** 2469,2485 ****
  				    close(i);
  				}
  #endif /* LASTLOG */
- 			} else
- 				tslot = -tslot;
- 		}
- 
- 		/* Let's pass our ttyslot to our parent so that it can
- 		 * clean up after us.
- 		 */
- #ifdef USE_HANDSHAKE
- 		handshake.tty_slot = tslot;
- #endif /* USE_HANDSHAKE */
- #endif /* USE_SYSV_UTMP */
  
  #ifdef USE_HANDSHAKE
  		/* Let our parent know that we set up our utmp entry
--- 2669,2674 ----
***************
*** 2767,2772 ****
--- 2956,3324 ----
  
  	return 0;
  }							/* end spawn */
+ #else  /* AMOEBA */
+ /* manifest constants */
+ #define	TTY_NTHREADS		2
+ #define	TTY_INQSIZE		2000
+ #define	TTY_OUTQSIZE		1000
+ #define	TTY_THREAD_STACKSIZE	4096
+ 
+ #define	XWATCHDOG_THREAD_SIZE	4096
+ 
+ /* acceptable defaults */
+ #define	DEF_HOME		"/home"
+ #define	DEF_SHELL		"/bin/sh"
+ #define	DEF_PATH		"/bin:/usr/bin:/profile/util"
+ 
+ extern capability ttycap;
+ extern char **environ;
+ extern struct caplist *capv;
+ 
+ /*
+  * Set capability.
+  * I made this a function since it cannot be a macro.
+  */
+ void
+ setcap(capvec, n, name, cap)
+     struct caplist *capvec;
+     int n;
+     char *name;
+     capability *cap;
+ {
+     capvec[n].cl_name = name;
+     capvec[n].cl_cap = cap;
+ }
+ 
+ /*
+  * Find process descriptor for specified program,
+  * necessarily running down the user's PATH.
+  */
+ errstat
+ find_program(program, programcap)
+     char *program;
+     capability *programcap;
+ {
+     errstat err;
+ 
+     if ((err = name_lookup(program, programcap)) != STD_OK) {
+ 	char *path, *name;
+ 	char programpath[1024];
+ 
+ 	if ((path = getenv("PATH")) == NULL)
+      	    path = DEF_PATH;
+ 	if ((name = strrchr(program, '/')) != NULL)
+     	    name++;
+ 	else
+     	    name = program;
+ 
+ 	do {
+ 	    register char *p = programpath;
+ 	    register char *n = name;
+ 	    char *c1 = path;
+ 
+ 	    while (*path && *path != ':')
+ 		*p++ = *path++;
+ 	    if (path != c1) *p++ = '/';
+ 	    if (*path) path++;
+ 	    while (*n) *p++ = *n++;
+ 	    *p = '\0';
+ 	    if ((err = name_lookup(programpath, programcap)) == STD_OK)
+ 		break;
+ 	} while (*path);
+     }
+     return err;
+ }
+ 
+ /* Semaphore on which the main thread blocks until it can do something
+  * useful (which is made known by a call to WakeupMainThread()).
+  */
+ static semaphore main_sema;
+ 
+ void
+ InitMainThread()
+ {
+     sema_init(&main_sema, 0);
+ }
+ 
+ void
+ WakeupMainThread()
+ {
+     sema_up(&main_sema);
+ }
+ 
+ /*
+  * Spawn off tty threads and fork the login process.
+  */
+ spawn()
+ {
+     register TScreen *screen = &term->screen;
+     char *TermName = NULL;
+     char termcap[1024];
+     char newtc[1024];
+     char **envnew;		/* new environment */
+     int envsize;		/* elements in new environment */
+     char *ptr;
+     int i, n, ncap;
+     errstat err;
+     struct caplist *cl;
+     char buf[64], numbuf[12];
+     struct caplist *capvnew;
+     int ttythread();
+     int xwatchdogthread();
+ 
+     screen->pid = 2;		/* at least > 1 */
+     screen->uid = getuid();
+     screen->gid = getgid();
+     screen->respond = OPEN_MAX + 1;
+     screen->tty_inq = cb_alloc(TTY_INQSIZE);
+     screen->tty_outq = cb_alloc(TTY_OUTQSIZE);
+ 
+     InitMainThread();
+     if (!thread_newthread(xwatchdogthread, XWATCHDOG_THREAD_SIZE, 0, 0)) {
+ 	fprintf(stderr, "%s:  unable to start tty thread.\n", ProgramName);
+ 	Exit(1);
+     }
+ 
+     /*
+      * Start tty threads. Ordinarily two should suffice, one for standard
+      * input and one for standard (error) output.
+      */
+     ttyinit((char *) NULL);
+     for (i = 0; i < TTY_NTHREADS; i++) {
+ 	if (!thread_newthread(ttythread, TTY_THREAD_STACKSIZE, 0, 0)) {
+ 	    fprintf(stderr, "%s:  unable to start tty thread.\n", ProgramName);
+ 	    Exit(1);
+ 	}
+     }
+ 
+     /* avoid double MapWindow requests */
+     XtSetMappedWhenManaged( screen->TekEmu ? XtParent(tekWidget) :
+ 					XtParent(term), False );
+     wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW",
+ 					False);
+ 
+     /* realize now so know window size for tty driver */
+     if (!screen->TekEmu) VTInit();
+ 
+     if (screen->TekEmu) {
+ 	envnew = tekterm;
+ 	ptr = newtc;
+     } else {
+ 	envnew = vtterm;
+ 	ptr = termcap;
+     }
+ 
+     TermName = NULL;
+     if (resource.term_name) {
+ 	if (tgetent (ptr, resource.term_name) == 1) {
+ 	    TermName = resource.term_name;
+ 	    if (!screen->TekEmu)
+ 		resize (screen, TermName, termcap, newtc);
+ 	} else {
+ 	    fprintf (stderr, "%s:  invalid termcap entry \"%s\".\n",
+ 		ProgramName, resource.term_name);
+ 	}
+     }
+ 
+     if (!TermName) {
+ 	while (*envnew != NULL) {
+ 	    if(tgetent(ptr, *envnew) == 1) {
+ 		TermName = *envnew;
+ 		if(!screen->TekEmu)
+ 		    resize(screen, TermName, termcap, newtc);
+ 		    break;
+ 	    }
+ 	    envnew++;
+ 	}
+ 	if (TermName == NULL) {
+ 	    fprintf (stderr, "%s:  unable to find usable termcap entry.\n",
+ 		ProgramName);
+ 	    Exit (1);
+ 	}
+     }
+ 
+     /*
+      * Setup new capability environment. The whole point of the game is
+      * to redirect the shell's stdin/stdout/stderr and tty to our own
+      * tty server instead of the initial one.
+      */
+     for (ncap = 4, cl = capv; cl->cl_name != (char *)NULL; cl++)
+ 	if (strcmp("STDIN", cl->cl_name) && strcmp("STDOUT", cl->cl_name)
+ 	  && strcmp("STDERR", cl->cl_name) && strcmp("TTY", cl->cl_name))
+ 	    ncap++;
+ 
+     capvnew = (struct caplist *)
+ 	calloc((unsigned) ncap + 1, sizeof(struct caplist));
+     setcap(capvnew, 0, "STDIN", &ttycap);
+     setcap(capvnew, 1, "STDOUT", &ttycap);
+     setcap(capvnew, 2, "STDERR", &ttycap);
+     setcap(capvnew, 3, "TTY", &ttycap);
+     for (n = 4, cl = capv; cl->cl_name != (char *) NULL; cl++) {
+ 	if (strcmp("STDIN", cl->cl_name)
+ 	  && strcmp("STDOUT", cl->cl_name)
+ 	  && strcmp("STDERR", cl->cl_name)
+ 	  && strcmp("TTY", cl->cl_name))
+ 	    setcap(capvnew, n++, cl->cl_name, cl->cl_cap);
+     }
+     setcap(capvnew, ncap, (char *)NULL, (capability *)NULL);
+     if (n != ncap) {
+ 	fprintf(stderr, "%s: bad capability set.\n", ProgramName);
+ 	Exit(1);
+     }
+ 
+     /*
+      * Setup environment variables. We add some extra ones to denote
+      * window id, terminal type, display name, termcap entry, and some
+      * standard one (which are required by every shell) HOME and SHELL.
+      * Note that the two shell variables COLUMNS and LINES are not needed
+      * under Amoeba since the tty server provides an RPC to query the
+      * window sizes.
+      */
+     /* copy the environment before Setenving */
+     for (i = 0 ; environ[i] != NULL ; i++)
+ 	;
+ 
+     /* compute number of Setenv() calls below */
+     envsize = 1;	/* (NULL terminating entry) */
+     envsize += 3;	/* TERM, WINDOWID, DISPLAY */
+     envsize += 2;	/* HOME, SHELL */
+     envsize += 1;	/* TERMCAP */
+     envnew = (char **) calloc ((unsigned) i + envsize, sizeof(char *));
+     bcopy((char *)environ, (char *)envnew, i * sizeof(char *));
+     environ = envnew;
+     Setenv ("TERM=", TermName);
+     if(!TermName) *newtc = 0;
+ 
+     sprintf (buf, "%lu", screen->TekEmu ?
+ 	((unsigned long) XtWindow (XtParent(tekWidget))) :
+ 	((unsigned long) XtWindow (XtParent(term))));
+     Setenv ("WINDOWID=", buf);
+ 
+     /* put the display into the environment of the shell*/
+     Setenv ("DISPLAY=", XDisplayString (screen->display));
+ 
+     /* always provide a HOME and SHELL definition */
+     if (!getenv("HOME")) Setenv("HOME=", DEF_HOME);
+     if (!getenv("SHELL")) Setenv("SHELL=", DEF_SHELL);
+ 
+     if(!screen->TekEmu) {
+ 	strcpy (termcap, newtc);
+ 	resize (screen, TermName, termcap, newtc);
+     }
+     if (term->misc.titeInhibit) {
+ 	remove_termcap_entry (newtc, ":ti=");
+ 	remove_termcap_entry (newtc, ":te=");
+     }
+     /* work around broken termcap entries */
+     if (resource.useInsertMode) {
+ 	remove_termcap_entry (newtc, ":ic=");
+ 	/* don't get duplicates */
+ 	remove_termcap_entry (newtc, ":im=");
+ 	remove_termcap_entry (newtc, ":ei=");
+ 	remove_termcap_entry (newtc, ":mi");
+ 	strcat (newtc, ":im=\\E[4h:ei=\\E[4l:mi:");
+     }
+     Setenv ("TERMCAP=", newtc);
+ 
+     /*
+      * Execute specified program or shell. Use find_program to
+      * simulate the same behaviour as the original execvp.
+      */
+     if (command_to_exec) {
+ 	capability programcap;
+ 
+ 	if (find_program(*command_to_exec, &programcap) != STD_OK) {
+ 	    fprintf(stderr, "%s: Could not find %s!\n",
+ 		xterm_name, *command_to_exec);
+ 	    exit(ERROR_EXEC);
+ 	}
+ 
+ 	err = exec_file(&programcap, NILCAP, &ttycap, 0,
+ 	    command_to_exec, envnew, capvnew, &screen->proccap);
+ 	if (err != STD_OK) {
+ 	    fprintf(stderr, "%s: Could not exec %s!\n",
+ 		xterm_name, *command_to_exec);
+ 	    exit(ERROR_EXEC);
+ 	}
+     } else {
+ 	char *shell, *shname, *shname_minus;
+ 	capability shellcap;
+ 	char *argvec[2];
+ 
+ 	if ((shell = getenv("SHELL")) == NULL)
+     	    shell = DEF_SHELL; /* "cannot happen" */
+ 	if ((shname = strrchr(shell, '/')) != NULL)
+     	    shname++;
+ 	else
+     	    shname = shell;
+ 
+ 	shname_minus = malloc(strlen(shname) + 2);
+ 	(void) strcpy(shname_minus, "-");
+ 	(void) strcat(shname_minus, shname);
+ 
+ 	argvec[0] = term->misc.login_shell ? shname_minus : shname;
+ 	argvec[1] = NULL;
+     
+ 	if (find_program(shell, &shellcap) != STD_OK) {
+ 	    fprintf(stderr, "%s: Could not find %s!\n", xterm_name, shell);
+ 	    exit(ERROR_EXEC);
+ 	}
+ 
+ 	err = exec_file(&shellcap, NILCAP, &ttycap, 0, argvec,
+ 	    envnew, capvnew, &screen->proccap);
+ 	if (err != STD_OK) {
+ 	    fprintf(stderr, "%s: Could not exec %s!\n", xterm_name, shell);
+ 	    exit(ERROR_EXEC);
+ 	}
+ 
+ 	free(shname_minus);
+     }
+     free(capvnew);
+ 
+     signal(SIGINT, SIG_IGN);
+     signal(SIGQUIT, SIG_IGN);
+     signal(SIGTERM, SIG_IGN);
+     signal(SIGPIPE, Exit);
+ }
+ 
+ extern char *SysErrorMsg();
+ 
+ /*
+  * X watch-dog thread. This thread unblocks the main
+  * thread when there's an X event.
+  */
+ xwatchdogthread()
+ {
+     register TScreen *screen = &term->screen;
+ 
+     for (;;) {
+ 	int n = _X11TransAmSelect(ConnectionNumber(screen->display), 10);
+ 	if (n < 0 && errno != EINTR) {
+ 	    fprintf(stderr, "%s: X watch dog: Xselect failed: %s\n",
+ 		ProgramName, SysErrorMsg(errno));
+ 	    Cleanup(1);
+ 	} else if (n > 0)
+ 	    WakeupMainThread();
+ 	threadswitch();
+     }
+ }
+ 
+ void
+ SleepMainThread()
+ {
+     int remaining;
+ 
+     /* Wait for at least one event */
+     sema_down(&main_sema);
+ 
+     /* Since the main thread will continue handling all outstanding events
+      * shortly, we can ignore the remaining wakeups that were done.
+      */
+     if ((remaining = sema_level(&main_sema)) > 1) {
+ 	sema_mdown(&main_sema, remaining);
+     }
+ }
+ #endif /* AMOEBA */
  
  SIGNAL_T
  Exit(n)
***************
*** 2855,2866 ****
--- 3407,3421 ----
  	}
  #endif	/* USE_SYSV_UTMP */
  #endif	/* UTMP */
+ #ifndef AMOEBA
          close(pty); /* close explicitly to avoid race with slave side */
+ #endif
  #ifdef ALLOWLOGGING
  	if(screen->logging)
  		CloseLog(screen);
  #endif
  
+ #ifndef AMOEBA
  	if (!am_slave) {
  		/* restore ownership of tty and pty */
  		chown (ttydev, 0, 0);
***************
*** 2874,2879 ****
--- 3429,3435 ----
  		chmod (ptydev, 0666);
  #endif /* !sgi */
  	}
+ #endif /* AMOEBA */
  	exit(n);
  	SIGNAL_RETURN;
  }
***************
*** 2989,2997 ****
--- 3545,3557 ----
   	strcat(buf, ": ");
   	strcat(buf, SysErrorMsg (oerrno));
   	strcat(buf, "\n");	
+ #ifndef AMOEBA
  	f = open("/dev/console",O_WRONLY);
  	write(f, buf, strlen(buf));
  	close(f);
+ #else
+ 	fputs(buf, stderr);
+ #endif
  #ifdef TIOCNOTTY
  	if ((f = open("/dev/tty", 2)) >= 0) {
  		ioctl(f, TIOCNOTTY, (char *)NULL);
***************
*** 3068,3084 ****
--- 3628,3669 ----
  int GetBytesAvailable (fd)
      int fd;
  {
+ #ifndef AMOEBA
  #ifdef FIONREAD
      static long arg;
      ioctl (fd, FIONREAD, (char *) &arg);
      return (int) arg;
  #else
+ #ifdef MINIX
+     /* The answer doesn't have to correct. Calling nbio_isinprogress is
+      * much cheaper than called nbio_select.
+      */
+     if (nbio_isinprogress(fd, ASIO_READ))
+     	return 0;
+     else
+         return 1;
+ #else /* !MINIX */
      struct pollfd pollfds[1];
  
      pollfds[0].fd = fd;
      pollfds[0].events = POLLIN;
      return poll (pollfds, 1, 0);
+ #endif /* MINIX */
  #endif
+ #else
+     /*
+      * Since this routine is only used to poll X connections
+      * we can use an internal Xlib routine (oh what ugly).
+      */
+     register TScreen *screen = &term->screen;
+     int count;
+ 
+     if (ConnectionNumber(screen->display) != fd) {
+ 	Panic("Cannot get bytes available");
+ 	return -1;
+     }
+     return _X11TransAmFdBytesReadable(fd, &count) < 0 ? -1 : count;
+ #endif /* AMOEBA */
  }
  
  /* Utility function to try to hide system differences from
***************
*** 3089,3094 ****
--- 3674,3680 ----
      int pid;
      int sig;
  {
+ #ifndef AMOEBA
  #ifndef X_NOT_POSIX
      return kill (-pid, sig);
  #else
***************
*** 3098,3101 ****
--- 3684,3694 ----
      return killpg (pid, sig);
  #endif
  #endif
+ #else /* AMOEBA */
+     if (pid != 2) {
+ 	fprintf(stderr, "%s:  unexpected process id %d.\n", ProgramName, pid);
+ 	abort();
+     }
+     ttysendsig(sig);
+ #endif /* AMOEBA */
  }
diff -c xc/programs/xterm/menu.c:1.1.1.1 xc/programs/xterm/menu.c:3.1
*** xc/programs/xterm/menu.c:1.1.1.1	Mon Jan 30 17:45:40 1995
--- xc/programs/xterm/menu.c	Mon Jan 30 17:45:40 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: menu.c,v 1.63 94/04/17 20:23:30 gildea Exp $ */
+ /* $XFree86: xc/programs/xterm/menu.c,v 3.1 1994/05/08 05:27:06 dawes Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
***************
*** 38,43 ****
--- 39,48 ----
  #include <stdio.h>
  #include <signal.h>
  
+ #ifdef MINIX
+ #include <X11/Xos.h>
+ #endif
+ 
  extern void FindFontSelection();
  
  Arg menuArgs[2] = {{ XtNleftBitmap, (XtArgVal) 0 },
***************
*** 176,186 ****
  #ifdef ALLOWLOGGING
  	    update_logging();
  #endif
! #ifndef SIGTSTP
  	    set_sensitivity (screen->mainMenu,
  			     mainMenuEntries[mainMenu_suspend].widget, FALSE);
  #endif
! #ifndef SIGCONT
  	    set_sensitivity (screen->mainMenu, 
  			     mainMenuEntries[mainMenu_continue].widget, FALSE);
  #endif
--- 181,191 ----
  #ifdef ALLOWLOGGING
  	    update_logging();
  #endif
! #if !defined(SIGTSTP) || defined(AMOEBA)
  	    set_sensitivity (screen->mainMenu,
  			     mainMenuEntries[mainMenu_suspend].widget, FALSE);
  #endif
! #if !defined(SIGCONT) || defined(AMOEBA)
  	    set_sensitivity (screen->mainMenu, 
  			     mainMenuEntries[mainMenu_continue].widget, FALSE);
  #endif
***************
*** 413,419 ****
      Widget gw;
      caddr_t closure, data;
  {
! #ifdef SIGTSTP
      handle_send_signal (gw, SIGTSTP);
  #endif
  }
--- 418,424 ----
      Widget gw;
      caddr_t closure, data;
  {
! #if defined(SIGTSTP) && !defined(AMOEBA)
      handle_send_signal (gw, SIGTSTP);
  #endif
  }
***************
*** 423,429 ****
      Widget gw;
      caddr_t closure, data;
  {
! #ifdef SIGCONT
      handle_send_signal (gw, SIGCONT);
  #endif
  }
--- 428,434 ----
      Widget gw;
      caddr_t closure, data;
  {
! #if defined(SIGCONT) && !defined(AMOEBA)
      handle_send_signal (gw, SIGCONT);
  #endif
  }
diff -c xc/programs/xterm/misc.c:1.1.1.1 xc/programs/xterm/misc.c:3.2
*** xc/programs/xterm/misc.c:1.1.1.1	Mon Jan 30 17:45:41 1995
--- xc/programs/xterm/misc.c	Mon Jan 30 17:45:41 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   *	$XConsortium: misc.c,v 1.102 94/03/28 18:27:08 gildea Exp $
+  *	$XFree86: xc/programs/xterm/misc.c,v 3.2 1995/01/21 07:21:03 dawes Exp $
   */
  
  /*
***************
*** 47,52 ****
--- 48,58 ----
  #include "error.h"
  #include "menu.h"
  
+ #ifdef AMOEBA
+ #include "amoeba.h"
+ #include "module/proc.h"
+ #endif
+ 
  extern jmp_buf Tekend;
  extern jmp_buf VTend;
  
***************
*** 273,278 ****
--- 279,288 ----
  			TCursorToggle(TOGGLE);
  		return;
  	} else {
+ #ifdef I18N
+ 		if (screen->xic)
+ 		    XSetICFocus(screen->xic);
+ #endif
  		if(screen->cursor_state &&
  		   (screen->cursor_col != screen->cur_col ||
  		    screen->cursor_row != screen->cur_row))
***************
*** 295,300 ****
--- 305,314 ----
  	screen->select &= ~flag;
  	if(!Ttoggled) TCursorToggle(TOGGLE);
      } else {
+ #ifdef I18N
+ 		if (screen->xic)
+ 		    XUnsetICFocus(screen->xic);
+ #endif
  	screen->select &= ~flag;
  	if(screen->cursor_state &&
  	   (screen->cursor_col != screen->cur_col ||
***************
*** 765,774 ****
--- 779,792 ----
  char *SysErrorMsg (n)
      int n;
  {
+ #if __STDC__
+     return strerror(n);
+ #else
      extern char *sys_errlist[];
      extern int sys_nerr;
  
      return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
+ #endif /* __STDC__ */
  }
  
  
***************
*** 805,810 ****
--- 823,834 ----
  	if (screen->pid > 1) {
  	    (void) kill_process_group (screen->pid, SIGHUP);
  	}
+ #ifdef AMOEBA
+ 	if (!NULLPORT(&screen->proccap.cap_port))
+ 	    (void) pro_stun(&screen->proccap, -1L);
+ 	cb_close(screen->tty_outq);
+ 	cb_close(screen->tty_inq);
+ #endif
  	Exit (code);
  }
  
diff -c xc/programs/xterm/ptyx.h:1.1.1.2 xc/programs/xterm/ptyx.h:3.2
*** xc/programs/xterm/ptyx.h:1.1.1.2	Mon Jan 30 17:45:42 1995
--- xc/programs/xterm/ptyx.h	Mon Jan 30 17:45:42 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   *	$XConsortium: ptyx.h,v 1.63 94/08/02 19:24:44 converse Exp $
+  *	$XFree86: xc/programs/xterm/ptyx.h,v 3.2 1995/01/21 07:21:05 dawes Exp $
   */
  
  /*
***************
*** 33,38 ****
--- 34,50 ----
  #include <X11/Xfuncs.h>
  #include <X11/Xosdefs.h>
  
+ #ifdef AMOEBA
+ /* Avoid name clashes with standard Amoeba types: */
+ #define event    am_event_t
+ #define interval am_interval_t
+ #include <amoeba.h>
+ #include <semaphore.h>
+ #include <circbuf.h>
+ #undef event
+ #undef interval
+ #endif
+ 
  /* Extra Xlib definitions */
  #define AllButtonsUp(detail, ignore)  (\
  		((ignore) == Button1) ? \
***************
*** 196,201 ****
--- 208,218 ----
  	Display		*display;	/* X display for screen		*/
  	int		respond;	/* socket for responses
  					   (position report, etc.)	*/
+ #ifdef AMOEBA
+ 	capability      proccap;        /* process capability           */
+ 	struct circbuf  *tty_inq;       /* tty server input queue       */
+ 	struct circbuf  *tty_outq;      /* tty server output queue      */
+ #endif
  	long		pid;		/* pid of process on far side   */
  	int		uid;		/* user id of actual person	*/
  	int		gid;		/* group id of actual person	*/
***************
*** 356,361 ****
--- 373,381 ----
  	Widget		mainMenu, vtMenu, tekMenu, fontMenu;
  	char*		menu_font_names[NMENUFONTS];
  	int		menu_font_number;
+ #ifdef I18N
+ 	XIC		xic;
+ #endif
  } TScreen;
  
  typedef struct _TekPart {
***************
*** 399,404 ****
--- 419,430 ----
      Boolean tekSmall;	/* start tek window in small size */
      Boolean appcursorDefault;
      Boolean appkeypadDefault;
+ #ifdef I18N
+     char *input_method;
+     char *preedit_type;
+     Boolean open_im;
+     Boolean shared_ic;
+ #endif
  } Misc;
  
  typedef struct {int foo;} XtermClassPart, TekClassPart;
diff -c xc/programs/xterm/resize.c:1.1.1.2 xc/programs/xterm/resize.c:3.4
*** xc/programs/xterm/resize.c:1.1.1.2	Mon Jan 30 17:45:43 1995
--- xc/programs/xterm/resize.c	Mon Jan 30 17:45:43 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   *	$XConsortium: resize.c,v 1.31 94/11/30 23:51:18 kaleb Exp $
+  *	$XFree86: xc/programs/xterm/resize.c,v 3.4 1995/01/28 16:17:47 dawes Exp $
   */
  
  /*
***************
*** 54,59 ****
--- 55,65 ----
  #undef SYSV				/* pretend to be bsd */
  #endif /* macII */
  
+ #ifdef SCO
+ #define USE_TERMCAP
+ #define USE_TERMINFO
+ #endif
+ 
  #if defined(SYSV) || defined(linux)
  #define USE_SYSV_TERMIO
  #define USE_SYSV_UTMP
***************
*** 61,73 ****
  #define USE_TERMCAP
  #endif /* SYSV */
  
  #include <sys/ioctl.h>
  #ifdef USE_SYSV_TERMIO
  #include <sys/termio.h>
  #else /* else not USE_SYSV_TERMIO */
! #ifndef linux
  #include <sgtty.h>
! #endif
  #endif	/* USE_SYSV_TERMIO */
  
  #ifdef USE_USG_PTYS
--- 67,93 ----
  #define USE_TERMCAP
  #endif /* SYSV */
  
+ /*
+  * some OS's may want to use both, like SCO for example we catch
+  * here anyone who hasn't decided what they want.
+  */
+ #if !defined(USE_TERMCAP) && !defined(USE_TERMINFO)
+ #define USE_TERMINFO
+ #endif
+ 
+ #ifdef MINIX
+ #define USE_TERMIOS
+ #endif
+ 
  #include <sys/ioctl.h>
  #ifdef USE_SYSV_TERMIO
  #include <sys/termio.h>
  #else /* else not USE_SYSV_TERMIO */
! #ifdef MINIX
! #include <termios.h>
! #else /* !MINIX */
  #include <sgtty.h>
! #endif /* MINIX */
  #endif	/* USE_SYSV_TERMIO */
  
  #ifdef USE_USG_PTYS
***************
*** 92,104 ****
  
  #ifdef USE_SYSV_TERMIO
  #ifdef X_NOT_POSIX
! #ifndef i386
  extern struct passwd *getpwuid(); 	/* does ANYBODY need this? */
! #endif /* i386 */
  #endif /* X_NOT_POSIX */
  #define	bzero(s, n)	memset(s, 0, n)
  #endif	/* USE_SYSV_TERMIO */
  
  #define	EMULATIONS	2
  #define	SUN		1
  #define	TIMEOUT		10
--- 112,134 ----
  
  #ifdef USE_SYSV_TERMIO
  #ifdef X_NOT_POSIX
! #if !defined(SYSV) && !defined(i386)
  extern struct passwd *getpwuid(); 	/* does ANYBODY need this? */
! #endif /* SYSV && i386 */
  #endif /* X_NOT_POSIX */
  #define	bzero(s, n)	memset(s, 0, n)
  #endif	/* USE_SYSV_TERMIO */
  
+ #ifdef USE_TERMIOS
+ #define USE_SYSV_TERMIO
+ #define termio termios
+ #define TCGETA TCGETS
+ #define TCSETAW TCSETSW
+ #ifndef IUCLC
+ #define IUCLC	0
+ #endif
+ #endif
+ 
  #define	EMULATIONS	2
  #define	SUN		1
  #define	TIMEOUT		10
***************
*** 293,299 ****
  		    myname, env);
  	    exit(1);
  	}
! #else /* else not USE_TERMCAP */
  	if(!(env = getenv("TERM")) || !*env) {
  		env = "xterm";
  		if(SHELL_BOURNE == shell_type)
--- 323,330 ----
  		    myname, env);
  	    exit(1);
  	}
! #endif /* USE_TERMCAP */
! #ifdef USE_TERMINFO
  	if(!(env = getenv("TERM")) || !*env) {
  		env = "xterm";
  		if(SHELL_BOURNE == shell_type)
***************
*** 300,306 ****
  			setname = "TERM=xterm;\nexport TERM;\n";
  		else	setname = "setenv TERM xterm;\n";
  	}
! #endif	/* USE_TERMCAP */
  
  #ifdef USE_SYSV_TERMIO
  	ioctl (tty, TCGETA, &tioorig);
--- 331,337 ----
  			setname = "TERM=xterm;\nexport TERM;\n";
  		else	setname = "setenv TERM xterm;\n";
  	}
! #endif	/* USE_TERMINFO */
  
  #ifdef USE_SYSV_TERMIO
  	ioctl (tty, TCGETA, &tioorig);
***************
*** 415,428 ****
  	if(SHELL_BOURNE == shell_type) {
  
  #ifdef USE_TERMCAP
! 		printf ("%sTERMCAP='%s'\n",
  		 setname, termcap);
! #else /* else not USE_TERMCAP */
  #ifndef SVR4
  		printf ("%sCOLUMNS=%d;\nLINES=%d;\nexport COLUMNS LINES;\n",
  			setname, cols, rows);
  #endif /* !SVR4 */
! #endif	/* USE_SYSV_TERMCAP */
  
  	} else {		/* not Bourne shell */
  
--- 446,460 ----
  	if(SHELL_BOURNE == shell_type) {
  
  #ifdef USE_TERMCAP
! 		printf ("%sTERMCAP='%s';\n",
  		 setname, termcap);
! #endif /* USE_TERMCAP */
! #ifdef USE_TERMINFO
  #ifndef SVR4
  		printf ("%sCOLUMNS=%d;\nLINES=%d;\nexport COLUMNS LINES;\n",
  			setname, cols, rows);
  #endif /* !SVR4 */
! #endif	/* USE_TERMINFO */
  
  	} else {		/* not Bourne shell */
  
***************
*** 429,440 ****
  #ifdef USE_TERMCAP
  		printf ("set noglob;\n%ssetenv TERMCAP '%s';\nunset noglob;\n",
  		 setname, termcap);
! #else /* else not USE_TERMCAP */
  #ifndef SVR4
  		printf ("set noglob;\n%ssetenv COLUMNS '%d';\nsetenv LINES '%d';\nunset noglob;\n",
  			setname, cols, rows);
  #endif /* !SVR4 */
! #endif	/* USE_TERMCAP */
  	}
  	exit(0);
  }
--- 461,473 ----
  #ifdef USE_TERMCAP
  		printf ("set noglob;\n%ssetenv TERMCAP '%s';\nunset noglob;\n",
  		 setname, termcap);
! #endif /* USE_TERMCAP */
! #ifdef USE_TERMINFO
  #ifndef SVR4
  		printf ("set noglob;\n%ssetenv COLUMNS '%d';\nsetenv LINES '%d';\nunset noglob;\n",
  			setname, cols, rows);
  #endif /* !SVR4 */
! #endif	/* USE_TERMINFO */
  	}
  	exit(0);
  }
***************
*** 475,486 ****
  {
  	register int last, c;
  	SIGNAL_T timeout();
! #ifndef USG
  	struct itimerval it;
  #endif
  
  	signal(SIGALRM, timeout);
! #ifdef USG
  	alarm (TIMEOUT);
  #else
  	bzero((char *)&it, sizeof(struct itimerval));
--- 508,520 ----
  {
  	register int last, c;
  	SIGNAL_T timeout();
! #if !defined(USG) && !defined(AMOEBA) && !defined(MINIX) && !defined(SCO)
! 	/* What is the advantage of setitimer() over alarm()? */
  	struct itimerval it;
  #endif
  
  	signal(SIGALRM, timeout);
! #if defined(USG) || defined(AMOEBA) || defined(MINIX) || defined(SCO)
  	alarm (TIMEOUT);
  #else
  	bzero((char *)&it, sizeof(struct itimerval));
***************
*** 499,505 ****
  	last = str[strlen(str) - 1];
  	while((*buf++ = getc(fp)) != last)
  	    ;
! #ifdef USG
  	alarm (0);
  #else
  	bzero((char *)&it, sizeof(struct itimerval));
--- 533,539 ----
  	last = str[strlen(str) - 1];
  	while((*buf++ = getc(fp)) != last)
  	    ;
! #if defined(USG) || defined(AMOEBA) || defined(MINIX) || defined(SCO)
  	alarm (0);
  #else
  	bzero((char *)&it, sizeof(struct itimerval));
diff -c xc/programs/xterm/screen.c:1.1.1.1 xc/programs/xterm/screen.c:3.0
*** xc/programs/xterm/screen.c:1.1.1.1	Mon Jan 30 17:45:43 1995
--- xc/programs/xterm/screen.c	Mon Jan 30 17:45:43 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   *	$XConsortium: screen.c,v 1.33 94/04/02 17:34:36 gildea Exp $
+  *	$XFree86: xc/programs/xterm/screen.c,v 3.0 1994/05/08 05:27:11 dawes Exp $
   */
  
  /*
***************
*** 43,48 ****
--- 44,53 ----
  #include <sys/termio.h>
  #include <sys/stream.h>			/* get typedef used in ptem.h */
  #include <sys/ptem.h>
+ #endif
+ 
+ #ifdef MINIX
+ #include <termios.h>
  #endif
  
  extern Char *calloc(), *malloc(), *realloc();
diff -c /dev/null xc/programs/xterm/ttysvr.c:3.1
*** /dev/null	Mon Jan 30 17:45:44 1995
--- xc/programs/xterm/ttysvr.c	Mon Jan 30 17:45:44 1995
***************
*** 0 ****
--- 1,536 ----
+ /* $XFree86: xc/programs/xterm/ttysvr.c,v 3.1 1994/08/31 04:57:22 dawes Exp $ */
+ /*
+  *
+  * ttysvr.c
+  *
+  * Simple tty server for xterm. Most of it is taken from Siebren's aterm.
+  *
+  * Author:
+  *	Leendert van Doorn, 1992
+  */
+ 
+ #include "ptyx.h"
+ #include "data.h"
+ #include "error.h"
+ #include <stdio.h>
+ 
+ extern char *ProgramName;
+ 
+ #ifdef AMOEBA
+ #include <sys/types.h>
+ #include <ailamoeba.h>
+ #include <signal.h>
+ #include <exception.h>
+ #include <thread.h>
+ #include <cmdreg.h>
+ #include <stdcom.h>
+ #include <stderr.h>
+ #include <limits.h>
+ #include <module/proc.h>
+ #include <file.h>
+ #include <fault.h>
+ #include <posix/termios.h>
+ #include <class/tios.h>
+ #include <server/tty/tty.h>
+ #include <module/name.h>
+ #include <module/rnd.h>
+ 
+ 
+ /*
+  * AIL stuff
+  */
+ #define SAME_ENDIAN(w)	(((w)&_AIL_ENDIAN) == (_ailword & _AIL_ENDIAN) )
+ 
+ extern char *tc_marshal();
+ extern char *tc_unmarshal();
+ extern void millisleep();
+ 
+ #define	CTRL(c)		((c) & 0x1f)
+ 
+ /*
+  * Tty input data structure.
+  * This is a separate buffer in which the edited line is built.
+  */
+ static char tty_line[_POSIX_MAX_CANON+1];
+ static char *tty_ptr;
+ static int tty_left;
+ 
+ /*
+  * A global flags which denotes whether we're busy with exiting. This
+  * prevents two cleanups to be running (one from ttythread, and one
+  * from the main stream code as a result of a failed _XAmSelect).
+  */
+ int exiting = False;
+ 
+ /*
+  * Mutexes to prevent concurrent reads/writes
+  */
+ static mutex read_mutex;
+ static mutex write_mutex;
+ 
+ port ttyport;
+ capability ttycap;
+ capability ttyintcap;
+ struct termios tios;
+ 
+ /*
+  * Initialize the TTY structures.
+  * Publish the tty capability when a name is provided.
+  */
+ void
+ ttyinit(name)
+     char *name;
+ {
+     mu_init(&read_mutex);
+     mu_init(&write_mutex);
+ 
+     uniqport(&ttyport);
+     priv2pub(&ttyport, &ttycap.cap_port);
+ 
+     if (name != NULL) {
+ 	errstat err;
+ 	(void) name_delete(name);
+ 	if ((err = name_append(name, &ttycap)) != STD_OK) {
+ 	    fprintf(stderr, "%s: cannot append %s: %s\n",
+ 		ProgramName, name, err_why(err));
+ 	    Exit(1);
+ 	}
+     }
+ 
+     tios.c_iflag = ICRNL | IXON;
+     tios.c_oflag = OPOST;
+     tios.c_cflag = CREAD | CS8 | B9600;
+     tios.c_lflag = ECHO | ECHOE | ECHOK | ICANON | ISIG;
+ 
+     tios.c_cc[VEOF] = CTRL('D');
+     tios.c_cc[VEOL] = _POSIX_VDISABLE;
+     tios.c_cc[VERASE] = CTRL('H');
+     tios.c_cc[VINTR] = CTRL('C');
+     tios.c_cc[VKILL] = CTRL('U');
+     tios.c_cc[VMIN] = 1;
+     tios.c_cc[VQUIT] = CTRL('\\');
+     tios.c_cc[VSUSP] = _POSIX_VDISABLE;
+     tios.c_cc[VTIME] = 0;
+     tios.c_cc[VSTART] = CTRL('Q');
+     tios.c_cc[VSTOP] = CTRL('S');
+ }
+ 
+ /* ARGSUSED */
+ static void
+ ttycatcher(sig, us, extra)
+     signum sig;
+     thread_ustate *us;
+     char *extra;
+ {
+     *((int *)extra) = True;
+ }
+ 
+ void
+ ttythread()
+ {
+     TScreen *screen = &term->screen;
+     struct circbuf *iq, *oq;
+     header hdr;
+     char *buf;
+     int n, cause, detail;
+     int signalled;
+     struct termios ttios;
+ 
+     oq = screen->tty_outq;
+     iq = screen->tty_inq;
+     buf = (char *)malloc(BUFSIZ);
+     if (buf == (char *)NULL) {
+ 	fprintf(stderr, "%s:  cannot malloc tty server buffer.\n",
+ 		ProgramName);
+ 	Exit(1);
+     }
+ 
+     sig_catch((signum) SIG_TRANS, ttycatcher, (char *) &signalled);
+     for (;;) {
+ 	if (exiting) { /* shell disappeared */
+ 	    if (cause == TERM_STUNNED)
+ 		fprintf(stderr, "%s: stun code %d\n", ProgramName, detail);
+ 	    else if (cause == TERM_EXCEPTION)
+ 		fprintf(stderr, "%s: exception code %d\n", ProgramName, detail);
+ 	    else if (cause != TERM_NORMAL)
+ 		fprintf(stderr, "%s: termination cause %d, detail %d\n",
+ 		    ProgramName, cause, detail);
+ 	    Cleanup(0);
+ 	}
+ 
+ 	signalled = False;
+ 	do {
+ 	    hdr.h_port = ttyport;
+ 	    n = getreq(&hdr, (bufptr) buf, BUFSIZ);
+ 	} while (ERR_CONVERT(n) == RPC_ABORTED);
+ 	if (ERR_STATUS(n)) {
+ 	    fprintf(stderr, "%s:  get request failed (%s)\n",
+ 		ProgramName, err_why(ERR_CONVERT(n)));
+ 	    Cleanup(1);
+ 	}
+ 
+ 	switch (hdr.h_command) {
+ 	case FSQ_CREATE:
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case FSQ_READ:
+ 	    if (!(tios.c_cflag & CREAD)) {
+ 		hdr.h_status = STD_NOTNOW;
+ 		n = 0;
+ 		break;
+ 	    }
+ 	    while (!signalled) {
+ 		if (mu_trylock(&read_mutex, -1) < 0)
+ 		    continue;
+ 		hdr.h_size = ttycanonread(buf, (int)hdr.h_size, &signalled);
+ 		hdr.h_extra = tty_left > 0 ? FSE_MOREDATA : FSE_NOMOREDATA;
+ 		mu_unlock(&read_mutex);
+ 		break;
+ 	    }
+ 	    n = hdr.h_size;
+ 	    hdr.h_status = signalled ? STD_INTR : STD_OK;
+ 	    break;
+ 	case FSQ_WRITE:
+ 	    mu_lock(&write_mutex);
+ 	    n = ttywrite(buf, n);
+ 	    mu_unlock(&write_mutex);
+ 	    hdr.h_size = n;
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case TTQ_CLOSE:
+ 	case TTQ_STATUS:
+ 	case TTQ_CONTROL:
+ 	case TTQ_TIME_READ:
+ 	    hdr.h_status = STD_COMBAD;
+ 	    n = 0;
+ 	    break;
+ 	case TIOS_SETATTR:
+ 	    (void) tc_unmarshal(buf, &ttios, SAME_ENDIAN(hdr.h_size));
+ 	    if (tios_check(&ttios)) {
+ 		hdr.h_status = STD_OK;
+ 		tios = ttios;
+ 	    } else
+ 		hdr.h_status = STD_ARGBAD;
+ 	    n = 0;
+ 	    break;
+ 	case TIOS_GETATTR:
+ 	    n = tc_marshal(buf, tios, SAME_ENDIAN(hdr.h_extra)) - buf;
+ 	    hdr.h_status = STD_OK;
+ 	    break;
+ 	case TIOS_SENDBREAK:
+ 	case TIOS_DRAIN:
+ 	case TIOS_FLUSH:
+ 	case TIOS_FLOW:
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case TIOS_GETWSIZE:
+ 	    hdr.h_extra = screen->max_col + 1;
+ 	    hdr.h_size = screen->max_row + 1;
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case STD_AGE:
+ 	case STD_COPY:
+ 	case STD_RESTRICT:
+ 	    hdr.h_status = STD_COMBAD;
+ 	    n = 0;
+ 	    break;
+ 	case STD_TOUCH:
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case STD_DESTROY:
+ 	    hdr.h_status = STD_DENIED;
+ 	    n = 0;
+ 	    break;
+ 	case STD_INFO:
+ 	    hdr.h_status = STD_OK;
+ 	    strcpy(buf, "+ Xterm tty server");
+ 	    n = strlen(buf);
+ 	    break;
+ 	case PS_CHECKPOINT:
+ 	    exiting = True;
+ 	    cb_putc(oq, '\0');
+ 	    WakeupMainThread();
+ 	    cause = hdr.h_extra;
+ 	    detail = hdr.h_offset;
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case PS_SWAPPROC:
+ 	    hdr.h_status = STD_OK;
+ 	    n = 0;
+ 	    break;
+ 	case TTQ_INTCAP:
+ 	    if (n == sizeof(capability))  {
+ 		hdr.h_status = STD_OK;
+ 		bcopy(buf, (char *)&ttyintcap, sizeof(capability));
+ 	    } else
+ 		hdr.h_status = STD_ARGBAD;
+ 	    n = 0;
+ 	    break;
+ 	default:
+ 	    hdr.h_status = STD_COMBAD;
+ 	    n = 0;
+ 	}
+ 	putrep(&hdr, (bufptr) buf, n);
+     }
+ }
+ 
+ int
+ tios_check(tp)
+     struct termios *tp;
+ {
+     register int i, j;
+ 
+     /*
+      * Check that all chars in th c_cc array are
+      * different, except VTIME and VMIN
+      */
+     for (i = 0; i < sizeof(tp->c_cc); ++i) {
+ 	if (i != VTIME && i != VMIN) for (j = 0; j < i; ++j)
+ 	    if (j != VTIME && j != VMIN &&
+ 	      tp->c_cc[i] == tp->c_cc[j] && tp->c_cc[i] != _POSIX_VDISABLE)
+ 		return False;
+     }
+ 
+     /* cannot change byte size */
+     if ((tp->c_cflag & CSIZE) != CS8)
+ 	return False;
+     return True;
+ }
+ 
+ void
+ erasechar(oq, n, echo)
+     struct circbuf *oq;
+     int n, echo;
+ {
+     register int rcol;
+ 
+     if (!echo) return;
+     if (n > 0) {
+ 	rcol = n - 1;
+ 	cb_putc(oq, '\b');
+ 	if (tios.c_lflag & ECHOE)
+ 	    cb_puts(oq, " \b", 2);
+     } else
+ 	cb_putc(oq, CTRL('G'));
+     WakeupMainThread();
+ }
+ 
+ void
+ linekill(oq, n, echo)
+     struct circbuf *oq;
+     int n, echo;
+ {
+     register int rcol;
+ 
+     if (!echo) return;
+     if (n > 0) {
+ 	for (rcol = n-1; rcol >= 0; rcol--) {
+ 	    cb_putc(oq, '\b');
+ 	    if (tios.c_lflag & ECHOK)
+ 		cb_puts(oq, " \b", 2);
+ 	}
+     } else
+ 	cb_putc(oq, CTRL('G'));
+     WakeupMainThread();
+ }
+ 
+ /*
+  * Canonize
+  */
+ #define ISSET(t, flag)	(((t).c_lflag & flag) != 0)
+ 
+ void
+ canonize(signalled)
+     int *signalled;
+ {
+     TScreen *screen = &term->screen;
+     struct circbuf *iq, *oq;
+     int ch, n;
+     int stop;
+     
+     n = 0;
+     oq = screen->tty_outq;
+     iq = screen->tty_inq;
+ 
+     for (stop = False; !stop; ) {
+ 	/* get a character, depending on canonisation */
+ 	if (!ISSET(tios, ICANON)) {
+ 	    /*
+ 	     * No canonization
+ 	     */
+ 	    int time = tios.c_cc[VTIME] * 100; /* inter-byte delay (in msec) */
+ 
+ 	    ch = time ? cb_trygetc(iq, time) : cb_trygetc(iq, -1);
+ 	    if (ch < 0 || *signalled)
+ 		break;
+ 	} else {
+ 	    /*
+ 	     * Canonized input
+ 	     */
+ 	    ch = cb_trygetc(iq, -1);
+ 	    if (ch == -1)
+ 		break;
+ 	}
+ 
+ 	/* ICANON may have changed while we waited for the first character */
+ 	if (!ISSET(tios, ICANON)) {
+ 	    int min = tios.c_cc[VMIN]; /* minimum characters to read */
+ 
+ 	    if (ISSET(tios, ECHO)) cb_putc(oq, ch);
+ 	    tty_line[n++] = ch;
+ 	    if (n >= sizeof(tty_line) || (min > 0 && n >= min))
+ 		break;
+ 	} else {
+ 	    if (tios.c_iflag & ISTRIP) ch &= 0x7f;
+ 	    if (ch == tios.c_cc[VEOF]) {
+ 		stop = True;
+ 	    } else if (ch == tios.c_cc[VERASE]) {
+ 		/* erase a single character */
+ 		erasechar(oq, n, ISSET(tios, ECHO));
+ 		if (n != 0) n--;
+ 	    } else if (ch == tios.c_cc[VKILL]) {
+ 		/* erase a whole line */
+ 		linekill(oq, n, ISSET(tios, ECHO));
+ 		n = 0;
+ 	    } else {
+ 		if (n > sizeof(tty_line)) {
+ 		    cb_putc(oq, CTRL('G'));
+ 		    continue;
+ 		}
+ 		if (ch == '\r' || ch == '\n' || ch == tios.c_cc[VEOL]) {
+ 		    if (tios.c_iflag & ICRNL)
+ 			ch = '\n';
+ 		    else if (tios.c_iflag & INLCR)
+ 			ch = '\r';
+ 		    if (ch == '\n' && tios.c_iflag & ICRNL)
+ 			cb_putc(oq, '\r');
+ 		    stop = True;
+ 		}
+ 		if (ISSET(tios, ECHO)) cb_putc(oq, ch);
+ 		tty_line[n++] = ch;
+ 	    }
+ 	}
+     }
+     if (ISSET(tios, ECHO)) WakeupMainThread();
+     tty_left = n;
+     tty_ptr = tty_line;
+ }
+ 
+ /*
+  * Canonized tty read
+  */
+ int
+ ttycanonread(buf, size, signalled)
+     char *buf;
+     size_t size;
+     int *signalled;
+ {
+     if (tty_left == 0)
+ 	canonize(signalled);
+     if (size > tty_left)
+ 	size = tty_left;
+     strncpy(buf, tty_ptr, size);
+     tty_ptr += size;
+     tty_left -= size;
+     return size;
+ }
+ 
+ /*
+  * Write data to tty
+  */
+ int
+ ttywrite(buf, size)
+     char *buf;
+     int size;
+ {
+     TScreen *screen = &term->screen;
+     struct circbuf *oq;
+     int ch, i;
+ 
+     oq = screen->tty_outq;
+     for (i = 0; i < size; i++) {
+ 	if ((ch = buf[i]) == '\n' && tios.c_iflag & ICRNL)
+ 	    cb_putc(oq, '\r');
+ 	cb_putc(oq, ch);
+ 	if (ch == '\n') {
+ 	    /* Provide a wakeup for each line.  Otherwise the circular buffer
+ 	     * could be filled (thus blocking us) without the main thread
+ 	     * knowing it can already process some data.
+ 	     */
+ 	    WakeupMainThread();
+ 	}
+     }
+     WakeupMainThread();
+     return size;
+ }
+ 
+ static void
+ flush_read()
+ {
+     TScreen *screen = &term->screen;
+     struct circbuf *iq;
+     char *p;
+     int n;
+ 
+     iq = screen->tty_inq;
+     cb_putc(iq, '\n');
+     mu_lock(&read_mutex);
+     while ((n = cb_getp(iq, &p, 0/*don't block*/)) > 0)
+ 	cb_getpdone(iq, n);
+     tty_left = 0;
+     mu_unlock(&read_mutex);
+     WakeupMainThread();
+ }
+ 
+ /*
+  * Before characters are pushed onto the input stream of the shell
+  * process some of them may need some pre-processing. For example,
+  * interrupt should be processed as soon as possible to obtain the
+  * desired effect. This routine deals with key strokes that have
+  * such special properties.
+  */
+ int
+ ttypreprocess(ch)
+     int ch;
+ {
+     if ((tios.c_lflag & ISIG) && ch == tios.c_cc[VQUIT]) {
+ 	if (!(tios.c_lflag & NOFLSH)) flush_read();
+ 	ttysendsig(SIGQUIT);
+ 	return 1;
+     }
+     if ((tios.c_lflag & ISIG) && ch == tios.c_cc[VINTR]) {
+ 	if (!(tios.c_lflag & NOFLSH)) flush_read();
+ 	ttysendsig(SIGINT);
+ 	return 1;
+     }
+     return 0;
+ }
+ 
+ /*
+  * Send Unix signal to shell
+  */
+ ttysendsig(sig)
+     int sig;
+ {
+     header hdr;
+     long tout;
+ 
+     if (!(tios.c_lflag & ISIG))
+ 	return;
+     if (NULLPORT(&ttyintcap.cap_port))
+ 	return;
+     hdr.h_port = ttyintcap.cap_port;
+     hdr.h_priv = ttyintcap.cap_priv;
+     hdr.h_extra = sig;
+     hdr.h_command = TTI_SIGNAL;
+     tout = timeout(2000L);
+     trans(&hdr, NILBUF, 0, &hdr, NILBUF, 0);
+     timeout(tout);
+ }
+ #endif /* AMOEBA */
diff -c xc/include/Imakefile:1.1.1.2 xc/include/Imakefile:3.1
*** xc/include/Imakefile:1.1.1.2	Mon Jan 30 17:45:50 1995
--- xc/include/Imakefile	Mon Jan 30 17:45:50 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.86 94/11/21 18:19:48 kaleb Exp $
+ XCOMM $XFree86: xc/include/Imakefile,v 3.1 1995/01/28 15:42:02 dawes Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags /**/
  
diff -c xc/include/Xfuncs.h:1.1.1.2 xc/include/Xfuncs.h:3.2
*** xc/include/Xfuncs.h:1.1.1.2	Mon Jan 30 17:45:51 1995
--- xc/include/Xfuncs.h	Mon Jan 30 17:45:51 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Xfuncs.h,v 1.16 94/12/01 16:25:53 kaleb Exp $
+  * $XFree86: xc/include/Xfuncs.h,v 3.2 1995/01/28 15:42:03 dawes Exp $
   * 
   * 
  Copyright (c) 1990  X Consortium
***************
*** 54,63 ****
--- 55,70 ----
  void bcopy();
  #define bzero(b,len) memset(b, 0, len)
  #define bcmp(b1,b2,len) memcmp(b1, b2, len)
+ #else
+ #ifdef __EMX__
+ #include <strings.h>
+ #define _XFUNCS_H_INCLUDED_STRING_H
+ /* bcopy, bcmp, bzero declared */
  #else /* bsd */
  void bcopy();
  void bzero();
  int bcmp();
+ #endif
  #endif /* SYSV */
  #endif /* sgi */
  #endif /* __STDC__ and relatives */
diff -c xc/include/Xos.h:1.1.1.2 xc/include/Xos.h:3.9
*** xc/include/Xos.h:1.1.1.2	Mon Jan 30 17:45:51 1995
--- xc/include/Xos.h	Mon Jan 30 17:45:51 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Xos.h,v 1.67 94/11/30 20:48:05 kaleb Exp $
+  * $XFree86: xc/include/Xos.h,v 3.9 1995/01/28 15:42:04 dawes Exp $
   * 
   * 
  Copyright (c) 1987  X Consortium
***************
*** 67,72 ****
--- 68,80 ----
   * need to have #defines here.
   */
  
+ #ifdef MINIX
+ /* Prevent accidents with struct members called 'index' */
+ #include <string.h>
+ #define index(s,c) (strchr((s),(c)))
+ #define rindex(s,c) (strrchr((s),(c)))
+ #endif
+ 
  #ifndef X_NOT_STDC_ENV
  
  #include <string.h>
***************
*** 189,195 ****
--- 197,212 ----
  #ifdef _SEQUENT_
  #include <time.h>
  #else /* _SEQUENT_ */
+ #ifdef AMOEBA
+ #include <time.h>
+ #include <sys/time.h>
+ #else /* AMOEBA */
+ #ifdef MINIX
+ #include <time.h>
+ #else /* !MINIX */
  #include <sys/time.h>
+ #endif /* MINIX */
+ #endif /* AMOEBA */
  #endif /* _SEQUENT_ */
  #endif /* WIN32 else */
  #endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
***************
*** 203,215 ****
  #define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
  #endif
  
  /* use POSIX name for signal */
! #if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD)
  #define SIGCHLD SIGCLD
  #endif
  
  #ifdef ISC
  #include <sys/bsdtypes.h>
  #endif
  
  #endif /* _XOS_H_ */
--- 220,280 ----
  #define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
  #endif
  
+ #ifdef MINIX
+ #include <errno.h>
+ #include <net/gen/in.h>
+ #include <net/gen/socket.h>
+ #include <net/gen/udp.h>
+ #include <net/gen/udp_hdr.h>
+ 
+ struct sockaddr
+ {
+ 	u16_t sa_family;
+ 	char sa_data[14];
+ };
+ 
+ struct sockaddr_in
+ {
+ 	u16_t sin_family;
+ 	u16_t sin_port;
+ 	struct
+ 	{
+ 		ipaddr_t s_addr;
+ 	} sin_addr;
+ 	char sin_zero[8];
+ };
+ 
+ struct in_addr
+ {
+ 	ipaddr_t s_addr;
+ };
+ 
+ typedef char *caddr_t;
+ typedef unsigned char u_char;
+ #endif /* MINIX */
+ 
  /* use POSIX name for signal */
! #if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) && !defined(ISC)
  #define SIGCHLD SIGCLD
  #endif
  
  #ifdef ISC
  #include <sys/bsdtypes.h>
+ #include <sys/limits.h>
+ #define NGROUPS 16
+ #endif
+ 
+ #if defined(SCO) || defined(ISC)
+ /*
+  *	Some OS's may not have this
+  */
+ 
+ #define X_NO_SYS_UN 1
+ 
+ struct sockaddr_un {
+ 	short	sun_family;
+ 	char	sun_path[108];
+ };
  #endif
  
  #endif /* _XOS_H_ */
diff -c xc/include/Xosdefs.h:1.1.1.2 xc/include/Xosdefs.h:3.7
*** xc/include/Xosdefs.h:1.1.1.2	Mon Jan 30 17:45:52 1995
--- xc/include/Xosdefs.h	Mon Jan 30 17:45:52 1995
***************
*** 2,7 ****
--- 2,8 ----
   * O/S-dependent (mis)feature macro definitions
   *
   * $XConsortium: Xosdefs.h,v 1.14 94/11/30 20:48:05 kaleb Exp $
+  * $XFree86: xc/include/Xosdefs.h,v 3.7 1995/01/28 15:42:05 dawes Exp $
   *
  Copyright (c) 1991  X Consortium
  
***************
*** 81,87 ****
--- 82,90 ----
  
  #ifdef i386
  #ifdef SYSV
+ #ifndef SCO
  #define X_NOT_POSIX
+ #endif
  #define X_NOT_STDC_ENV
  #endif
  #endif
***************
*** 108,113 ****
--- 111,120 ----
  #if defined(nec_ews_svr2) || defined(SX) || defined(PC_UX)
  #define X_NOT_POSIX
  #define X_NOT_STDC_ENV
+ #endif
+ 
+ #ifdef __EMX__
+ #define USGISH
  #endif
  
  #endif /* _XOSDEFS_H_ */
diff -c xc/include/extensions/Imakefile:1.1.1.1 xc/include/extensions/Imakefile:3.0
*** xc/include/extensions/Imakefile:1.1.1.1	Mon Jan 30 17:45:59 1995
--- xc/include/extensions/Imakefile	Mon Jan 30 17:45:59 1995
***************
*** 1,8 ****
  XCOMM $XConsortium: Imakefile,v 1.37 94/04/07 15:03:02 rws Exp $
  
  HEADERS = Xext.h multibuf.h shape.h XShm.h MITMisc.h XI.h XInput.h XIproto.h \
  	XTest.h xtestext1.h XIE.h XIEproto.h XIEprotost.h \
! 	sync.h XKB.h XKBproto.h XKBstr.h
  
  all::
  
--- 1,13 ----
  XCOMM $XConsortium: Imakefile,v 1.37 94/04/07 15:03:02 rws Exp $
+ XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.0 1994/06/28 12:18:35 dawes Exp $
  
+ #if BuildExtraExtensionLibrary
+ EXTRAHEADERS = saver.h saverproto.h scrnsaver.h
+ #endif
+ 
  HEADERS = Xext.h multibuf.h shape.h XShm.h MITMisc.h XI.h XInput.h XIproto.h \
  	XTest.h xtestext1.h XIE.h XIEproto.h XIEprotost.h \
! 	sync.h XKB.h XKBproto.h XKBstr.h $(EXTRAHEADERS)
  
  all::
  
diff -c /dev/null xc/include/extensions/saver.h:3.0
*** /dev/null	Mon Jan 30 17:46:00 1995
--- xc/include/extensions/saver.h	Mon Jan 30 17:46:00 1995
***************
*** 0 ****
--- 1,54 ----
+ /*
+  * $XConsortium: saver.h,v 1.5 94/04/17 20:59:33 rws Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #ifndef _SAVER_H_
+ #define _SAVER_H_
+ 
+ #define ScreenSaverName	"MIT-SCREEN-SAVER"
+ #define ScreenSaverPropertyName "_MIT_SCREEN_SAVER_ID"
+ 
+ #define ScreenSaverNotifyMask	0x00000001
+ #define ScreenSaverCycleMask	0x00000002
+ 
+ #define ScreenSaverMajorVersion	1
+ #define ScreenSaverMinorVersion	0
+ 
+ #define ScreenSaverOff		0
+ #define ScreenSaverOn		1
+ #define ScreenSaverCycle	2
+ #define ScreenSaverDisabled	3
+ 
+ #define ScreenSaverBlanked	0
+ #define ScreenSaverInternal	1
+ #define ScreenSaverExternal	2
+ 
+ #define ScreenSaverNotify	0
+ #define ScreenSaverNumberEvents	1
+ 
+ #endif /* _SAVER_H_ */
diff -c /dev/null xc/include/extensions/saverproto.h:3.0
*** /dev/null	Mon Jan 30 17:46:00 1995
--- xc/include/extensions/saverproto.h	Mon Jan 30 17:46:00 1995
***************
*** 0 ****
--- 1,140 ----
+ /*
+  * $XConsortium: saverproto.h,v 1.5 94/04/17 20:59:33 keith Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #ifndef _SAVERPROTO_H_
+ #define _SAVERPROTO_H_
+ #include "saver.h"
+ 
+ #define X_ScreenSaverQueryVersion   0
+ 
+ typedef struct _ScreenSaverQueryVersion {
+     CARD8 reqType;		/* always ScreenSaverReqCode */
+     CARD8 saverReqType;		/* always X_ScreenSaverQueryVersion */
+     CARD16 length B16;
+     CARD8 clientMajor;
+     CARD8 clientMinor;
+     CARD16 unused B16;	
+ } xScreenSaverQueryVersionReq;
+ #define sz_xScreenSaverQueryVersionReq	8
+ 
+ typedef struct {
+     CARD8 type;			/* X_Reply */
+     CARD8 unused;			/* not used */
+     CARD16 sequenceNumber B16;
+     CARD32 length B32;
+     CARD16 majorVersion B16;	/* major version of protocol */
+     CARD16 minorVersion B16;	/* minor version of protocol */
+     CARD32 pad0 B32;
+     CARD32 pad1 B32;
+     CARD32 pad2 B32;
+     CARD32 pad3 B32;
+     CARD32 pad4 B32;
+ } xScreenSaverQueryVersionReply;
+ #define sz_xScreenSaverQueryVersionReply	32
+ 
+ #define X_ScreenSaverQueryInfo   1
+ 
+ typedef struct _ScreenSaverQueryInfo {
+     CARD8 reqType;		/* always ScreenSaverReqCode */
+     CARD8 saverReqType;		/* always X_ScreenSaverQueryInfo */
+     CARD16 length B16;
+     Drawable drawable B32;
+ } xScreenSaverQueryInfoReq;
+ #define sz_xScreenSaverQueryInfoReq	8
+ 
+ typedef struct {
+     CARD8 type;			/* X_Reply */
+     BYTE state;			/* Off, On */
+     CARD16 sequenceNumber B16;
+     CARD32 length B32;
+     Window window B32;
+     CARD32 tilOrSince B32;
+     CARD32 idle B32;
+     CARD32 eventMask B32;
+     BYTE kind;			/* Blanked, Internal, External */
+     CARD8 pad0;
+     CARD16 pad1 B16;
+     CARD32 pad2 B32;
+ } xScreenSaverQueryInfoReply;
+ #define sz_xScreenSaverQueryInfoReply	32
+ 
+ #define X_ScreenSaverSelectInput   2
+ 
+ typedef struct _ScreenSaverSelectInput {
+     CARD8 reqType;		/* always ScreenSaverReqCode */
+     CARD8 saverReqType;		/* always X_ScreenSaverSelectInput */
+     CARD16 length B16;
+     Drawable drawable B32;
+     CARD32 eventMask B32;
+ } xScreenSaverSelectInputReq;
+ #define sz_xScreenSaverSelectInputReq	12
+ 
+ #define X_ScreenSaverSetAttributes   3
+ 
+ typedef struct _ScreenSaverSetAttributes {
+     CARD8 reqType;		/* always ScreenSaverReqCode */
+     CARD8 saverReqType;		/* always X_ScreenSaverSetAttributes */
+     CARD16 length B16;
+     Drawable drawable B32;
+     INT16 x B16, y B16;
+     CARD16 width B16, height B16, borderWidth B16;
+     BYTE c_class;
+     CARD8 depth;
+     VisualID visualID B32;
+     CARD32 mask B32;
+ } xScreenSaverSetAttributesReq;
+ #define sz_xScreenSaverSetAttributesReq	28
+ 
+ #define X_ScreenSaverUnsetAttributes   4
+ 
+ typedef struct _ScreenSaverUnsetAttributes {
+     CARD8 reqType;		/* always ScreenSaverReqCode */
+     CARD8 saverReqType;		/* always X_ScreenSaverUnsetAttributes */
+     CARD16 length B16;
+     Drawable drawable B32;
+ } xScreenSaverUnsetAttributesReq;
+ #define sz_xScreenSaverUnsetAttributesReq	8
+ 
+ typedef struct _ScreenSaverNotify {
+     CARD8 type;			/* always eventBase + ScreenSaverNotify */
+     BYTE state;			/* off, on, cycle */
+     CARD16 sequenceNumber B16;
+     Time timestamp B32;
+     Window root B32;
+     Window window B32;		/* screen saver window */
+     BYTE kind;			/* blanked, internal, external */
+     BYTE forced;
+     CARD16 pad0 B16;
+     CARD32 pad1 B32;
+     CARD32 pad2 B32;
+     CARD32 pad3 B32;
+ } xScreenSaverNotifyEvent;
+ #define sz_xScreenSaverNotifyEvent	32
+ 
+ #endif /* _SAVERPROTO_H_ */
diff -c /dev/null xc/include/extensions/scrnsaver.h:3.0
*** /dev/null	Mon Jan 30 17:46:00 1995
--- xc/include/extensions/scrnsaver.h	Mon Jan 30 17:46:00 1995
***************
*** 0 ****
--- 1,149 ----
+ /*
+  * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #ifndef _SCRNSAVER_H_
+ #define _SCRNSAVER_H_
+ 
+ #include <X11/Xfuncproto.h>
+ #include <X11/extensions/saver.h>
+ 
+ typedef struct {
+     int	type;		    /* of event */
+     unsigned long serial;   /* # of last request processed by server */
+     Bool send_event;	    /* true if this came frome a SendEvent request */
+     Display *display;	    /* Display the event was read from */
+     Window window;	    /* screen saver window */
+     Window root;	    /* root window of event screen */
+     int state;		    /* ScreenSaverOff, ScreenSaverOn, ScreenSaverCycle*/
+     int kind;		    /* ScreenSaverBlanked, ...Internal, ...External */
+     Bool forced;	    /* extents of new region */
+     Time time;		    /* event timestamp */
+ } XScreenSaverNotifyEvent;
+ 
+ typedef struct {
+     Window  window;	    /* screen saver window - may not exist */
+     int	    state;	    /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled*/
+     int	    kind;	    /* ScreenSaverBlanked, ...Internal, ...External */
+     unsigned long    til_or_since;   /* time til or since screen saver */
+     unsigned long    idle;	    /* total time since last user input */
+     unsigned long   eventMask; /* currently selected events for this client */
+ } XScreenSaverInfo;
+ 
+ _XFUNCPROTOBEGIN
+ 
+ extern Bool XScreenSaverQueryExtension (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     int*	/* event_base */,
+     int*	/* error_base */
+ #endif
+ );
+ 
+ extern Status XScreenSaverQueryVersion (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     int*	/* major_version */,
+     int*	/* minor_version */
+ #endif
+ );
+ 
+ extern XScreenSaverInfo *XScreenSaverAllocInfo (
+ #if NeedFunctionPrototypes
+     void
+ #endif
+ );
+ 
+ extern Status XScreenSaverQueryInfo (
+ #if NeedFunctionPrototypes
+     Display*		/* display */,
+     Drawable		/* drawable */,
+     XScreenSaverInfo*	/* info */
+ #endif
+ );
+ 
+ extern void XScreenSaverSelectInput (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     Drawable	/* drawable */,
+     unsigned long   /* eventMask */
+ #endif
+ );
+ 
+ extern void XScreenSaverSetAttributes (
+ #if NeedFunctionPrototypes
+     Display*		    /* display */,
+     Drawable		    /* drawable */,
+     int			    /* x */,
+     int			    /* y */,
+     unsigned int	    /* width */,
+     unsigned int	    /* height */,
+     unsigned int	    /* border_width */,
+     int			    /* depth */,
+     unsigned int	    /* class */,
+     Visual *		    /* visual */,
+     unsigned long	    /* valuemask */,
+     XSetWindowAttributes *  /* attributes */
+ #endif
+ );
+ 
+ extern void XScreenSaverUnsetAttributes (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     Drawable	/* drawable */
+ #endif
+ );
+ 
+ extern Status XScreenSaverRegister (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     int		/* screen */,
+     XID		/* xid */,
+     Atom	/* type */
+ #endif
+ );
+ 
+ extern Status XScreenSaverUnregister (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     int		/* screen */
+ #endif
+ );
+ 
+ extern Status XScreenSaverGetRegistered (
+ #if NeedFunctionPrototypes
+     Display*	/* display */,
+     int		/* screen */,
+     XID*	/* xid */,
+     Atom*	/* type */
+ #endif
+ );
+ 
+ _XFUNCPROTOEND
+ 
+ #endif /* _SCRNSAVER_H_ */
diff -c xc/include/fonts/Imakefile:1.1.1.2 xc/include/fonts/Imakefile:3.2
*** xc/include/fonts/Imakefile:1.1.1.2	Mon Jan 30 17:46:02 1995
--- xc/include/fonts/Imakefile	Mon Jan 30 17:46:02 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.5 95/01/23 15:46:52 kaleb Exp $
+ XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.2 1995/01/28 15:42:11 dawes Exp $
  
      HEADERS = FS.h FSproto.h fsmasks.h
  
diff -c xc/lib/Imakefile:1.1.1.1 xc/lib/Imakefile:3.1
*** xc/lib/Imakefile:1.1.1.1	Mon Jan 30 17:46:04 1995
--- xc/lib/Imakefile	Mon Jan 30 17:46:04 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $
+ XCOMM $XFree86: xc/lib/Imakefile,v 3.1 1994/07/24 11:40:22 dawes Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags
  
***************
*** 10,17 ****
  BERKDIR = Xbsd
  #endif
  
! LINTSUBDIRS = Xau Xdmcp X11 oldX ICE SM Xext Xt Xmu Xaw XIE Xi \
  	      Xtst FS PEX5
  
  SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) font
  
--- 11,26 ----
  BERKDIR = Xbsd
  #endif
  
! #if BuildExtraExtensionLibrary
! EXEXTLIB = XExExt
! #endif
! 
! #if BuildServersOnly
! LINTSUBDIRS = Xau Xdmcp
! #else
! LINTSUBDIRS = Xau Xdmcp X11 oldX ICE SM Xext $(EXEXTLIB) Xt Xmu Xaw XIE Xi \
  	      Xtst FS PEX5
+ #endif
  
  SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) font
  
diff -c xc/lib/FS/FSConnServ.c:1.1.1.1 xc/lib/FS/FSConnServ.c:3.3
*** xc/lib/FS/FSConnServ.c:1.1.1.1	Mon Jan 30 17:46:07 1995
--- xc/lib/FS/FSConnServ.c	Mon Jan 30 17:46:07 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: FSConnServ.c,v 1.26 94/04/17 20:15:10 dpw Exp $ */
+ /* $XFree86: xc/lib/FS/FSConnServ.c,v 3.3 1994/08/06 05:57:28 dawes Exp $ */
  
  /*
   * Copyright 1990 Network Computing Devices;
***************
*** 63,68 ****
--- 64,74 ----
  #define ECHECK(err) (errno == err)
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  /*
   * Attempts to connect to server, given server name. Returns transport
   * connection object or NULL if connection fails.
***************
*** 134,141 ****
--- 140,149 ----
      (void) _FSTransClose(trans_conn);
  }
  
+ #ifndef __NetBSD__
  #undef NULL
  #define NULL ((char *) 0)
+ #endif
  /*
   * This is an OS dependent routine which:
   * 1) returns as soon as the connection can be written on....
***************
*** 157,167 ****
--- 165,192 ----
  	BITSET(w_mask, svr->fd);
  
  	do {
+ #ifndef AMOEBA
  #ifdef WIN32
  	    nfound = select (0, &r_mask, &w_mask, NULL, NULL);
  #else
+ #ifdef FD_ZERO
+ 	    nfound = select(svr->fd + 1, (fd_set *) r_mask, (fd_set *) w_mask, NULL, NULL);
+ #else
  	    nfound = select(svr->fd + 1, r_mask, w_mask, NULL, NULL);
  #endif
+ #endif
+ #else /* AMOEBA */
+ 	    if (_FSTransAmSelect(svr->fd, 0) > 0) {
+ 		BITSET(r_mask, svr->fd);
+ 	    } else {
+ 		CLEARBITS(r_mask);
+ 	    }
+ 	    /* Always immediately writable because data is enqueued to be
+ 	     * written by separate virtual circuit threads.
+ 	     */
+ 	    nfound = 1;
+ 	    BITSET(w_mask, svr->fd);
+ #endif /* AMOEBA */
  	    if (nfound < 0 && !ECHECK(EINTR))
  		(*_FSIOErrorFunction) (svr);
  	} while (nfound <= 0);
***************
*** 218,227 ****
--- 243,264 ----
      CLEARBITS(r_mask);
      do {
  	BITSET(r_mask, svr->fd);
+ #ifndef AMOEBA
  #ifdef WIN32
  	result = select (0, &r_mask, NULL, NULL, NULL);
  #else
+ #ifdef FD_ZERO
+ 	result = select(svr->fd + 1, (fd_set *) r_mask, NULL, NULL, NULL);
+ #else
  	result = select(svr->fd + 1, r_mask, NULL, NULL, NULL);
+ #endif
+ #endif
+ #else
+ 	if ((result = _FSTransAmSelect(svr->fd, 0)) > 0) {
+ 	    BITSET(r_mask, svr->fd);
+ 	} else {
+ 	    CLEARBITS(r_mask);
+ 	}
  #endif
  	if (result == -1 && !ECHECK(EINTR))
  	    (*_FSIOErrorFunction) (svr);
diff -c xc/lib/FS/FSlibInt.c:1.1.1.1 xc/lib/FS/FSlibInt.c:3.0
*** xc/lib/FS/FSlibInt.c:1.1.1.1	Mon Jan 30 17:46:07 1995
--- xc/lib/FS/FSlibInt.c	Mon Jan 30 17:46:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: FSlibInt.c,v 1.16 94/04/17 20:15:21 gildea Exp $ */
+ /* $XFree86: xc/lib/FS/FSlibInt.c,v 3.0 1994/04/28 12:30:17 dawes Exp $ */
  
  /*
   * Copyright 1990 Network Computing Devices;
***************
*** 268,277 ****
--- 269,286 ----
      register long size;
  {
      register long bytes_read;
+ #if defined(SVR4) && defined(i386)
+     int	num_failed_reads = 0;
+ #endif
  
      if (size == 0)
  	return;
      ESET(0);
+     /*
+      * For SVR4 with a unix-domain connection, ETEST() after selecting
+      * readable means the server has died.  To do this here, we look for
+      * two consecutive reads returning ETEST().
+      */
      while ((bytes_read = _FSTransRead(svr->trans_conn, data, (int) size))
  	    != size) {
  
***************
*** 278,286 ****
--- 287,305 ----
  	if (bytes_read > 0) {
  	    size -= bytes_read;
  	    data += bytes_read;
+ #if defined(SVR4) && defined(i386)
+ 	    num_failed_reads = 0;
+ #endif
  	}
  	else if (ETEST()) {
  	    _FSWaitForReadable(svr);
+ #if defined(SVR4) && defined(i386)
+ 	    num_failed_reads++;
+ 	    if (num_failed_reads > 1) {
+ 		ESET(EPIPE);
+ 		(*_FSIOErrorFunction) (svr);
+ 	    }
+ #endif
  	    ESET(0);
  	}
  #ifdef SUNSYSV
***************
*** 297,302 ****
--- 316,325 ----
  	    /* If it's a system call interrupt, it's not an error. */
  	    if (!ECHECK(EINTR))
  		(*_FSIOErrorFunction) (svr);
+ #if defined(SVR4) && defined(i386)
+ 	    else
+ 		num_failed_reads = 0;
+ #endif
  	}
      }
  }
***************
*** 900,918 ****
  }
  
  
- static char *
- _SysErrorMsg(n)
-     int         n;
- {
- #ifndef WIN32
-     extern char *sys_errlist[];
-     extern int  sys_nerr;
- #endif
-     char       *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
- 
-     return (s ? s : "no such error");
- }
- 
  /*
   * _FSDefaultIOError - Default fatal system error reporting routine.  Called
   * when an X internal system error is encountered.
--- 923,928 ----
***************
*** 926,932 ****
  			WSAGetLastError(), strerror(WSAGetLastError()),
  #else
  
! 		   errno, _SysErrorMsg(errno),
  #endif
  		   FSServerString(svr));
      (void) fprintf(stderr,
--- 936,942 ----
  			WSAGetLastError(), strerror(WSAGetLastError()),
  #else
  
! 		   errno, strerror(errno),
  #endif
  		   FSServerString(svr));
      (void) fprintf(stderr,
diff -c xc/lib/FS/Imakefile:1.1.1.1 xc/lib/FS/Imakefile:3.0
*** xc/lib/FS/Imakefile:1.1.1.1	Mon Jan 30 17:46:08 1995
--- xc/lib/FS/Imakefile	Mon Jan 30 17:46:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.17 94/03/31 17:47:54 mor Exp $
+ XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.0 1994/08/06 05:57:29 dawes Exp $
  #define DoNormalLib NormalLibFS
  #define DoSharedLib SharedLibFS
  #define DoDebugLib DebugLibFS
***************
*** 36,43 ****
  
  #include <Library.tmpl>
  
! SpecialCObjectRule(FSlibInt,$(ICONFIGFILES),$(CONN_DEFINES))
! SpecialCObjectRule(FSConnServ,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES))
  SpecialCLibObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
  LinkSourceFile(transport.c,$(TRANSCOMMSRC))
  
--- 37,44 ----
  
  #include <Library.tmpl>
  
! SpecialCLibObjectRule(FSlibInt,$(ICONFIGFILES),$(CONN_DEFINES))
! SpecialCLibObjectRule(FSConnServ,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES))
  SpecialCLibObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
  LinkSourceFile(transport.c,$(TRANSCOMMSRC))
  
diff -c /dev/null xc/lib/ICE/ICEos2.def:3.0
*** /dev/null	Mon Jan 30 17:46:11 1995
--- xc/lib/ICE/ICEos2.def	Mon Jan 30 17:46:11 1995
***************
*** 0 ****
--- 1,67 ----
+ LIBRARY ICE
+ DESCRIPTION "X11R6 XFree86 libICE.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 IceAcceptConnection  @ 1
+ 	 IceAddConnectionWatch  @ 2
+ 	 IceAllocScratch  @ 3
+ 	 IceAppLockConn  @ 4
+ 	 IceAppUnlockConn  @ 5
+ 	 IceAuthFileName  @ 6
+ 	 IceCheckShutdownNegotiation  @ 7
+ 	 IceCloseConnection  @ 8
+ 	 IceComposeNetworkIdList  @ 9
+ 	 IceConnectionNumber  @ 10
+ 	 IceConnectionStatus  @ 11
+ 	 IceConnectionString  @ 12
+ 	 IceFlush  @ 13
+ 	 IceFreeAuthFileEntry  @ 14
+ 	 IceFreeListenObjs  @ 15
+ 	 IceGenerateMagicCookie  @ 16
+ 	 IceGetAuthFileEntry  @ 17
+ 	 IceGetConnectionContext  @ 18
+ 	 IceGetInBufSize  @ 19
+ 	 IceGetListenConnectionNumber  @ 20
+ 	 IceGetListenConnectionString  @ 21
+ 	 IceGetOutBufSize  @ 22
+ 	 IceInitThreads  @ 23
+ 	 IceLastReceivedSequenceNumber  @ 24
+ 	 IceLastSentSequenceNumber  @ 25
+ 	 IceListenForConnections  @ 26
+ 	 IceLockAuthFile  @ 27
+ 	 IceOpenConnection  @ 28
+ 	 IcePing  @ 29
+ 	 IceProcessMessages  @ 30
+ 	 IceProtocolRevision  @ 31
+ 	 IceProtocolSetup  @ 32
+ 	 IceProtocolShutdown  @ 33
+ 	 IceProtocolVersion  @ 34
+ 	 IceReadAuthFileEntry  @ 35
+ 	 IceRegisterForProtocolReply  @ 36
+ 	 IceRegisterForProtocolSetup  @ 37
+ 	 IceRelease  @ 38
+ 	 IceRemoveConnectionWatch  @ 39
+ 	 IceSetErrorHandler  @ 40
+ 	 IceSetHostBasedAuthProc  @ 41
+ 	 IceSetIOErrorHandler  @ 42
+ 	 IceSetPaAuthData  @ 43
+ 	 IceSetShutdownNegotiation  @ 44
+ 	 IceSwapping  @ 45
+ 	 IceUnlockAuthFile  @ 46
+ 	 IceVendor  @ 47
+ 	 IceWriteAuthFileEntry  @ 48
+ 	 _IceTransGetPeerAddr  @ 49
+ 	 _IceTransGetPeerNetworkId  @ 50
+ 	 _IceErrorBadMinor  @ 51
+ 	 _IceErrorBadLength  @ 52
+ 	 _IceErrorBadState  @ 53
+ 	 _IceErrorBadValue  @ 54
+ 	 _IcePaMagicCookie1Proc  @ 55
+ 	 _IcePoMagicCookie1Proc  @ 56
+ 	 _IceRead  @ 57
+ 	 _IceReadSkip  @ 58
+ 	 _IceWrite  @ 59
diff -c /dev/null xc/lib/ICE/ICEos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:46:12 1995
--- xc/lib/ICE/ICEos2.rsp	Mon Jan 30 17:46:12 1995
***************
*** 0 ****
--- 1,6 ----
+ accept.obj authutil.obj connect.obj error.obj getauth.obj iceauth.obj+
+ listen.obj locking.obj misc.obj ping.obj process.obj protosetup.obj+
+ register.obj replywait.obj setauth.obj shutdown.obj transport.obj+
+ watch.obj /NOL /NOD /BAT
+ ice.dll
+ 
diff -c xc/lib/ICE/Imakefile:1.1.1.1 xc/lib/ICE/Imakefile:3.0
*** xc/lib/ICE/Imakefile:1.1.1.1	Mon Jan 30 17:46:12 1995
--- xc/lib/ICE/Imakefile	Mon Jan 30 17:46:12 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.15 94/03/31 17:46:50 mor Exp $
+ XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.0 1994/10/20 06:02:06 dawes Exp $
  
  #define DoNormalLib NormalLibICE
  #define DoSharedLib SharedLibICE
***************
*** 8,13 ****
--- 9,17 ----
  #define SoRev SOICEREV
  #define IncSubdir ICE
  
+ #ifdef SharedICEReqs
+ REQUIREDLIBS = SharedICEReqs
+ #endif
  #if (SystemV || SystemV4) && !HasSockets
  CONN_DEFINES = -DTCPCONN -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
  #else
diff -c xc/lib/ICE/authutil.c:1.1.1.1 xc/lib/ICE/authutil.c:3.0
*** xc/lib/ICE/authutil.c:1.1.1.1	Mon Jan 30 17:46:13 1995
--- xc/lib/ICE/authutil.c	Mon Jan 30 17:46:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: authutil.c,v 1.14 94/04/17 20:15:31 mor Exp $ */
+ /* $XFree86: xc/lib/ICE/authutil.c,v 3.0 1994/10/20 06:02:08 dawes Exp $ */
  /******************************************************************************
  
  
***************
*** 35,41 ****
  #include <sys/stat.h>
  #include <errno.h>
  
! #ifdef X_NOT_STDC_ENV
  extern int errno;
  extern long time ();
  extern char *getenv();
--- 36,42 ----
  #include <sys/stat.h>
  #include <errno.h>
  
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  extern int errno;
  extern long time ();
  extern char *getenv();
***************
*** 43,48 ****
--- 44,53 ----
  #else
  #include <time.h>
  #define Time_t time_t
+ #ifdef __EMX__
+ extern char* getenv(const char*);
+ #define link rename
+ #endif
  #endif
  #ifndef X_NOT_POSIX
  #include <unistd.h>
***************
*** 77,83 ****
      static char	*buf;
      static int	bsize;
      int	    	size;
! #ifdef WIN32
      char    	dir[128];
  #endif
  
--- 82,88 ----
      static char	*buf;
      static int	bsize;
      int	    	size;
! #if defined(WIN32) || defined(__EMX__)
      char    	dir[128];
  #endif
  
***************
*** 97,102 ****
--- 102,112 ----
  	}
  	if (!name)
  #endif
+ #ifdef __EMX__
+ 	strcpy (dir,"c:");
+ 	name = dir;
+ 	if (!name)
+ #endif
  	return (NULL);
      }
  
***************
*** 113,120 ****
      }
  
      strcpy (buf, name);
      strcat (buf, "/.ICEauthority" + (name[1] == '\0' ? 1 : 0));
! 
      return (buf);
  }
  
--- 123,133 ----
      }
  
      strcpy (buf, name);
+ #ifdef __EMX__
+     strcat (buf, "/ICEauth." + (name[1] == '\0' ? 1 : 0));
+ #else
      strcat (buf, "/.ICEauthority" + (name[1] == '\0' ? 1 : 0));
! #endif
      return (buf);
  }
  
diff -c xc/lib/ICE/connect.c:1.1.1.2 xc/lib/ICE/connect.c:3.1
*** xc/lib/ICE/connect.c:1.1.1.2	Mon Jan 30 17:46:13 1995
--- xc/lib/ICE/connect.c	Mon Jan 30 17:46:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: connect.c,v 1.31 94/12/20 17:50:13 mor Exp $ */
+ /* $XFree86: xc/lib/ICE/connect.c,v 3.1 1995/01/27 04:44:45 dawes Exp $ */
  /******************************************************************************
  
  
***************
*** 427,432 ****
--- 428,436 ----
  
      if (iceConn && _IceWatchProcs)
      {
+ #ifdef MINIX
+     _IceTransSetOption(iceConn->trans_conn, TRANS_NONBLOCKING, 1);
+ #endif
  	/*
  	 * Notify the watch procedures that an iceConn was opened.
  	 */
diff -c xc/lib/ICE/iceauth.c:1.1.1.2 xc/lib/ICE/iceauth.c:3.1
*** xc/lib/ICE/iceauth.c:1.1.1.2	Mon Jan 30 17:46:14 1995
--- xc/lib/ICE/iceauth.c	Mon Jan 30 17:46:14 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: iceauth.c,v 1.21 94/12/20 16:49:58 mor Exp $ */
+ /* $XFree86: xc/lib/ICE/iceauth.c,v 3.1 1995/01/27 04:44:52 dawes Exp $ */
  /******************************************************************************
  
  
***************
*** 32,38 ****
  #include "ICElibint.h"
  #include <X11/ICE/ICEutil.h>
  
! #ifdef X_NOT_STDC_ENV
  #define Time_t long
  extern Time_t time ();
  #else
--- 33,39 ----
  #include "ICElibint.h"
  #include <X11/ICE/ICEutil.h>
  
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  #define Time_t long
  extern Time_t time ();
  #else
***************
*** 74,81 ****
      }
  #else
      {
  	long    time ();
! 
  	ldata[0] = time ((long *) 0);
  	ldata[1] = getpid ();
      }
--- 75,83 ----
      }
  #else
      {
+ #ifndef __EMX__
  	long    time ();
! #endif
  	ldata[0] = time ((long *) 0);
  	ldata[1] = getpid ();
      }
diff -c xc/lib/ICE/process.c:1.1.1.3 xc/lib/ICE/process.c:3.1
*** xc/lib/ICE/process.c:1.1.1.3	Mon Jan 30 17:46:15 1995
--- xc/lib/ICE/process.c	Mon Jan 30 17:46:15 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: process.c,v 1.43 94/08/25 15:44:43 mor Exp $ */
+ /* $XFree86: xc/lib/ICE/process.c,v 3.1 1994/09/17 13:43:45 dawes Exp $ */
  /******************************************************************************
  
  
***************
*** 31,36 ****
--- 32,40 ----
  #include <X11/ICE/ICElib.h>
  #include "ICElibint.h"
  
+ #ifdef MINIX
+ #include <X11/Xtrans.h>
+ #endif
  
  /*
   * Check for bad length
***************
*** 2489,2491 ****
--- 2493,2512 ----
      if (replyWait)
  	*replyReadyRet = replyReady;
  }
+ 
+ 
+ #ifdef MINIX
+ int 
+ MNX_IceMessagesAvailable(iceConn)
+ 
+ IceConn          iceConn;
+ {
+ 	BytesReadable_t bytes;
+ 
+ 	_IceTransSetOption(iceConn->trans_conn, TRANS_NONBLOCKING, 1);
+ 	if (_IceTransBytesReadable(iceConn->trans_conn, &bytes) < 0)
+ 		bytes= -1;
+ 	_IceTransSetOption(iceConn->trans_conn, TRANS_NONBLOCKING, 0);
+ 	return (bytes != 0);
+ }
+ #endif
diff -c /dev/null xc/lib/PEX5/PEX5os2.def:3.0
*** /dev/null	Mon Jan 30 17:46:19 1995
--- xc/lib/PEX5/PEX5os2.def	Mon Jan 30 17:46:19 1995
***************
*** 0 ****
--- 1,287 ----
+ LIBRARY PEX5
+ DESCRIPTION "X11R6 XFree86 libPEX5.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 65536
+ EXPORTS
+ 	PEXAccumulateState @ 1
+ 	PEXAddToNameSet @ 2
+ 	PEXAnnotationText @ 3
+ 	PEXAnnotationText2D @ 4
+ 	PEXApplicationData @ 5
+ 	PEXBeginPickAll @ 6
+ 	PEXBeginPickOne @ 7
+ 	PEXBeginRendering @ 8
+ 	PEXBeginStructure @ 9
+ 	PEXBuildTransform @ 10
+ 	PEXBuildTransform2D @ 11
+ 	PEXCellArray @ 12
+ 	PEXCellArray2D @ 13
+ 	PEXChangeNameSet @ 14
+ 	PEXChangePickDevice @ 15
+ 	PEXChangePipelineContext @ 16
+ 	PEXChangeRenderer @ 17
+ 	PEXChangeSearchContext @ 18
+ 	PEXChangeStructureRefs @ 19
+ 	PEXCopyBytesToOC @ 20
+ 	PEXCopyElements @ 21
+ 	PEXCopyLookupTable @ 22
+ 	PEXCopyNameSet @ 23
+ 	PEXCopyPipelineContext @ 24
+ 	PEXCopySearchContext @ 25
+ 	PEXCopyStructure @ 26
+ 	PEXCountOCs @ 27
+ 	PEXCreateLookupTable @ 28
+ 	PEXCreateNameSet @ 29
+ 	PEXCreatePickMeasure @ 30
+ 	PEXCreatePipelineContext @ 31
+ 	PEXCreateRenderer @ 32
+ 	PEXCreateSearchContext @ 33
+ 	PEXCreateStructure @ 34
+ 	PEXCreateWorkstation @ 35
+ 	PEXDecodeOCs @ 36
+ 	PEXDeleteBetweenLabels @ 37
+ 	PEXDeleteElements @ 38
+ 	PEXDeleteTableEntries @ 39
+ 	PEXDeleteToLabel @ 40
+ 	PEXDestroyStructures @ 41
+ 	PEXElementSearch @ 42
+ 	PEXEncodeOCs @ 43
+ 	PEXEncodedAnnoText @ 44
+ 	PEXEncodedAnnoText2D @ 45
+ 	PEXEncodedText @ 46
+ 	PEXEncodedText2D @ 47
+ 	PEXEndPickAll @ 48
+ 	PEXEndPickOne @ 49
+ 	PEXEndRendering @ 50
+ 	PEXEndStructure @ 51
+ 	PEXEscape @ 52
+ 	PEXEscapeWithReply @ 53
+ 	PEXExecuteDeferredActions @ 54
+ 	PEXExecuteStructure @ 55
+ 	PEXExtendedCellArray @ 56
+ 	PEXFetchElements @ 57
+ 	PEXFetchElementsAndSend @ 58
+ 	PEXFillArea @ 59
+ 	PEXFillArea2D @ 60
+ 	PEXFillAreaSet @ 61
+ 	PEXFillAreaSet2D @ 62
+ 	PEXFillAreaSetWithData @ 63
+ 	PEXFillAreaWithData @ 64
+ 	PEXFinishOCs @ 65
+ 	PEXFreeEnumInfo @ 66
+ 	PEXFreeFontInfo @ 67
+ 	PEXFreeFontNames @ 68
+ 	PEXFreeLookupTable @ 69
+ 	PEXFreeNameSet @ 70
+ 	PEXFreeOCData @ 71
+ 	PEXFreePCAttributes @ 72
+ 	PEXFreePDAttributes @ 73
+ 	PEXFreePMAttributes @ 74
+ 	PEXFreePickMeasure @ 75
+ 	PEXFreePickPaths @ 76
+ 	PEXFreePipelineContext @ 77
+ 	PEXFreeRenderer @ 78
+ 	PEXFreeRendererAttributes @ 79
+ 	PEXFreeSCAttributes @ 80
+ 	PEXFreeSearchContext @ 81
+ 	PEXFreeStructurePaths @ 82
+ 	PEXFreeTableEntries @ 83
+ 	PEXFreeWorkstation @ 84
+ 	PEXFreeWorkstationAttributes @ 85
+ 	PEXGDP @ 86
+ 	PEXGDP2D @ 87
+ 	PEXGSE @ 88
+ 	PEXGeoNormFillArea @ 89
+ 	PEXGeoNormFillAreaSet @ 90
+ 	PEXGeoNormQuadrilateralMesh @ 91
+ 	PEXGeoNormSetOfFillAreaSets @ 92
+ 	PEXGeoNormTriangleStrip @ 93
+ 	PEXGetAncestors @ 94
+ 	PEXGetDefinedIndices @ 95
+ 	PEXGetDescendants @ 96
+ 	PEXGetElementInfo @ 97
+ 	PEXGetEnumTypeInfo @ 98
+ 	PEXGetExtensionInfo @ 99
+ 	PEXGetImpDepConstants @ 100
+ 	PEXGetNameSet @ 101
+ 	PEXGetOCAddr @ 102
+ 	PEXGetPickDevice @ 103
+ 	PEXGetPickMeasure @ 104
+ 	PEXGetPipelineContext @ 105
+ 	PEXGetPredefinedEntries @ 106
+ 	PEXGetProtocolFloatFormat @ 107
+ 	PEXGetRendererAttributes @ 108
+ 	PEXGetRendererDynamics @ 109
+ 	PEXGetSearchContext @ 110
+ 	PEXGetSizeOCs @ 111
+ 	PEXGetStructureInfo @ 112
+ 	PEXGetStructuresInNetwork @ 113
+ 	PEXGetTableEntries @ 114
+ 	PEXGetTableEntry @ 115
+ 	PEXGetTableInfo @ 116
+ 	PEXGetWorkstationAttributes @ 117
+ 	PEXGetWorkstationDynamics @ 118
+ 	PEXGetWorkstationPostings @ 119
+ 	PEXGetWorkstationViewRep @ 120
+ 	PEXIdentityMatrix @ 121
+ 	PEXIdentityMatrix2D @ 122
+ 	PEXInitialize @ 123
+ 	PEXInvertMatrix @ 124
+ 	PEXInvertMatrix2D @ 125
+ 	PEXLabel @ 126
+ 	PEXListFonts @ 127
+ 	PEXListFontsWithInfo @ 128
+ 	PEXLoadFont @ 129
+ 	PEXLookAtViewMatrix @ 130
+ 	PEXMapDCToWC @ 131
+ 	PEXMapWCToDC @ 132
+ 	PEXMapXCToNPC @ 133
+ 	PEXMapXCToNPC2D @ 134
+ 	PEXMarkers @ 135
+ 	PEXMarkers2D @ 136
+ 	PEXMatchRenderingTargets @ 137
+ 	PEXMatrixMult @ 138
+ 	PEXMatrixMult2D @ 139
+ 	PEXNPCToXCTransform @ 140
+ 	PEXNPCToXCTransform2D @ 141
+ 	PEXNURBCurve @ 142
+ 	PEXNURBSurface @ 143
+ 	PEXNoop @ 144
+ 	PEXNormalizeVectors @ 145
+ 	PEXNormalizeVectors2D @ 146
+ 	PEXOrthoProjMatrix @ 147
+ 	PEXPerspProjMatrix @ 148
+ 	PEXPickAll @ 149
+ 	PEXPickOne @ 150
+ 	PEXPolarViewMatrix @ 151
+ 	PEXPolyline @ 152
+ 	PEXPolyline2D @ 153
+ 	PEXPolylineSetWithData @ 154
+ 	PEXPostStructure @ 155
+ 	PEXQuadrilateralMesh @ 156
+ 	PEXQueryEncodedTextExtents @ 157
+ 	PEXQueryFont @ 158
+ 	PEXQueryTextExtents @ 159
+ 	PEXRedrawAllStructures @ 160
+ 	PEXRedrawClipRegion @ 161
+ 	PEXRemoveFromNameSet @ 162
+ 	PEXRenderElements @ 163
+ 	PEXRenderNetwork @ 164
+ 	PEXRestoreModelClipVolume @ 165
+ 	PEXRotate @ 166
+ 	PEXRotate2D @ 167
+ 	PEXRotateGeneral @ 168
+ 	PEXScale @ 169
+ 	PEXScale2D @ 170
+ 	PEXSearchNetwork @ 171
+ 	PEXSendOCs @ 172
+ 	PEXSetATextAlignment @ 173
+ 	PEXSetATextHeight @ 174
+ 	PEXSetATextPath @ 175
+ 	PEXSetATextStyle @ 176
+ 	PEXSetATextUpVector @ 177
+ 	PEXSetBFInteriorStyle @ 178
+ 	PEXSetBFInteriorStyleIndex @ 179
+ 	PEXSetBFReflectionAttributes @ 180
+ 	PEXSetBFReflectionModel @ 181
+ 	PEXSetBFSurfaceColor @ 182
+ 	PEXSetBFSurfaceColorIndex @ 183
+ 	PEXSetBFSurfaceInterpMethod @ 184
+ 	PEXSetCharExpansion @ 185
+ 	PEXSetCharHeight @ 186
+ 	PEXSetCharSpacing @ 187
+ 	PEXSetCharUpVector @ 188
+ 	PEXSetColorApproxIndex @ 189
+ 	PEXSetCurveApprox @ 190
+ 	PEXSetDepthCueIndex @ 191
+ 	PEXSetEchoColor @ 192
+ 	PEXSetEdgeBundleIndex @ 193
+ 	PEXSetEditingMode @ 194
+ 	PEXSetElementPtr @ 195
+ 	PEXSetElementPtrAtLabel @ 196
+ 	PEXSetFacetCullingMode @ 197
+ 	PEXSetFacetDistinguishFlag @ 198
+ 	PEXSetGlobalTransform @ 199
+ 	PEXSetGlobalTransform2D @ 200
+ 	PEXSetHLHSRID @ 201
+ 	PEXSetIndividualASF @ 202
+ 	PEXSetInteriorBundleIndex @ 203
+ 	PEXSetInteriorStyle @ 204
+ 	PEXSetInteriorStyleIndex @ 205
+ 	PEXSetLightSourceState @ 206
+ 	PEXSetLineBundleIndex @ 207
+ 	PEXSetLineColor @ 208
+ 	PEXSetLineColorIndex @ 209
+ 	PEXSetLineType @ 210
+ 	PEXSetLineWidth @ 211
+ 	PEXSetLocalTransform @ 212
+ 	PEXSetLocalTransform2D @ 213
+ 	PEXSetMarkerBundleIndex @ 214
+ 	PEXSetMarkerColor @ 215
+ 	PEXSetMarkerColorIndex @ 216
+ 	PEXSetMarkerScale @ 217
+ 	PEXSetMarkerType @ 218
+ 	PEXSetModelClipFlag @ 219
+ 	PEXSetModelClipVolume @ 220
+ 	PEXSetModelClipVolume2D @ 221
+ 	PEXSetOfFillAreaSets @ 222
+ 	PEXSetParaSurfCharacteristics @ 223
+ 	PEXSetPatternAttributes @ 224
+ 	PEXSetPatternAttributes2D @ 225
+ 	PEXSetPatternSize @ 226
+ 	PEXSetPickID @ 227
+ 	PEXSetPolylineInterpMethod @ 228
+ 	PEXSetReflectionAttributes @ 229
+ 	PEXSetReflectionModel @ 230
+ 	PEXSetRenderingColorModel @ 231
+ 	PEXSetSurfaceApprox @ 232
+ 	PEXSetSurfaceColor @ 233
+ 	PEXSetSurfaceColorIndex @ 234
+ 	PEXSetSurfaceEdgeColor @ 235
+ 	PEXSetSurfaceEdgeColorIndex @ 236
+ 	PEXSetSurfaceEdgeFlag @ 237
+ 	PEXSetSurfaceEdgeType @ 238
+ 	PEXSetSurfaceEdgeWidth @ 239
+ 	PEXSetSurfaceInterpMethod @ 240
+ 	PEXSetTableEntries @ 241
+ 	PEXSetTextAlignment @ 242
+ 	PEXSetTextBundleIndex @ 243
+ 	PEXSetTextColor @ 244
+ 	PEXSetTextColorIndex @ 245
+ 	PEXSetTextFontIndex @ 246
+ 	PEXSetTextPath @ 247
+ 	PEXSetTextPrecision @ 248
+ 	PEXSetViewIndex @ 249
+ 	PEXSetWorkstationBufferMode @ 250
+ 	PEXSetWorkstationDisplayUpdateMode @ 251
+ 	PEXSetWorkstationHLHSRMode @ 252
+ 	PEXSetWorkstationViewPriority @ 253
+ 	PEXSetWorkstationViewRep @ 254
+ 	PEXSetWorkstationViewport @ 255
+ 	PEXSetWorkstationWindow @ 256
+ 	PEXStartOCs @ 257
+ 	PEXText @ 258
+ 	PEXText2D @ 259
+ 	PEXTransformPoints @ 260
+ 	PEXTransformPoints2D @ 261
+ 	PEXTransformPoints2DH @ 262
+ 	PEXTransformPoints4D @ 263
+ 	PEXTransformVectors @ 264
+ 	PEXTransformVectors2D @ 265
+ 	PEXTranslate @ 266
+ 	PEXTranslate2D @ 267
+ 	PEXTriangleStrip @ 268
+ 	PEXUnloadFont @ 269
+ 	PEXUnpostAllStructures @ 270
+ 	PEXUnpostStructure @ 271
+ 	PEXUpdatePickMeasure @ 272
+ 	PEXUpdateWorkstation @ 273
+ 	PEXViewMappingMatrix @ 274
+ 	PEXViewMappingMatrix2D @ 275
+ 	PEXViewOrientationMatrix @ 276
+ 	PEXViewOrientationMatrix2D @ 277
+ 	PEXXCToNPCTransform @ 278
+ 	PEXXCToNPCTransform2D @ 279
diff -c /dev/null xc/lib/PEX5/PEX5os2.rsp:3.0
*** /dev/null	Mon Jan 30 17:46:20 1995
--- xc/lib/PEX5/PEX5os2.rsp	Mon Jan 30 17:46:20 1995
***************
*** 0 ****
--- 1,6 ----
+ pl_convert.obj pl_escape.obj pl_font.obj pl_free.obj pl_lut.obj+
+ pl_nameset.obj pl_oc_attr.obj pl_oc_dec.obj pl_oc_enc.obj pl_oc_prim.obj+
+ pl_oc_str.obj pl_oc_util.obj pl_pc.obj pl_pick.obj pl_rdr.obj pl_sc.obj+
+ pl_startup.obj pl_struct.obj pl_util.obj pl_wks.obj /NOL /NOD /BAT
+ PEX5.dll
+ 
diff -c xc/lib/PEX5/jump_funcs:1.1.1.1 xc/lib/PEX5/jump_funcs:3.1
*** xc/lib/PEX5/jump_funcs:1.1.1.1	Mon Jan 30 17:46:20 1995
--- xc/lib/PEX5/jump_funcs	Mon Jan 30 17:46:20 1995
***************
*** 1,5 ****
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_funcs,v 3.0 1994/04/28 12:30:31 dawes Exp $
  #
  00000000 T _PEXEscape           libPEX5        pl_escape
  00000000 T _PEXEscapeWithReply  libPEX5        pl_escape
--- 1,5 ----
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_funcs,v 3.1 1995/01/28 15:42:19 dawes Exp $
  #
  00000000 T _PEXEscape           libPEX5        pl_escape
  00000000 T _PEXEscapeWithReply  libPEX5        pl_escape
diff -c xc/lib/PEX5/jump_ignore:1.1.1.1 xc/lib/PEX5/jump_ignore:3.1
*** xc/lib/PEX5/jump_ignore:1.1.1.1	Mon Jan 30 17:46:21 1995
--- xc/lib/PEX5/jump_ignore	Mon Jan 30 17:46:21 1995
***************
*** 1,3 ****
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_ignore,v 3.0 1994/04/28 12:30:32 dawes Exp $
  # jump_ignore
--- 1,3 ----
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_ignore,v 3.1 1995/01/28 15:42:20 dawes Exp $
  # jump_ignore
diff -c xc/lib/PEX5/jump_vars:1.1.1.1 xc/lib/PEX5/jump_vars:3.1
*** xc/lib/PEX5/jump_vars:1.1.1.1	Mon Jan 30 17:46:21 1995
--- xc/lib/PEX5/jump_vars	Mon Jan 30 17:46:21 1995
***************
*** 1,5 ****
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_vars,v 3.0 1994/04/28 12:30:33 dawes Exp $
  #
  00000004 D _PEXDisplayInfoHeader libPEX5        pl_startup
  00000004 D _PEXPickCache        libPEX5        pl_startup
--- 1,5 ----
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:56 kaleb Exp $
! # $XFree86: xc/lib/PEX5/jump_vars,v 3.1 1995/01/28 15:42:22 dawes Exp $
  #
  00000004 D _PEXDisplayInfoHeader libPEX5        pl_startup
  00000004 D _PEXPickCache        libPEX5        pl_startup
diff -c /dev/null xc/lib/SM/SMos2.def:3.0
*** /dev/null	Mon Jan 30 17:46:23 1995
--- xc/lib/SM/SMos2.def	Mon Jan 30 17:46:23 1995
***************
*** 0 ****
--- 1,45 ----
+ LIBRARY SM
+ DESCRIPTION "X11R6 XFree86 libSM.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 SmFreeProperty  @ 1
+ 	 SmFreeReasons  @ 2
+ 	 SmcClientID  @ 3
+ 	 SmcCloseConnection  @ 4
+ 	 SmcDeleteProperties  @ 5
+ 	 SmcGetIceConnection  @ 6
+ 	 SmcGetProperties  @ 7
+ 	 SmcInteractDone  @ 8
+ 	 SmcInteractRequest  @ 9
+ 	 SmcModifyCallbacks  @ 10
+ 	 SmcOpenConnection  @ 11
+ 	 SmcProtocolRevision  @ 12
+ 	 SmcProtocolVersion  @ 13
+ 	 SmcRelease  @ 14
+ 	 SmcRequestSaveYourself  @ 15
+ 	 SmcRequestSaveYourselfPhase2  @ 16
+ 	 SmcSaveYourselfDone  @ 17
+ 	 SmcSetErrorHandler  @ 18
+ 	 SmcSetProperties  @ 19
+ 	 SmcVendor  @ 20
+ 	 SmsCleanUp  @ 21
+ 	 SmsClientHostName  @ 22
+ 	 SmsClientID  @ 23
+ 	 SmsDie  @ 24
+ 	 SmsGenerateClientID  @ 25
+ 	 SmsGetIceConnection  @ 26
+ 	 SmsInitialize  @ 27
+ 	 SmsInteract  @ 28
+ 	 SmsProtocolRevision  @ 29
+ 	 SmsProtocolVersion  @ 30
+ 	 SmsRegisterClientReply  @ 31
+ 	 SmsReturnProperties  @ 32
+ 	 SmsSaveComplete  @ 33
+ 	 SmsSaveYourself  @ 34
+ 	 SmsSaveYourselfPhase2  @ 35
+ 	 SmsSetErrorHandler  @ 36
+ 	 SmsShutdownCancelled  @ 37
diff -c /dev/null xc/lib/SM/SMos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:46:23 1995
--- xc/lib/SM/SMos2.rsp	Mon Jan 30 17:46:23 1995
***************
*** 0 ****
--- 1,4 ----
+ sm_auth.obj sm_client.obj sm_error.obj sm_genid.obj sm_manager.obj+
+ sm_misc.obj sm_process.obj /NOL /NOD /BAT
+ SM.dll
+ 
diff -c xc/lib/SM/sm_genid.c:1.1.1.2 xc/lib/SM/sm_genid.c:3.1
*** xc/lib/SM/sm_genid.c:1.1.1.2	Mon Jan 30 17:46:24 1995
--- xc/lib/SM/sm_genid.c	Mon Jan 30 17:46:24 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: sm_genid.c,v 1.7 94/05/02 11:14:45 mor Exp $ */
+ /* $XFree86: xc/lib/SM/sm_genid.c,v 3.1 1994/10/20 06:02:35 dawes Exp $ */
  
  /*
  
***************
*** 39,45 ****
  #include <X11/Xtrans.h>
  #include <stdio.h>
  
! #ifdef X_NOT_STDC_ENV
  #define Time_t long
  extern Time_t time ();
  #else
--- 40,46 ----
  #include <X11/Xtrans.h>
  #include <stdio.h>
  
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  #define Time_t long
  extern Time_t time ();
  #else
***************
*** 69,74 ****
--- 70,81 ----
  #define close closesocket
  
  #endif /* WIN32 */
+ 
+ #ifdef MNX_TCPCONN
+ #include <net/gen/netdb.h>
+ 
+ #define TCPCONN
+ #endif
  
  
  static char *hex_table[] = {	/* for generating client IDs */
diff -c xc/lib/X11/ConnDis.c:1.1.1.3 xc/lib/X11/ConnDis.c:3.6
*** xc/lib/X11/ConnDis.c:1.1.1.3	Mon Jan 30 17:46:49 1995
--- xc/lib/X11/ConnDis.c	Mon Jan 30 17:46:49 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: ConnDis.c,v 11.123 94/05/19 11:00:27 mor Exp $ */
+ /* $XFree86: xc/lib/X11/ConnDis.c,v 3.6 1994/10/20 06:03:02 dawes Exp $ */
  /*
   
  Copyright (c) 1989  X Consortium
***************
*** 39,45 ****
  #include <stdio.h>
  #include <ctype.h>
  
! #ifndef WIN32
  #include <sys/socket.h>
  #endif
  
--- 40,46 ----
  #include <stdio.h>
  #include <ctype.h>
  
! #if !defined(WIN32) && !defined(MINIX)
  #include <sys/socket.h>
  #endif
  
***************
*** 229,235 ****
       * is "unix", then choose BSD UNIX domain sockets (if configured).
       */
  
! #if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN)
      if (!pprotocol) {
  	if (!phostname)
  #if defined(UNIXCONN) || defined(LOCALCONN)
--- 230,236 ----
       * is "unix", then choose BSD UNIX domain sockets (if configured).
       */
  
! #if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN)
      if (!pprotocol) {
  	if (!phostname)
  #if defined(UNIXCONN) || defined(LOCALCONN)
***************
*** 238,243 ****
--- 239,250 ----
  #endif
  	    pprotocol = copystring ("tcp", 3);
      }
+ #else
+ #if defined(AMRPCCONN)
+     if (!pprotocol) {
+             pprotocol = copystring ("amcon", 5);
+     }
+ #endif
  #endif
  
  #if defined(UNIXCONN) || defined(LOCALCONN)
***************
*** 445,451 ****
  {
      int auth_length = client->nbytesAuthProto;
      int auth_strlen = client->nbytesAuthString;
!     char padbuf[3];			/* for padding to 4x bytes */
      int pad;
      struct iovec iovarray[5], *iov = iovarray;
      int niov = 0;
--- 452,458 ----
  {
      int auth_length = client->nbytesAuthProto;
      int auth_strlen = client->nbytesAuthString;
!     static char padbuf[3];		/* for padding to 4x bytes */
      int pad;
      struct iovec iovarray[5], *iov = iovarray;
      int niov = 0;
diff -c xc/lib/X11/GetDflt.c:1.1.1.2 xc/lib/X11/GetDflt.c:3.3
*** xc/lib/X11/GetDflt.c:1.1.1.2	Mon Jan 30 17:46:50 1995
--- xc/lib/X11/GetDflt.c	Mon Jan 30 17:46:50 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: GetDflt.c,v 1.34 94/11/30 16:19:43 kaleb Exp $ */
+ /* $XFree86: xc/lib/X11/GetDflt.c,v 3.3 1995/01/28 15:42:48 dawes Exp $ */
  
  /***********************************************************
  
diff -c xc/lib/X11/IMWrap.c:1.1.1.2 xc/lib/X11/IMWrap.c:3.1
*** xc/lib/X11/IMWrap.c:1.1.1.2	Mon Jan 30 17:46:51 1995
--- xc/lib/X11/IMWrap.c	Mon Jan 30 17:46:51 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: IMWrap.c,v 11.11 94/09/01 18:40:04 kaleb Exp $
+  * $XFree86: xc/lib/X11/IMWrap.c,v 3.1 1994/09/17 13:44:11 dawes Exp $
   */
  
  /*
***************
*** 130,136 ****
--- 131,144 ----
      if( !lcd )
  	return( (XIM)NULL );
      if( lcd->methods->open_im == NULL )
+ #ifdef X11_TINY_IM
+     {
+     	_XCloseLC(lcd);
+     	return NULL;
+     }
+ #else
  	_XInitIM( lcd );
+ #endif
      return (*lcd->methods->open_im) (lcd, display, rdb, res_name, res_class);
  }
  
***************
*** 192,198 ****
--- 200,213 ----
      if( !lcd )
  	return( False );
      if( lcd->methods->register_callback == NULL )
+ #ifdef X11_TINY_IM
+     {
+     	_XCloseLC(lcd);
+     	return NULL;
+     }
+ #else
  	_XInitIM( lcd );
+ #endif
      return( (*lcd->methods->register_callback)( lcd, display, rdb, res_name,
  						res_class, callback,
  						client_data ) );
diff -c xc/lib/X11/Imakefile:1.1.1.1 xc/lib/X11/Imakefile:3.2
*** xc/lib/X11/Imakefile:1.1.1.1	Mon Jan 30 17:46:51 1995
--- xc/lib/X11/Imakefile	Mon Jan 30 17:46:52 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.182 94/04/14 09:07:43 rws Exp $
+ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.2 1994/10/20 06:03:04 dawes Exp $
  #define DoNormalLib NormalLibX11
  #define DoSharedLib SharedLibX11
  #define DoDebugLib DebugLibX11
***************
*** 20,26 ****
  #ifdef SharedX11Reqs
  REQUIREDLIBS = SharedX11Reqs
  #endif
! #if defined(MacIIArchitecture) || defined(SequentArchitecture)
  XBSDLIB = /**/
  #endif
  #if defined(LunaArchitecture) && defined(Mc88000Architecture)
--- 21,27 ----
  #ifdef SharedX11Reqs
  REQUIREDLIBS = SharedX11Reqs
  #endif
! #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
  XBSDLIB = /**/
  #endif
  #if defined(LunaArchitecture) && defined(Mc88000Architecture)
***************
*** 910,915 ****
--- 911,920 ----
  #if HasKrb5
  SpecialCLibObjectRule(k5encode,$(_NOOP_),$(K5INCL))
  #endif
+ #ifdef MinixArchitecture
+ SpecialCLibObjectRule(IMWrap,$(ICONFIGFILES),-DX11_TINY_IM)
+ SpecialCLibObjectRule(lcInit,$(ICONFIGFILES),-DX11_TINY_LC)
+ #endif
  
  #if InstallXcmsTxt
  InstallNonExecFile(Xcms.txt,$(LIBDIR))
***************
*** 936,942 ****
  
  ks_tables.h: $(INCLUDESRC)/keysymdef.h util/makekeys.c
  	RemoveFiles($@ ProgramTargetName(makekeys) makekeys.Osuf)
! 	-HostLinkRule(makekeys,$(CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(LDLIBS))
  	RunProgram(MAKEKEYS,< $(INCLUDESRC)/keysymdef.h > ks_tables_h)
  	$(MV) ks_tables_h $@
  	RemoveFiles(ProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
--- 941,947 ----
  
  ks_tables.h: $(INCLUDESRC)/keysymdef.h util/makekeys.c
  	RemoveFiles($@ ProgramTargetName(makekeys) makekeys.Osuf)
! 	-HostLinkRule(ProgramTargetName(makekeys),$(CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(LDLIBS))
  	RunProgram(MAKEKEYS,< $(INCLUDESRC)/keysymdef.h > ks_tables_h)
  	$(MV) ks_tables_h $@
  	RemoveFiles(ProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
diff -c xc/lib/X11/OpenDis.c:1.1.1.1 xc/lib/X11/OpenDis.c:3.0
*** xc/lib/X11/OpenDis.c:1.1.1.1	Mon Jan 30 17:46:52 1995
--- xc/lib/X11/OpenDis.c	Mon Jan 30 17:46:52 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: OpenDis.c,v 11.152 94/04/17 20:20:21 rws Exp $ */
+ /* $XFree86: xc/lib/X11/OpenDis.c,v 3.0 1994/10/20 06:03:07 dawes Exp $ */
  /*
  
  Copyright (c) 1985, 1986  X Consortium
***************
*** 120,125 ****
--- 121,129 ----
  	extern XID _XAllocID();
  	extern void _XAllocIDs();
  
+ 	bzero((char *) &client, sizeof(client));
+ 	bzero((char *) &prefix, sizeof(prefix));
+ 
  	/*
  	 * If the display specifier string supplied as an argument to this 
  	 * routine is NULL or a pointer to NULL, read the DISPLAY variable.
***************
*** 249,255 ****
  	}	
  
  	/* Set up the output buffers. */
! 	if ((dpy->bufptr = dpy->buffer = Xmalloc(BUFSIZE)) == NULL) {
  	        OutOfMemory (dpy, setup);
  		return(NULL);
  	}
--- 253,259 ----
  	}	
  
  	/* Set up the output buffers. */
! 	if ((dpy->bufptr = dpy->buffer = Xcalloc(1, BUFSIZE)) == NULL) {
  	        OutOfMemory (dpy, setup);
  		return(NULL);
  	}
diff -c xc/lib/X11/RdBitF.c:1.1.1.1 xc/lib/X11/RdBitF.c:3.0
*** xc/lib/X11/RdBitF.c:1.1.1.1	Mon Jan 30 17:46:53 1995
--- xc/lib/X11/RdBitF.c	Mon Jan 30 17:46:53 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: RdBitF.c,v 1.19 94/04/17 20:20:42 rws Exp $ */
+ /* $XFree86: xc/lib/X11/RdBitF.c,v 3.0 1994/10/20 06:03:09 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
***************
*** 158,163 ****
--- 159,167 ----
      /* first time initialization */
      if (initialized == False) initHexTable();
  
+ #ifdef __EMX__
+     filename = __XOS2RedirRoot(filename);
+ #endif
      if (!(fstream = fopen(filename, "r")))
  	return BitmapOpenFailed;
  
diff -c xc/lib/X11/SetLocale.c:1.1.1.2 xc/lib/X11/SetLocale.c:3.3
*** xc/lib/X11/SetLocale.c:1.1.1.2	Mon Jan 30 17:46:53 1995
--- xc/lib/X11/SetLocale.c	Mon Jan 30 17:46:54 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: SetLocale.c,v 1.40 94/11/21 18:23:20 kaleb Exp $ */
+ /* $XFree86: xc/lib/X11/SetLocale.c,v 3.3 1995/01/28 17:38:10 dawes Exp $ */
  
  /*
   * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
***************
*** 138,144 ****
      char *osname;
      char *siname;
  {
! #if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
--- 139,145 ----
      char *osname;
      char *siname;
  {
! #if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
***************
*** 149,155 ****
  #define STARTCHAR '\001'
  #define ENDCHAR '\001'
  #else
! #ifdef WIN32
  #define SKIPCOUNT 1
  #define STARTCHAR '='
  #define ENDCHAR ';'
--- 150,156 ----
  #define STARTCHAR '\001'
  #define ENDCHAR '\001'
  #else
! #if defined(WIN32) || defined(__EMX__)
  #define SKIPCOUNT 1
  #define STARTCHAR '='
  #define ENDCHAR ';'
diff -c xc/lib/X11/WrBitF.c:1.1.1.1 xc/lib/X11/WrBitF.c:3.0
*** xc/lib/X11/WrBitF.c:1.1.1.1	Mon Jan 30 17:46:54 1995
--- xc/lib/X11/WrBitF.c	Mon Jan 30 17:46:54 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: WrBitF.c,v 1.13 94/04/17 20:21:32 rws Exp $ */
+ /* $XFree86: xc/lib/X11/WrBitF.c,v 3.0 1994/10/20 06:03:13 dawes Exp $ */
  /*
  
  Copyright (c) 1987  X Consortium
***************
*** 113,118 ****
--- 114,122 ----
    else
      name++;
  
+ #ifdef __EMX__
+   filename = __XOS2RedirRoot(filename);
+ #endif
    if (!(stream = fopen(filename, "w")))
      return(BitmapOpenFailed);
  
diff -c /dev/null xc/lib/X11/X11os2.def:3.0
*** /dev/null	Mon Jan 30 17:46:54 1995
--- xc/lib/X11/X11os2.def	Mon Jan 30 17:46:55 1995
***************
*** 0 ****
--- 1,954 ----
+ LIBRARY X11
+ DESCRIPTION "X11R6 XFree86 libX11.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 32768
+ EXPORTS
+ 	XSaveContext  @ 1
+ 	XFindContext  @ 2
+ 	XDeleteContext  @ 3
+ 	XListDepths  @ 4
+ 	XrmParseCommand  @ 5
+ 	Xpermalloc  @ 6
+ 	_XrmInternalStringToQuark  @ 7
+ 	XrmStringToQuark  @ 8
+ 	XrmPermStringToQuark  @ 9
+ 	XrmUniqueQuark  @ 10
+ 	XrmQuarkToString  @ 11
+ 	XAllocColorCells  @ 12
+ 	XAllocColorPlanes  @ 13
+ 	XAllowEvents  @ 14
+ 	XAutoRepeatOn  @ 15
+ 	XAutoRepeatOff  @ 16
+ 	XSetWindowBackground  @ 17
+ 	XSetWindowBorderWidth  @ 18
+ 	XBell  @ 19
+ 	XSetWindowBorder  @ 20
+ 	XEnableAccessControl  @ 21
+ 	XDisableAccessControl  @ 22
+ 	XSetAccessControl  @ 23
+ 	XSetCloseDownMode  @ 24
+ 	XChangeActivePointerGrab  @ 25
+ 	XSetWindowColormap  @ 26
+ 	XChangeGC  @ 27
+ 	XChangeKeyboardControl  @ 28
+ 	XChangePointerControl  @ 29
+ 	XChangeProperty  @ 30
+ 	XChangeSaveSet  @ 31
+ 	XAddToSaveSet  @ 32
+ 	XRemoveFromSaveSet  @ 33
+ 	XChangeWindowAttributes  @ 34
+ 	XResizeWindow  @ 35
+ 	XCheckIfEvent  @ 36
+ 	XCheckMaskEvent  @ 37
+ 	XCheckWindowEvent  @ 38
+ 	XCheckTypedEvent  @ 39
+ 	XCheckTypedWindowEvent  @ 40
+ 	XCirculateSubwindows  @ 41
+ 	XCirculateSubwindowsDown  @ 42
+ 	XCirculateSubwindowsUp  @ 43
+ 	XCloseDisplay  @ 44
+ 	XClearWindow  @ 45
+ 	XClearArea  @ 46
+ 	XMoveResizeWindow  @ 47
+ 	_XConnectDisplay  @ 48
+ 	_XDisconnectDisplay  @ 49
+ 	_XSendClientPrefix  @ 50
+ 	XSetAuthorization  @ 51
+ 	XConvertSelection  @ 52
+ 	XCopyArea  @ 53
+ 	XCopyColormapAndFree  @ 54
+ 	XCopyGC  @ 55
+ 	XCopyPlane  @ 56
+ 	XCreateBitmapFromData  @ 57
+ 	XCreateColormap  @ 58
+ 	XCreatePixmapCursor  @ 59
+ 	XCreateGC  @ 60
+ 	_XUpdateGCCache  @ 61
+ 	_XFlushGCCache  @ 62
+ 	XFlushGC  @ 63
+ 	XGContextFromGC  @ 64
+ 	XCreateGlyphCursor  @ 65
+ 	XCreatePixmapFromBitmapData  @ 66
+ 	XCreatePixmap  @ 67
+ 	XCreateSimpleWindow  @ 68
+ 	XCreateFontCursor  @ 69
+ 	XDefineCursor  @ 70
+ 	XDeleteProperty  @ 71
+ 	XDestroySubwindows  @ 72
+ 	XDestroyWindow  @ 73
+ 	XDisplayName  @ 74
+ 	XDrawArc  @ 75
+ 	XDrawArcs  @ 76
+ 	XDrawLine  @ 77
+ 	XDrawLines  @ 78
+ 	XDrawPoint  @ 79
+ 	XDrawPoints  @ 80
+ 	XDrawRectangle  @ 81
+ 	XDrawRectangles  @ 82
+ 	XDrawSegments  @ 83
+ 	XGetErrorText  @ 84
+ 	XGetErrorDatabaseText  @ 85
+ 	XSetErrorHandler  @ 86
+ 	XSetIOErrorHandler  @ 87
+ 	_XEventToWire  @ 88
+ 	XFetchName  @ 89
+ 	XGetIconName  @ 90
+ 	XFillArc  @ 91
+ 	XFillArcs  @ 92
+ 	XFillPolygon  @ 93
+ 	XFillRectangle  @ 94
+ 	XFillRectangles  @ 95
+ 	XFlush  @ 96
+ 	XLoadQueryFont  @ 97
+ 	XFreeFont  @ 98
+ 	XQueryFont  @ 99
+ 	XListFonts  @ 100
+ 	XFreeFontNames  @ 101
+ 	XListFontsWithInfo  @ 102
+ 	XFreeFontInfo  @ 103
+ 	XFreeColormap  @ 104
+ 	XFreeColors  @ 105
+ 	XFreeCursor  @ 106
+ 	_XFreeExtData  @ 107
+ 	XFreeGC  @ 108
+ 	XFreePixmap  @ 109
+ 	XActivateScreenSaver  @ 110
+ 	XResetScreenSaver  @ 111
+ 	XForceScreenSaver  @ 112
+ 	XSetArcMode  @ 113
+ 	XSetFillRule  @ 114
+ 	XSetFillStyle  @ 115
+ 	XSetGraphicsExposures  @ 116
+ 	XSetSubwindowMode  @ 117
+ 	XGeometry  @ 118
+ 	XGetAtomName  @ 119
+ 	XAllocNamedColor  @ 120
+ 	XGetDefault  @ 121
+ 	XGetFontPath  @ 122
+ 	XFreeFontPath  @ 123
+ 	XGetFontProperty  @ 124
+ 	XGetGeometry  @ 125
+ 	XAllocColor  @ 126
+ 	XGetSizeHints  @ 127
+ 	XGetWMHints  @ 128
+ 	XGetZoomHints  @ 129
+ 	XGetNormalHints  @ 130
+ 	XGetIconSizes  @ 131
+ 	XGetCommand  @ 132
+ 	XGetTransientForHint  @ 133
+ 	XGetClassHint  @ 134
+ 	XGetInputFocus  @ 135
+ 	XGetImage  @ 136
+ 	XGetSubImage  @ 137
+ 	XGetKeyboardControl  @ 138
+ 	XGetMotionEvents  @ 139
+ 	XGetPointerControl  @ 140
+ 	XGetPointerMapping  @ 141
+ 	XGetKeyboardMapping  @ 142
+ 	XGetWindowProperty  @ 143
+ 	XGetSelectionOwner  @ 144
+ 	XGetScreenSaver  @ 145
+ 	XGetStandardColormap  @ 146
+ 	XGetWindowAttributes  @ 147
+ 	XGrabButton  @ 148
+ 	XGrabKey  @ 149
+ 	XGrabKeyboard  @ 150
+ 	XGrabPointer  @ 151
+ 	XGrabServer  @ 152
+ 	XAddHost  @ 153
+ 	XRemoveHost  @ 154
+ 	XAddHosts  @ 155
+ 	XRemoveHosts  @ 156
+ 	XIfEvent  @ 157
+ 	_XGetScanlinePad  @ 158
+ 	_XGetBitsPerPixel  @ 159
+ 	XCreateImage  @ 160
+ 	_XSetImage  @ 161
+ 	_XInitImageFuncPtrs  @ 162
+ 	XDrawImageString  @ 163
+ 	XDrawImageString16  @ 164
+ 	XInitExtension  @ 165
+ 	XAddExtension  @ 166
+ 	XEHeadOfExtensionList  @ 167
+ 	XAddToExtensionList  @ 168
+ 	XFindOnExtensionList  @ 169
+ 	XESetCreateGC  @ 170
+ 	XESetCopyGC  @ 171
+ 	XESetFlushGC  @ 172
+ 	XESetFreeGC  @ 173
+ 	XESetCreateFont  @ 174
+ 	XESetFreeFont  @ 175
+ 	XESetCloseDisplay  @ 176
+ 	XESetWireToEvent  @ 177
+ 	XESetEventToWire  @ 178
+ 	XESetWireToError  @ 179
+ 	XESetError  @ 180
+ 	XESetErrorString  @ 181
+ 	XESetPrintErrorValues  @ 182
+ 	XInstallColormap  @ 183
+ 	XInternAtom  @ 184
+ 	XKeycodeToKeysym  @ 185
+ 	XKeysymToKeycode  @ 186
+ 	XLookupKeysym  @ 187
+ 	XRefreshKeyboardMapping  @ 188
+ 	XLookupString  @ 189
+ 	XRebindKeysym  @ 190
+ 	XKeysymToString  @ 191
+ 	XKillClient  @ 192
+ 	XListHosts  @ 193
+ 	XListInstalledColormaps  @ 194
+ 	XListProperties  @ 195
+ 	XListExtensions  @ 196
+ 	XFreeExtensionList  @ 197
+ 	XLoadFont  @ 198
+ 	XLookupColor  @ 199
+ 	XLowerWindow  @ 200
+ 	XConnectionNumber  @ 942
+ 	XRootWindow  @ 943
+ 	XDefaultScreen  @ 201
+ 	XDefaultRootWindow  @ 202
+ 	XDefaultVisual  @ 203
+ 	XDefaultGC  @ 204
+ 	XBlackPixel  @ 205
+ 	XWhitePixel  @ 206
+ 	XAllPlanes  @ 207
+ 	XQLength  @ 208
+ 	XDisplayWidth  @ 209
+ 	XDisplayHeight  @ 210
+ 	XDisplayWidthMM  @ 211
+ 	XDisplayHeightMM  @ 212
+ 	XDisplayPlanes  @ 213
+ 	XDisplayCells  @ 214
+ 	XScreenCount  @ 215
+ 	XServerVendor  @ 216
+ 	XProtocolVersion  @ 217
+ 	XProtocolRevision  @ 218
+ 	XVendorRelease  @ 219
+ 	XDisplayString  @ 220
+ 	XDefaultDepth  @ 221
+ 	XDefaultColormap  @ 222
+ 	XBitmapUnit  @ 223
+ 	XBitmapBitOrder  @ 224
+ 	XBitmapPad  @ 225
+ 	XImageByteOrder  @ 226
+ 	XNextRequest  @ 227
+ 	XLastKnownRequestProcessed  @ 228
+ 	XScreenOfDisplay  @ 229
+ 	XDefaultScreenOfDisplay  @ 230
+ 	XDisplayOfScreen  @ 231
+ 	XRootWindowOfScreen  @ 232
+ 	XBlackPixelOfScreen  @ 233
+ 	XWhitePixelOfScreen  @ 234
+ 	XDefaultColormapOfScreen  @ 235
+ 	XDefaultDepthOfScreen  @ 236
+ 	XDefaultGCOfScreen  @ 237
+ 	XDefaultVisualOfScreen  @ 238
+ 	XWidthOfScreen  @ 239
+ 	XHeightOfScreen  @ 240
+ 	XWidthMMOfScreen  @ 241
+ 	XHeightMMOfScreen  @ 242
+ 	XPlanesOfScreen  @ 243
+ 	XCellsOfScreen  @ 244
+ 	XMinCmapsOfScreen  @ 245
+ 	XMaxCmapsOfScreen  @ 246
+ 	XDoesSaveUnders  @ 247
+ 	XDoesBackingStore  @ 248
+ 	XEventMaskOfScreen  @ 249
+ 	XScreenNumberOfScreen  @ 250
+ 	XDestroyImage  @ 251
+ 	XGetPixel  @ 252
+ 	XPutPixel  @ 253
+ 	XSubImage  @ 254
+ 	XAddPixel  @ 255
+ 	XNoOp  @ 256
+ 	XMapRaised  @ 257
+ 	XMapSubwindows  @ 258
+ 	XMapWindow  @ 259
+ 	XMaskEvent  @ 260
+ 	XMaxRequestSize  @ 261
+ 	XResourceManagerString  @ 262
+ 	XDisplayMotionBufferSize  @ 263
+ 	XDisplayKeycodes  @ 264
+ 	XVisualIDFromVisual  @ 265
+ 	XGetModifierMapping  @ 266
+ 	XSetModifierMapping  @ 267
+ 	XNewModifiermap  @ 268
+ 	XFreeModifiermap  @ 269
+ 	XInsertModifiermapEntry  @ 270
+ 	XDeleteModifiermapEntry  @ 271
+ 	XMoveWindow  @ 272
+ 	XNextEvent  @ 273
+ 	XOpenDisplay  @ 274
+ 	_XFreeDisplayStructure  @ 275
+ 	XParseColor  @ 276
+ 	XParseGeometry  @ 277
+ 	XPeekEvent  @ 278
+ 	XPeekIfEvent  @ 279
+ 	XEventsQueued  @ 280
+ 	XPending  @ 281
+ 	XSetWindowBackgroundPixmap  @ 282
+ 	XSetWindowBorderPixmap  @ 283
+ 	XPolygonRegion  @ 284
+ 	XDrawText  @ 285
+ 	XDrawText16  @ 286
+ 	XPutBackEvent  @ 287
+ 	_XReverse_Bytes  @ 288
+ 	XPutImage  @ 289
+ 	XQueryBestSize  @ 290
+ 	XQueryColor  @ 291
+ 	XQueryColors  @ 292
+ 	XQueryBestCursor  @ 293
+ 	XQueryExtension  @ 294
+ 	XQueryKeymap  @ 295
+ 	XQueryPointer  @ 296
+ 	XQueryBestStipple  @ 297
+ 	XQueryTextExtents16  @ 298
+ 	XQueryTextExtents  @ 299
+ 	XQueryBestTile  @ 300
+ 	XQueryTree  @ 301
+ 	XRaiseWindow  @ 302
+ 	XReadBitmapFile  @ 303
+ 	XRecolorCursor  @ 304
+ 	XConfigureWindow  @ 305
+ 	XCreateRegion  @ 306
+ 	XClipBox  @ 307
+ 	XUnionRectWithRegion  @ 308
+ 	XSetRegion  @ 309
+ 	XDestroyRegion  @ 310
+ 	XOffsetRegion  @ 311
+ 	XShrinkRegion  @ 312
+ 	XIntersectRegion  @ 313
+ 	XUnionRegion  @ 314
+ 	XSubtractRegion  @ 315
+ 	XXorRegion  @ 316
+ 	XEmptyRegion  @ 317
+ 	XEqualRegion  @ 318
+ 	XPointInRegion  @ 319
+ 	XRectInRegion  @ 320
+ 	XReparentWindow  @ 321
+ 	XRestackWindows  @ 322
+ 	XRotateWindowProperties  @ 323
+ 	XScreenResourceString  @ 324
+ 	XSelectInput  @ 325
+ 	XSendEvent  @ 326
+ 	XSetBackground  @ 327
+ 	XSetClipRectangles  @ 328
+ 	_XSetClipRectangles  @ 329
+ 	XSetClipMask  @ 330
+ 	XSetClipOrigin  @ 331
+ 	XSetDashes  @ 332
+ 	XSetFontPath  @ 333
+ 	XSetFont  @ 334
+ 	XSetForeground  @ 335
+ 	XSetFunction  @ 336
+ 	XSetSizeHints  @ 337
+ 	XSetWMHints  @ 338
+ 	XSetZoomHints  @ 339
+ 	XSetNormalHints  @ 340
+ 	XSetIconSizes  @ 341
+ 	XSetCommand  @ 342
+ 	XSetStandardProperties  @ 343
+ 	XSetTransientForHint  @ 344
+ 	XSetClassHint  @ 345
+ 	XSetInputFocus  @ 346
+ 	XSetLineAttributes  @ 347
+ 	XSetPlaneMask  @ 348
+ 	XSetPointerMapping  @ 349
+ 	XChangeKeyboardMapping  @ 350
+ 	XSetSelectionOwner  @ 351
+ 	XSetScreenSaver  @ 352
+ 	XSetState  @ 353
+ 	XSetStipple  @ 354
+ 	XSetStandardColormap  @ 355
+ 	XSetTile  @ 356
+ 	XSetTSOrigin  @ 357
+ 	XRotateBuffers  @ 358
+ 	XFetchBuffer  @ 359
+ 	XFetchBytes  @ 360
+ 	XStoreBuffer  @ 361
+ 	XStoreBytes  @ 362
+ 	XStoreColor  @ 363
+ 	XStoreColors  @ 364
+ 	XStoreNamedColor  @ 365
+ 	XStoreName  @ 366
+ 	XSetIconName  @ 367
+ 	_XInitKeysymDB  @ 368
+ 	XStringToKeysym  @ 369
+ 	XSync  @ 370
+ 	_XSyncFunction  @ 371
+ 	XSynchronize  @ 372
+ 	XSetAfterFunction  @ 373
+ 	XDrawString  @ 374
+ 	XDrawString16  @ 375
+ 	XTextExtents  @ 376
+ 	XTextWidth  @ 377
+ 	XTextExtents16  @ 378
+ 	XTextWidth16  @ 379
+ 	XTranslateCoordinates  @ 380
+ 	XUndefineCursor  @ 381
+ 	XUngrabButton  @ 382
+ 	XUngrabKeyboard  @ 383
+ 	XUngrabKey  @ 384
+ 	XUngrabPointer  @ 385
+ 	XUngrabServer  @ 386
+ 	XUninstallColormap  @ 387
+ 	XUnloadFont  @ 388
+ 	XUnmapSubwindows  @ 389
+ 	XUnmapWindow  @ 390
+ 	XGetVisualInfo  @ 391
+ 	XMatchVisualInfo  @ 392
+ 	XWarpPointer  @ 393
+ 	XWindowEvent  @ 394
+ 	XCreateWindow  @ 395
+ 	_XProcessWindowAttributes  @ 396
+ 	XWriteBitmapFile  @ 397
+ 	_XFlush  @ 398
+ 	_XEventsQueued  @ 399
+ 	_XReadEvents  @ 400
+ 	_XRead  @ 401
+ 	_XReadPad  @ 402
+ 	_XSend  @ 403
+ 	_XAllocID  @ 404
+ 	_XSetLastRequestRead  @ 405
+ 	_XReply  @ 406
+ 	_XEatData  @ 407
+ 	_XEnq  @ 408
+ 	_XUnknownWireEvent  @ 409
+ 	_XUnknownNativeEvent  @ 410
+ 	_XWireToEvent  @ 411
+ 	_XDefaultIOError  @ 412
+ 	_XDefaultError  @ 413
+ 	_XDefaultWireError  @ 414
+ 	_XError  @ 415
+ 	_XIOError  @ 416
+ 	_XAllocScratch  @ 417
+ 	_XVIDtoVisual  @ 418
+ 	XFree  @ 419
+ 	_XGetHostname  @ 420
+ 	_XScreenOfWindow  @ 421
+ 	_XANYSET  @ 422
+ 	_XAllocIDs  @ 423
+ 	_XAllocTemp  @ 424
+ 	_XFreeTemp  @ 425
+ 	XrmInitialize  @ 426
+ 	XrmGetDatabase  @ 427
+ 	XrmSetDatabase  @ 428
+ 	XrmStringToQuarkList  @ 429
+ 	XrmStringToBindingQuarkList  @ 430
+ 	XrmCombineDatabase  @ 431
+ 	XrmMergeDatabases  @ 432
+ 	XrmQPutResource  @ 433
+ 	XrmPutResource  @ 434
+ 	XrmQPutStringResource  @ 435
+ 	XrmPutStringResource  @ 436
+ 	XrmPutLineResource  @ 437
+ 	XrmGetStringDatabase  @ 438
+ 	XrmGetFileDatabase  @ 439
+ 	XrmCombineFileDatabase  @ 440
+ 	XrmEnumerateDatabase  @ 441
+ 	XrmPutFileDatabase  @ 442
+ 	XrmQGetSearchList  @ 443
+ 	XrmQGetSearchResource  @ 444
+ 	XrmQGetResource  @ 445
+ 	XrmGetResource  @ 446
+ 	XrmLocaleOfDatabase  @ 447
+ 	XrmDestroyDatabase  @ 448
+ 	XGetGCValues  @ 449
+ 	XGetWMSizeHints  @ 450
+ 	XGetWMNormalHints  @ 451
+ 	XGetRGBColormaps  @ 452
+ 	XGetTextProperty  @ 453
+ 	XGetWMName  @ 454
+ 	XGetWMIconName  @ 455
+ 	XGetWMClientMachine  @ 456
+ 	XGetWMColormapWindows  @ 457
+ 	XGetWMProtocols  @ 458
+ 	XIconifyWindow  @ 459
+ 	XListPixmapFormats  @ 460
+ 	XAllocSizeHints  @ 461
+ 	XAllocStandardColormap  @ 462
+ 	XAllocWMHints  @ 463
+ 	XAllocClassHint  @ 464
+ 	XAllocIconSize  @ 465
+ 	XReconfigureWMWindow  @ 466
+ 	XSetWMSizeHints  @ 467
+ 	XSetWMNormalHints  @ 468
+ 	XSetRGBColormaps  @ 469
+ 	XSetTextProperty  @ 470
+ 	XSetWMName  @ 471
+ 	XSetWMIconName  @ 472
+ 	XSetWMClientMachine  @ 473
+ 	XSetWMColormapWindows  @ 474
+ 	XSetWMProperties  @ 475
+ 	XSetWMProtocols  @ 476
+ 	XStringListToTextProperty  @ 477
+ 	XTextPropertyToStringList  @ 478
+ 	XFreeStringList  @ 479
+ 	XWMGeometry  @ 480
+ 	XWithdrawWindow  @ 481
+ 	XauDisposeAuth  @ 482
+ 	XauGetBestAuthByAddr  @ 483
+ 	XauFileName  @ 484
+ 	XauReadAuth  @ 485
+ 	XcmsCIELabToCIEXYZ  @ 486
+ 	XcmsCIEXYZToCIELab  @ 487
+ 	XcmsCIELabClipab  @ 488
+ 	XcmsCIELabClipL  @ 489
+ 	XcmsCIELabClipLab  @ 490
+ 	XcmsCIELabQueryMinL  @ 491
+ 	XcmsCIELabQueryMaxC  @ 492
+ 	XcmsCIELabQueryMaxL  @ 493
+ 	_XcmsCIELabQueryMaxLCRGB  @ 494
+ 	XcmsCIELabQueryMaxLC  @ 495
+ 	XcmsCIELabWhiteShiftColors  @ 496
+ 	XcmsCIELuvToCIEuvY  @ 497
+ 	XcmsCIEuvYToCIELuv  @ 498
+ 	XcmsCIELuvClipuv  @ 499
+ 	XcmsCIELuvClipL  @ 500
+ 	XcmsCIELuvClipLuv  @ 501
+ 	XcmsCIELuvQueryMinL  @ 502
+ 	XcmsCIELuvQueryMaxC  @ 503
+ 	XcmsCIELuvQueryMaxL  @ 504
+ 	_XcmsCIELuvQueryMaxLCRGB  @ 505
+ 	XcmsCIELuvQueryMaxLC  @ 506
+ 	XcmsCIELuvWhiteShiftColors  @ 507
+ 	XcmsCIEuvYToCIEXYZ  @ 508
+ 	XcmsCIEXYZToCIEuvY  @ 509
+ 	XcmsCIExyYToCIEXYZ  @ 510
+ 	XcmsCIEXYZToCIExyY  @ 511
+ 	XcmsTekHVCToCIEuvY  @ 512
+ 	XcmsCIEuvYToTekHVC  @ 513
+ 	_XcmsTekHVC_CheckModify  @ 514
+ 	XcmsTekHVCClipC  @ 515
+ 	XcmsTekHVCClipV  @ 516
+ 	XcmsTekHVCClipVC  @ 517
+ 	XcmsTekHVCQueryMinV  @ 518
+ 	XcmsTekHVCQueryMaxC  @ 519
+ 	XcmsTekHVCQueryMaxV  @ 520
+ 	_XcmsTekHVCQueryMaxVCRGB  @ 521
+ 	XcmsTekHVCQueryMaxVC  @ 522
+ 	XcmsTekHVCQueryMaxVSamples  @ 523
+ 	XcmsTekHVCWhiteShiftColors  @ 524
+ 	XcmsAddColorSpace  @ 525
+ 	XcmsAddFunctionSet  @ 526
+ 	XcmsAllocNamedColor  @ 527
+ 	XcmsAllocColor  @ 528
+ 	XcmsCreateCCC  @ 529
+ 	XcmsDefaultCCC  @ 530
+ 	XcmsFreeCCC  @ 531
+ 	_XcmsAddCmapRec  @ 532
+ 	_XcmsCopyCmapRecAndFree  @ 533
+ 	_XcmsDeleteCmapRec  @ 534
+ 	XcmsCCCOfColormap  @ 535
+ 	_XcmsCopyISOLatin1Lowered  @ 536
+ 	_XcmsResolveColorString  @ 537
+ 	_XcmsConvertColorsWithWhitePt  @ 538
+ 	_XcmsEqualWhitePts  @ 539
+ 	_XcmsDIConvertColors  @ 540
+ 	_XcmsDDConvertColors  @ 541
+ 	XcmsConvertColors  @ 542
+ 	_XcmsRegFormatOfPrefix  @ 543
+ 	XcmsFormatOfPrefix  @ 544
+ 	_XcmsCopyPointerArray  @ 545
+ 	_XcmsFreePointerArray  @ 546
+ 	_XcmsPushPointerArray  @ 547
+ 	_XcmsInitDefaultCCCs  @ 548
+ 	_XcmsInitScrnInfo  @ 549
+ 	_XcmsFreeIntensityMaps  @ 550
+ 	_XcmsGetIntensityMap  @ 551
+ 	_XcmsGetTableType0  @ 552
+ 	_XcmsGetTableType1  @ 553
+ 	_XcmsValueCmp  @ 554
+ 	_XcmsIntensityCmp  @ 555
+ 	_XcmsValueInterpolation  @ 556
+ 	_XcmsIntensityInterpolation  @ 557
+ 	_XcmsTableSearch  @ 558
+ 	_XcmsMatVec  @ 559
+ 	XcmsCIEXYZToRGBi  @ 560
+ 	XcmsRGBiToCIEXYZ  @ 561
+ 	XcmsRGBiToRGB  @ 562
+ 	XcmsRGBToRGBi  @ 563
+ 	_XcmsLRGB_InitScrnDefault  @ 564
+ 	XcmsLookupColor  @ 565
+ 	_XcmsCubeRoot  @ 566
+ 	_XcmsSquareRoot  @ 567
+ 	XcmsDisplayOfCCC  @ 568
+ 	XcmsVisualOfCCC  @ 569
+ 	XcmsScreenNumberOfCCC  @ 570
+ 	XcmsScreenWhitePointOfCCC  @ 571
+ 	XcmsClientWhitePointOfCCC  @ 572
+ 	XcmsPrefixOfFormat  @ 573
+ 	_XcmsGetElement  @ 574
+ 	_XcmsGetProperty  @ 575
+ 	XcmsQueryBlack  @ 576
+ 	XcmsQueryBlue  @ 577
+ 	XcmsQueryGreen  @ 578
+ 	XcmsQueryRed  @ 579
+ 	XcmsQueryWhite  @ 580
+ 	XcmsQueryColor  @ 581
+ 	XcmsQueryColors  @ 582
+ 	XcmsSetWhitePoint  @ 583
+ 	XcmsSetCompressionProc  @ 584
+ 	XcmsSetWhiteAdjustProc  @ 585
+ 	_XcmsSetGetColors  @ 586
+ 	XcmsStoreColor  @ 587
+ 	XcmsStoreColors  @ 588
+ 	_XcmsCosine  @ 589
+ 	_XcmsSine  @ 590
+ 	_XcmsArcTangent  @ 591
+ 	_XcmsRGB_to_XColor  @ 592
+ 	_XColor_to_XcmsRGB  @ 593
+ 	_XcmsResolveColor  @ 594
+ 	_XcmsUnresolveColor  @ 595
+ 	_XUnresolveColor  @ 596
+ 	_XParseBaseFontNameList  @ 597
+ 	XCreateFontSet  @ 598
+ 	XFontsOfFontSet  @ 599
+ 	XBaseFontNameListOfFontSet  @ 941
+ 	XLocaleOfFontSet  @ 600
+ 	XContextDependentDrawing  @ 601
+ 	XExtentsOfFontSet  @ 602
+ 	XFreeFontSet  @ 603
+ 	XVaCreateNestedList  @ 604
+ 	XGetIMValues  @ 605
+ 	XCreateIC  @ 606
+ 	XDestroyIC  @ 607
+ 	XGetICValues  @ 608
+ 	XSetICValues  @ 609
+ 	XSetICFocus  @ 610
+ 	XUnsetICFocus  @ 611
+ 	XIMOfIC  @ 612
+ 	XmbResetIC  @ 613
+ 	XwcResetIC  @ 614
+ 	XmbLookupString  @ 615
+ 	XwcLookupString  @ 616
+ 	_XIMCompileResourceList  @ 617
+ 	_XCopyToArg  @ 618
+ 	XOpenIM  @ 619
+ 	XCloseIM  @ 620
+ 	XDisplayOfIM  @ 621
+ 	XLocaleOfIM  @ 622
+ 	XSetLocaleModifiers  @ 623
+ 	XSupportsLocale  @ 624
+ 	_XlcValidModSyntax  @ 625
+ 	_XlcDefaultMapModifiers  @ 626
+ 	_XlcAddLoader  @ 627
+ 	_XlcCurrentLC  @ 628
+ 	XmbSetWMProperties  @ 629
+ 	XmbDrawText  @ 630
+ 	XmbDrawString  @ 631
+ 	XmbDrawImageString  @ 632
+ 	XmbTextEscapement  @ 633
+ 	XmbTextExtents  @ 634
+ 	XmbTextPerCharExtents  @ 635
+ 	XwcDrawText  @ 636
+ 	XwcDrawString  @ 637
+ 	XwcDrawImageString  @ 638
+ 	XwcTextEscapement  @ 639
+ 	XwcTextExtents  @ 640
+ 	XwcTextPerCharExtents  @ 641
+ 	XFilterEvent  @ 642
+ 	_XRegisterFilterByMask  @ 643
+ 	_XRegisterFilterByType  @ 644
+ 	_XUnregisterFilter  @ 645
+ 	_Xsetlocale  @ 646
+ 	XDefaultString  @ 647
+ 	_XlcDefaultLoader  @ 648
+ 	_XrmInitParseInfo  @ 649
+ 	XmbTextPropertyToTextList  @ 650
+ 	XmbTextListToTextProperty  @ 651
+ 	XwcTextPropertyToTextList  @ 652
+ 	XwcFreeStringList  @ 653
+ 	XwcTextListToTextProperty  @ 654
+ 	_X11TransConnectDisplay  @ 655
+ 	XGetAtomNames  @ 656
+ 	XInitImage  @ 657
+ 	XESetBeforeFlush  @ 658
+ 	_XFreeAtomTable  @ 659
+ 	_XUpdateAtomCache  @ 660
+ 	XInternAtoms  @ 661
+ 	_XKeyInitialize  @ 662
+ 	XConvertCase  @ 663
+ 	_XTranslateKey  @ 664
+ 	_XTranslateKeySym  @ 665
+ 	_XKeysymToModifiers  @ 666
+ 	XExtendedMaxRequestSize  @ 667
+ 	XReadBitmapFileData  @ 668
+ 	_XAsyncErrorHandler  @ 669
+ 	_XDeqAsyncHandler  @ 670
+ 	_XGetAsyncReply  @ 671
+ 	_XGetAsyncData  @ 672
+ 	_XPollfdCacheInit  @ 673
+ 	_XPollfdCacheAdd  @ 674
+ 	_XPollfdCacheDel  @ 675
+ 	_XRegisterInternalConnection  @ 676
+ 	_XUnregisterInternalConnection  @ 677
+ 	XInternalConnectionNumbers  @ 678
+ 	XProcessInternalConnection  @ 679
+ 	XAddConnectionWatch  @ 680
+ 	XRemoveConnectionWatch  @ 681
+ 	_XDeq  @ 682
+ 	_XcmsCIEXYZ_ValidSpec  @ 683
+ 	_XcmsCIEuvY_ValidSpec  @ 684
+ 	XcmsSetCCCOfColormap  @ 685
+ 	XDirectionalDependentDrawing  @ 686
+ 	XContextualDrawing  @ 687
+ 	XSetIMValues  @ 688
+ 	XRegisterIMInstantiateCallback  @ 689
+ 	XUnregisterIMInstantiateCallback  @ 690
+ 	XCreateOC  @ 691
+ 	XDestroyOC  @ 692
+ 	XOMOfOC  @ 693
+ 	XSetOCValues  @ 694
+ 	XGetOCValues  @ 695
+ 	XOpenOM  @ 696
+ 	XCloseOM  @ 697
+ 	XSetOMValues  @ 698
+ 	XGetOMValues  @ 699
+ 	XDisplayOfOM  @ 700
+ 	XLocaleOfOM  @ 701
+ 	_XlcRemoveLoader  @ 702
+ 	_XOpenLC  @ 703
+ 	_XCloseLC  @ 704
+ 	_XlcCopyFromArg  @ 705
+ 	_XlcCopyToArg  @ 706
+ 	_XlcCountVaList  @ 707
+ 	_XlcVaToArgList  @ 708
+ 	_XlcCompileResourceList  @ 709
+ 	_XlcGetValues  @ 710
+ 	_XlcSetValues  @ 711
+ 	XInitThreads  @ 712
+ 	XLockDisplay  @ 713
+ 	XUnlockDisplay  @ 714
+ 	_X11TransFreeConnInfo  @ 715
+ 	_X11TransOpenCOTSClient  @ 716
+ 	_X11TransOpenCLTSClient  @ 717
+ 	_X11TransSetOption  @ 718
+ 	_X11TransConnect  @ 719
+ 	_X11TransBytesReadable  @ 720
+ 	_X11TransRead  @ 721
+ 	_X11TransWrite  @ 722
+ 	_X11TransReadv  @ 723
+ 	_X11TransWritev  @ 724
+ 	_X11TransDisconnect  @ 725
+ 	_X11TransClose  @ 726
+ 	_X11TransCloseForCloning  @ 727
+ 	_X11TransIsLocal  @ 728
+ 	_X11TransGetMyAddr  @ 729
+ 	_X11TransGetPeerAddr  @ 730
+ 	_X11TransGetConnectionNumber  @ 731
+ 	_X11TransGetHostname  @ 732
+ 	_X11TransConvertAddress  @ 733
+ 	_XimCbDispatch  @ 734
+ 	_XimLookupMBText  @ 735
+ 	_XimLookupWCText  @ 736
+ 	_XimRegisterFilter  @ 737
+ 	_XimUnregisterFilter  @ 738
+ 	_XimReregisterFilter  @ 739
+ 	_XimRegisterServerFilter  @ 740
+ 	_XimUnregisterServerFilter  @ 741
+ 	_XimProtoCreateIC  @ 742
+ 	_XimCheckDataSize  @ 743
+ 	_XimSetHeader  @ 744
+ 	_XimProtoIMFree  @ 745
+ 	_XimProtoOpenIM  @ 746
+ 	_XimICOfXICID  @ 747
+ 	_XimSetEventMaskCallback  @ 748
+ 	_XimSync  @ 749
+ 	_XimProcSyncReply  @ 750
+ 	_XimRespSyncReply  @ 751
+ 	_XimSyncCallback  @ 752
+ 	_XimForwardEvent  @ 753
+ 	_XimForwardEventCallback  @ 754
+ 	_XimRegisterTriggerKeysCallback  @ 755
+ 	_XimGetWindowEventmask  @ 756
+ 	_XimTriggerNotify  @ 757
+ 	_XimFreeCommitInfo  @ 758
+ 	_XimCommitCallback  @ 759
+ 	_XimProcError  @ 760
+ 	_XimErrorCallback  @ 761
+ 	_XimError  @ 762
+ 	_Ximctstombs  @ 763
+ 	_Ximctstowcs  @ 764
+ 	_XimProtoMbLookupString  @ 765
+ 	_XimProtoWcLookupString  @ 766
+ 	_XimRegProtoIntrCallback  @ 767
+ 	_XimFreeProtoIntrCallback  @ 768
+ 	_XimDispatchInit  @ 769
+ 	_XimProtoEventToWire  @ 770
+ 	_XimProtoWireToEvent  @ 771
+ 	_XimExtension  @ 772
+ 	_XimRegisterIMInstantiateCallback  @ 773
+ 	_XimUnRegisterIMInstantiateCallback  @ 774
+ 	_XimResetIMInstantiateCallback  @ 775
+ 	_XimDestroyIMStructureList  @ 776
+ 	_XimServerDestroy  @ 777
+ 	_XimOpenIM  @ 778
+ 	_XInitIM  @ 779
+ 	_XimLocalFilter  @ 780
+ 	_XimLocalGetICValues  @ 781
+ 	_XimLocalCreateIC  @ 782
+ 	_XimCheckIfLocalProcessing  @ 783
+ 	_XimLocalIMFree  @ 784
+ 	_XimLocalGetIMValues  @ 785
+ 	_XimLocalSetIMValues  @ 786
+ 	_XimLocalOpenIM  @ 787
+ 	_XimLocalMbLookupString  @ 788
+ 	_XimLocalWcLookupString  @ 789
+ 	XimParseStringFile  @ 790
+ 	_XimSetICValueData  @ 791
+ 	_XimLocalSetICValues  @ 792
+ 	_XimSetIMResourceList  @ 793
+ 	_XimSetICResourceList  @ 794
+ 	_XimSetInnerIMResourceList  @ 795
+ 	_XimSetInnerICResourceList  @ 796
+ 	_XimCheckCreateICValues  @ 797
+ 	_XimGetResourceListRec  @ 798
+ 	_XimSetIMMode  @ 799
+ 	_XimCheckIMMode  @ 800
+ 	_XimSetICMode  @ 801
+ 	_XimCheckICMode  @ 802
+ 	_XimSetLocalIMDefaults  @ 944
+ 	_XimSetICDefaults  @ 803
+ 	_XimDecodeLocalIMAttr  @ 804
+ 	_XimDecodeLocalICAttr  @ 805
+ 	_XimCheckLocalInputStyle  @ 806
+ 	_XimEncodeLocalIMAttr  @ 807
+ 	_XimEncodeLocalICAttr  @ 808
+ 	_XimGetCurrentIMValues  @ 809
+ 	_XimSetCurrentIMValues  @ 810
+ 	_XimGetCurrentICValues  @ 811
+ 	_XimSetCurrentICValues  @ 812
+ 	_XimInitialResourceInfo  @ 813
+ 	_XimDecodeIMATTRIBUTE  @ 814
+ 	_XimDecodeICATTRIBUTE  @ 815
+ 	_XimEncodeIMATTRIBUTE  @ 816
+ 	_XimEncodeICATTRIBUTE  @ 817
+ 	_XimGetAttributeID  @ 818
+ 	_XimThaiFilter  @ 819
+ 	_XimThaiCreateIC  @ 820
+ 	_XimCheckIfThaiProcessing  @ 821
+ 	_XimThaiOpenIM  @ 822
+ 	_XimThaiIMFree  @ 823
+ 	_XimThaiCloseIM  @ 824
+ 	_XimXConf  @ 825
+ 	_XimConnect  @ 826
+ 	_XimShutdown  @ 827
+ 	_XimFlush  @ 828
+ 	_XimFilterWaitEvent  @ 829
+ 	_XimFreeTransIntrCallback  @ 830
+ 	_XimTransFilterWaitEvent  @ 831
+ 	_XimTransInternalConnection  @ 832
+ 	_XimTransFlush  @ 833
+ 	_XimTransConf  @ 834
+ 	_XlcParseCharSet  @ 835
+ 	_XlcInitCTInfo  @ 836
+ 	_XlcGetCSValues  @ 837
+ 	_XlcGetCharSet  @ 838
+ 	_XlcAddCharSet  @ 839
+ 	_XlcCreateDefaultCharSet  @ 840
+ 	_XlcSetConverter  @ 841
+ 	_XlcOpenConverter  @ 842
+ 	_XlcCloseConverter  @ 843
+ 	_XlcConvert  @ 844
+ 	_XlcResetConverter  @ 845
+ 	_XlcGetResource  @ 846
+ 	_XlcGetLocaleDataBase  @ 847
+ 	_XlcDestroyLocaleDataBase  @ 848
+ 	_XlcCreateLocaleDataBase  @ 849
+ 	_XlcEucLoader  @ 850
+ 	_XlcFileName  @ 851
+ 	_XlcResolveLocaleName  @ 852
+ 	_XlcResolveDBName  @ 853
+ 	_XlcResolveI18NPath  @ 854
+ 	_XlcGenericLoader  @ 855
+ 	_XlcInitLoader  @ 856
+ 	_XmbTextPropertyToTextList  @ 857
+ 	_XwcTextPropertyToTextList  @ 858
+ 	_XwcFreeStringList  @ 859
+ 	_XGetLCValues  @ 860
+ 	_XlcDestroyLC  @ 861
+ 	_XlcCreateLC  @ 862
+ 	_XrmDefaultInitParseInfo  @ 863
+ 	_XlcSjisLoader  @ 864
+ 	_Xlcmbtowc  @ 865
+ 	_Xlcwctomb  @ 866
+ 	_Xlcmbstowcs  @ 867
+ 	_Xlcwcstombs  @ 868
+ 	_Xmbtowc  @ 869
+ 	_Xwctomb  @ 870
+ 	_Xmbstowcs  @ 871
+ 	_Xwcstombs  @ 872
+ 	_Xwcscpy  @ 873
+ 	_Xwcsncpy  @ 874
+ 	_Xwcslen  @ 875
+ 	_Xwcscmp  @ 876
+ 	_Xwcsncmp  @ 877
+ 	_XmbTextListToTextProperty  @ 878
+ 	_XwcTextListToTextProperty  @ 879
+ 	_XlcUtfLoader  @ 880
+ 	_XlcCompareISOLatin1  @ 881
+ 	_XlcNCompareISOLatin1  @ 882
+ 	_XmbDefalutTextEscapement  @ 883
+ 	_XwcDefalutTextEscapement  @ 884
+ 	_XmbDefalutTextExtents  @ 885
+ 	_XwcDefalutTextExtents  @ 886
+ 	_XmbDefalutTextPerCharExtents  @ 887
+ 	_XwcDefalutTextPerCharExtents  @ 888
+ 	_XmbDefalutDrawString  @ 889
+ 	_XwcDefalutDrawString  @ 890
+ 	_XmbDefalutDrawImageString  @ 891
+ 	_XwcDefalutDrawImageString  @ 892
+ 	_XomGenericOpenOM  @ 893
+ 	_XInitOM  @ 894
+ 	_XmbGenericDrawImageString  @ 895
+ 	_XwcGenericDrawImageString  @ 896
+ 	_XomGenericDrawString  @ 897
+ 	_XmbGenericDrawString  @ 898
+ 	_XwcGenericDrawString  @ 899
+ 	_XmbGenericTextEscapement  @ 900
+ 	_XwcGenericTextEscapement  @ 901
+ 	_XomGenericTextExtents  @ 902
+ 	_XmbGenericTextExtents  @ 903
+ 	_XwcGenericTextExtents  @ 904
+ 	_XmbGenericTextPerCharExtents  @ 905
+ 	_XwcGenericTextPerCharExtents  @ 906
+ 	_XomConvert  @ 907
+ 	_XomInitConverter  @ 908
+ 	_Xmblen  @ 909
+ 	_XimGetResourceName  @ 910
+ 	_XimGetResourceListRecByQuark  @ 911
+ 	_XimSetIMValueData  @ 912
+ 	_XimGetIMValueData  @ 913
+ 	_XimGetICValueData  @ 914
+ 	_XimMakeIMAttrIDList  @ 915
+ 	_XimMakeICAttrIDList  @ 916
+ 	_XimWrite  @ 917
+ 	_XimRead  @ 918
+ 	_XimRegisterDispatcher  @ 919
+ 	_XimTransRegisterDispatcher  @ 920
+ 	_XimTransCallDispatcher  @ 921
+ 	_XimTransWrite  @ 922
+ 	_XimTransRead  @ 923
+ 	_XimXTransFreeConnInfo  @ 924
+ 	_XimXTransOpenCOTSClient  @ 925
+ 	_XimXTransOpenCLTSClient  @ 926
+ 	_XimXTransSetOption  @ 927
+ 	_XimXTransConnect  @ 928
+ 	_XimXTransBytesReadable  @ 929
+ 	_XimXTransRead  @ 930
+ 	_XimXTransWrite  @ 931
+ 	_XimXTransReadv  @ 932
+ 	_XimXTransWritev  @ 933
+ 	_XimXTransDisconnect  @ 934
+ 	_XimXTransClose  @ 935
+ 	_XimXTransCloseForCloning  @ 936
+ 	_XimXTransIsLocal  @ 937
+ 	_XimXTransGetMyAddr  @ 938
+ 	_XimXTransGetPeerAddr  @ 939
+ 	_XimXTransGetConnectionNumber  @ 940
+ 	_XimXTransGetHostname  @ 945
+ 	__XOS2RedirRoot @ 950
diff -c /dev/null xc/lib/X11/X11os2.rsp:3.0
*** /dev/null	Mon Jan 30 17:46:55 1995
--- xc/lib/X11/X11os2.rsp	Mon Jan 30 17:46:55 1995
***************
*** 0 ****
--- 1,67 ----
+ AddDIC.obj AddSF.obj AllCells.obj AllPlanes.obj AllowEv.obj AuDispose.obj+
+ AuFileName.obj AuGetBest.obj AuRead.obj AutoRep.obj Backgnd.obj+
+ BdrWidth.obj Bell.obj Border.obj CCC.obj ChAccCon.obj ChActPGb.obj+
+ ChClMode.obj ChCmap.obj ChGC.obj ChKeyCon.obj ChPntCon.obj ChProp.obj+
+ ChSaveSet.obj ChWAttrs.obj ChWindow.obj ChkIfEv.obj ChkMaskEv.obj+
+ ChkTypEv.obj ChkTypWEv.obj ChkWinEv.obj CirWin.obj CirWinDn.obj CirWinUp.obj+
+ ClDisplay.obj Clear.obj ClearArea.obj ConfWind.obj ConnDis.obj Context.obj+
+ ConvSel.obj CopyArea.obj CopyCmap.obj CopyGC.obj CopyPlane.obj CrBFData.obj+
+ CrCmap.obj CrCursor.obj CrGC.obj CrGlCur.obj CrPFBData.obj CrPixmap.obj+
+ CrWindow.obj Cursor.obj CvColW.obj CvCols.obj DefCursor.obj DelProp.obj+
+ Depths.obj DestSubs.obj DestWind.obj DisName.obj DrArc.obj DrArcs.obj+
+ DrLine.obj DrLines.obj DrPoint.obj DrPoints.obj DrRect.obj DrRects.obj+
+ DrSegs.obj ErrDes.obj ErrHndlr.obj EvToWire.obj FSSaver.obj FSWrap.obj+
+ FetchName.obj FillArc.obj FillArcs.obj FillPoly.obj FillRct.obj FillRcts.obj+
+ FilterEv.obj Flush.obj Font.obj FontInfo.obj FontNames.obj FreeCmap.obj+
+ FreeCols.obj FreeCurs.obj FreeEData.obj FreeGC.obj FreePix.obj GCMisc.obj+
+ Geom.obj GetAtomNm.obj GetColor.obj GetDflt.obj GetFPath.obj GetFProp.obj+
+ GetGCVals.obj GetGeom.obj GetHColor.obj GetHints.obj GetIFocus.obj+
+ GetImage.obj GetKCnt.obj GetMoEv.obj GetNrmHint.obj GetPCnt.obj GetPntMap.obj+
+ GetProp.obj GetRGBCMap.obj GetSOwner.obj GetSSaver.obj GetStCmap.obj+
+ GetTxtProp.obj GetWAttrs.obj GetWMCMapW.obj GetWMProto.obj GrButton.obj+
+ GrKey.obj GrKeybd.obj GrPointer.obj GrServer.obj HVC.obj HVCGcC.obj+
+ HVCGcV.obj HVCGcVC.obj HVCMnV.obj HVCMxC.obj HVCMxV.obj HVCMxVC.obj+
+ HVCMxVs.obj HVCWpAj.obj Host.obj ICWrap.obj IMWrap.obj Iconify.obj IdOfPr.obj+
+ IfEvent.obj ImText.obj ImText16.obj ImUtil.obj InitExt.obj InsCmap.obj+
+ IntAtom.obj KeyBind.obj KeysymStr.obj KillCl.obj LRGB.obj Lab.obj LabGcC.obj+
+ LabGcL.obj LabGcLC.obj LabMnL.obj LabMxC.obj LabMxL.obj LabMxLC.obj+
+ LabWpAj.obj LiHosts.obj LiICmaps.obj LiProps.obj ListExt.obj LoadFont.obj+
+ LockDis.obj LookupCol.obj LowerWin.obj Luv.obj LuvGcC.obj LuvGcL.obj+
+ LuvGcLC.obj LuvMnL.obj LuvMxC.obj LuvMxL.obj LuvMxLC.obj LuvWpAj.obj+
+ Macros.obj MapRaised.obj MapSubs.obj MapWindow.obj MaskEvent.obj Misc.obj+
+ ModMap.obj MoveWin.obj NextEvent.obj OCWrap.obj OMWrap.obj OfCCC.obj+
+ OpenDis.obj ParseCmd.obj ParseCol.obj ParseGeom.obj PeekEvent.obj PeekIfEv.obj+
+ Pending.obj PixFormats.obj PmapBgnd.obj PmapBord.obj PolyReg.obj PolyTxt.obj+
+ PolyTxt16.obj PrOfId.obj PropAlloc.obj PutBEvent.obj PutImage.obj QBlack.obj+
+ QBlue.obj QGreen.obj QRed.obj QWhite.obj QuBest.obj QuCol.obj QuColor.obj+
+ QuColors.obj QuCols.obj QuCurShp.obj QuExt.obj QuKeybd.obj QuPntr.obj+
+ QuStipShp.obj QuTextE16.obj QuTextExt.obj QuTileShp.obj QuTree.obj Quarks.obj+
+ RaiseWin.obj RdBitF.obj RecolorC.obj ReconfWM.obj ReconfWin.obj Region.obj+
+ RegstFlt.obj RepWindow.obj RestackWs.obj RotProp.obj ScrResStr.obj+
+ SelInput.obj SendEvent.obj SetBack.obj SetCCC.obj SetCRects.obj SetClMask.obj+
+ SetClOrig.obj SetDashes.obj SetFPath.obj SetFont.obj SetFore.obj SetFunc.obj+
+ SetGetCols.obj SetHints.obj SetIFocus.obj SetLStyle.obj SetLocale.obj+
+ SetNrmHint.obj SetPMask.obj SetPntMap.obj SetRGBCMap.obj SetSOwner.obj+
+ SetSSaver.obj SetStCmap.obj SetState.obj SetStip.obj SetTSOrig.obj SetTile.obj+
+ SetTxtProp.obj SetWMCMapW.obj SetWMProto.obj StBytes.obj StCol.obj StColor.obj+
+ StColors.obj StCols.obj StNColor.obj StName.obj StrKeysym.obj StrToText.obj+
+ Sync.obj Synchro.obj Text.obj Text16.obj TextExt.obj TextExt16.obj+
+ TextToStr.obj TrCoords.obj UNDEFINED.obj UndefCurs.obj UngrabBut.obj+
+ UngrabKbd.obj UngrabKey.obj UngrabPtr.obj UngrabSvr.obj UninsCmap.obj+
+ UnldFont.obj UnmapSubs.obj UnmapWin.obj VisUtil.obj WMGeom.obj WMProps.obj+
+ WarpPtr.obj WinEvent.obj Window.obj Withdraw.obj WrBitF.obj XRGB.obj XYZ.obj+
+ XlibAsync.obj XlibInt.obj Xrm.obj cmsAllCol.obj cmsAllNCol.obj cmsCmap.obj+
+ cmsColNm.obj cmsGlobls.obj cmsInt.obj cmsLkCol.obj cmsMath.obj cmsProp.obj+
+ cmsTrig.obj evtomask.obj globals.obj imCallbk.obj imConv.obj imDefFlt.obj+
+ imDefIc.obj imDefIm.obj imDefLkup.obj imDispch.obj imEvToWire.obj imExten.obj+
+ imImSw.obj imInsClbk.obj imInt.obj imLcFlt.obj imLcGIc.obj imLcIc.obj+
+ imLcIm.obj imLcLkup.obj imLcPrs.obj imLcSIc.obj imRm.obj imRmAttr.obj+
+ imThaiFlt.obj imThaiIc.obj imThaiIm.obj imTrX.obj imTrans.obj imTransR.obj+
+ lcCT.obj lcCharSet.obj lcConv.obj lcDB.obj lcDefConv.obj lcEuc.obj lcFile.obj+
+ lcGenConv.obj lcGeneric.obj lcInit.obj lcPrTxt.obj lcPubWrap.obj lcPublic.obj+
+ lcRM.obj lcSjis.obj lcStd.obj lcTxtPr.obj lcUTF.obj lcUtil.obj lcWrap.obj+
+ locking.obj mbWMProps.obj mbWrap.obj omDefault.obj omGeneric.obj omImText.obj+
+ omText.obj omTextEsc.obj omTextExt.obj omTextPer.obj omXChar.obj uvY.obj+
+ wcWrap.obj x11trans.obj ximtrans.obj xyY.obj /NOL /NOD /BAT
+ X11.dll
+ 
diff -c xc/lib/X11/XKBCvt.c:1.1.1.1 xc/lib/X11/XKBCvt.c:3.0
*** xc/lib/X11/XKBCvt.c:1.1.1.1	Mon Jan 30 17:46:56 1995
--- xc/lib/X11/XKBCvt.c	Mon Jan 30 17:46:56 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* "$XConsortium: XKBCvt.c,v 1.14 94/04/17 20:21:35 erik Exp $"; */
+ /* $XFree86: xc/lib/X11/XKBCvt.c,v 3.0 1994/10/20 06:03:17 dawes Exp $ */
  /*
  
  Copyright (c) 1988, 1989  X Consortium
***************
*** 534,541 ****
      } else {
  	struct stat sbuf;
  	FILE *file;
! 	if ( (stat(CHARSET_FILE,&sbuf)==0) && (sbuf.st_mode&S_IFREG) &&
! 	    (file = fopen(CHARSET_FILE,"r")) ) {
  	    tmp = Xmalloc(sbuf.st_size+1);
  	    if (tmp!=NULL) {
  		sbuf.st_size = fread(tmp,1,sbuf.st_size,file);
--- 535,546 ----
      } else {
  	struct stat sbuf;
  	FILE *file;
! #ifdef __EMX__
!         char *cf = __XOS2RedirRoot(CHARSET_FILE);
! #else
! 	char *cf = CHARSET_FILE;
! 	if ( (stat(cf,&sbuf)==0) && (sbuf.st_mode&S_IFREG) &&
! 	    (file = fopen(cf,"r")) ) {
  	    tmp = Xmalloc(sbuf.st_size+1);
  	    if (tmp!=NULL) {
  		sbuf.st_size = fread(tmp,1,sbuf.st_size,file);
diff -c xc/lib/X11/Xlib.h:1.1.1.3 xc/lib/X11/Xlib.h:3.2
*** xc/lib/X11/Xlib.h:1.1.1.3	Mon Jan 30 17:46:58 1995
--- xc/lib/X11/Xlib.h	Mon Jan 30 17:46:58 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xlib.h,v 11.237 94/09/01 18:44:49 kaleb Exp $ */
+ /* $XFree86: xc/lib/X11/Xlib.h,v 3.2 1994/09/17 13:44:15 dawes Exp $ */
  /* 
  
  Copyright (c) 1985, 1986, 1987, 1991  X Consortium
***************
*** 60,66 ****
--- 61,69 ----
  
  #ifndef X_WCHAR
  #ifdef X_NOT_STDC_ENV
+ #ifndef SCO324
  #define X_WCHAR
+ #endif
  #endif
  #endif
  
diff -c xc/lib/X11/XlibInt.c:1.1.1.2 xc/lib/X11/XlibInt.c:3.2
*** xc/lib/X11/XlibInt.c:1.1.1.2	Mon Jan 30 17:47:00 1995
--- xc/lib/X11/XlibInt.c	Mon Jan 30 17:47:00 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: XlibInt.c,v 11.230 94/11/29 00:06:42 gildea Exp $ */
+ /* $XFree86: xc/lib/X11/XlibInt.c,v 3.2 1995/01/12 05:55:36 dawes Exp $ */
  /*
  
  Copyright (c) 1985, 1986, 1987  X Consortium
***************
*** 87,93 ****
--- 88,98 ----
  #define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)
  #else
  #if defined(EAGAIN) && defined(EWOULDBLOCK)
+ #ifdef __EMX__
+ #define ETEST() (sock_errno() == EAGAIN || sock_errno() == EWOULDBLOCK)
+ #else
  #define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)
+ #endif
  #else
  #ifdef EAGAIN
  #define ETEST() (errno == EAGAIN)
***************
*** 100,108 ****
--- 105,118 ----
  #define ECHECK(err) (WSAGetLastError() == err)
  #define ESET(val) WSASetLastError(val)
  #else
+ #ifdef __EMX__
+ #define ECHECK(err) (sock_errno() == err)
+ #define ESET(val)
+ #else
  #define ECHECK(err) (errno == err)
  #define ESET(val) errno = val
  #endif
+ #endif
  
  #if defined(LOCALCONN) || defined(LACHMAN)
  #ifdef EMSGSIZE
***************
*** 191,196 ****
--- 201,208 ----
      xcondition_t cv;		/* our reading condition variable */
  #endif
  {
+ #if !defined(AMOEBA)
+ 
  #ifdef USE_POLL
      struct pollfd filedes;
  #else
***************
*** 327,332 ****
--- 339,349 ----
  	    return;
  	}
      }
+ #else  /* AMOEBA */
+     /* Should not happen under Amoeba */
+     printf("_XWaitForWritable called unexpectedly\n");
+     _XIOError(dpy);
+ #endif /* AMOEBA */
  }
  
  
***************
*** 411,416 ****
--- 428,434 ----
  _XWaitForReadable(dpy)
    Display *dpy;
  {
+ #if !defined(AMOEBA)
      int result;
      int fd = dpy->fd;
      struct _XConnectionInfo *ilist;  
***************
*** 517,522 ****
--- 535,547 ----
  #endif
  #endif
      return 0;
+ #else  /* AMOEBA */
+     int nbytes;
+ 
+     /* wait max 100 msec (why?) for data to become available */
+     nbytes = _X11TransAmSelect(ConnectionNumber(dpy), 100);
+     return (nbytes > 0) ? 0 : -1;
+ #endif /* AMOEBA */
  }
  
  static
***************
*** 2654,2672 ****
  }
  
  
- #ifndef USL_SHARELIB
- 
- static char *_SysErrorMsg (n)
-     int n;
- {
-     char *s = strerror(n);
- 
-     return (s ? s : "no such error");
- }
- 
- #endif 	/* USL sharedlibs in don't define for SVR3.2 */
- 
- 
  /*
   * _XDefaultIOError - Default fatal system error reporting routine.  Called 
   * when an X internal system error is encountered.
--- 2679,2684 ----
***************
*** 2684,2690 ****
  #ifdef WIN32
  			WSAGetLastError(), strerror(WSAGetLastError()),
  #else
! 			errno, _SysErrorMsg (errno),
  #endif
  			DisplayString (dpy));
  	    (void) fprintf (stderr, 
--- 2696,2706 ----
  #ifdef WIN32
  			WSAGetLastError(), strerror(WSAGetLastError()),
  #else
! #ifdef __EMX__
! 			sock_errno(), "socket error",
! #else
! 			errno, strerror (errno),
! #endif
  #endif
  			DisplayString (dpy));
  	    (void) fprintf (stderr, 
***************
*** 3235,3239 ****
--- 3251,3276 ----
  	if (src[ i ])
  	    return (1);
      return (0);
+ }
+ #endif
+ 
+ #ifdef __EMX__
+ char *__XOS2RedirRoot(char *fname)
+ {
+     /* This adds a further redirection by allowing the ProjectRoot
+      * to be prepended by the content of the envvar X11ROOT.
+      * This is for the purpose to move the whole X11 stuff to a different
+      * disk drive.
+      * The feature was added despite various environment variables
+      * because not all file opens respect them.
+      */
+     static char redirname[300]; /* enough for long filenames */
+     char *root = (char*)getenv("X11ROOT");
+     if (root==0 || 
+ 	(fname[1]==':' && tolower(fname[0]) >= 'a' && tolower(fname[0] <= 'z') ||
+         (strlen(fname)+strlen(root)+2) > 300))
+ 	return fname;
+     sprintf(redirname,"%s%s",root,fname);
+     return access(redirname,R_OK)==0 ? redirname : fname;
  }
  #endif
diff -c xc/lib/X11/Xlibint.h:1.1.1.1 xc/lib/X11/Xlibint.h:3.0
*** xc/lib/X11/Xlibint.h:1.1.1.1	Mon Jan 30 17:47:01 1995
--- xc/lib/X11/Xlibint.h	Mon Jan 30 17:47:01 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xlibint.h,v 11.143 94/04/17 20:21:50 rws Exp $ */
+ /* $XFree86: xc/lib/X11/Xlibint.h,v 3.0 1994/10/20 06:03:24 dawes Exp $ */
  
  /*
  
***************
*** 1191,1195 ****
--- 1192,1204 ----
      XPointer client_data;
      struct _XConnWatchInfo *next;
  };
+ 
+ #ifdef __EMX__
+ extern char* __XOS2RedirRoot(
+ #if NeedFunctionPrototypes
+     char*
+ #endif
+ );
+ #endif
  
  _XFUNCPROTOEND
diff -c xc/lib/X11/Xlibnet.h:1.1.1.1 xc/lib/X11/Xlibnet.h:3.2
*** xc/lib/X11/Xlibnet.h:1.1.1.1	Mon Jan 30 17:47:02 1995
--- xc/lib/X11/Xlibnet.h	Mon Jan 30 17:47:02 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xlibnet.h,v 1.39 94/04/17 20:21:51 mor Exp $ */
+ /* $XFree86: xc/lib/X11/Xlibnet.h,v 3.2 1994/10/20 06:03:26 dawes Exp $ */
  /*
  
  Copyright (c) 1991  X Consortium
***************
*** 33,38 ****
--- 34,40 ----
   */
  
  #ifndef WIN32
+ #ifndef AMOEBA
  
  /*
   * If your BytesReadable correctly detects broken connections, then
***************
*** 84,89 ****
--- 86,96 ----
  #include <sys/poll.h>
  #endif
  
+ #ifdef __EMX__
+ #define BSD_SELECT
+ #include <sys/select.h>
+ #endif
+ 
  #if !defined(USE_POLL) || defined(STREAMSCONN)
  
  #ifdef WORD64
***************
*** 198,203 ****
--- 205,211 ----
   */
  #endif
  #endif
+ #endif /* not AMOEBA */
  
  #else /* not WIN32 */
  
***************
*** 218,220 ****
--- 226,233 ----
  #define _XANYSET(set) set.fd_count
  
  #endif /* WIN32 */
+ 
+ #ifdef MINIX
+ #define select(nr, r_set, w_set, x_set, tvp) \
+ 	nbio_select(nr, r_set, w_set, x_set, tvp)
+ #endif /* MINIX */
diff -c xc/lib/X11/Xrm.c:1.1.1.1 xc/lib/X11/Xrm.c:3.0
*** xc/lib/X11/Xrm.c:1.1.1.1	Mon Jan 30 17:47:03 1995
--- xc/lib/X11/Xrm.c	Mon Jan 30 17:47:03 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xrm.c,v 1.88 94/04/17 20:21:54 rws Exp $ */
+ /* $XFree86: xc/lib/X11/Xrm.c,v 3.0 1994/10/20 06:03:29 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard
***************
*** 1535,1546 ****
  {
      register int fd, size;
      char * filebuf;
! 
      if ( (fd = OpenFile(filename)) == -1 )
  	return (char *)NULL;
  
      GetSizeOfFile(filename, size);
! 	
      if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
  	close(fd);
  	return (char *)NULL;
--- 1536,1549 ----
  {
      register int fd, size;
      char * filebuf;
! #ifdef __EMX__
!     filename = __XOS2RedirRoot(filename);
! #endif
      if ( (fd = OpenFile(filename)) == -1 )
  	return (char *)NULL;
  
      GetSizeOfFile(filename, size);
! 
      if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
  	close(fd);
  	return (char *)NULL;
diff -c xc/lib/X11/cmsColNm.c:1.1.1.1 xc/lib/X11/cmsColNm.c:3.0
*** xc/lib/X11/cmsColNm.c:1.1.1.1	Mon Jan 30 17:47:04 1995
--- xc/lib/X11/cmsColNm.c	Mon Jan 30 17:47:04 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: cmsColNm.c,v 1.28 94/03/31 21:50:05 rws Exp $" */
+ /* $XFree86: xc/lib/X11/cmsColNm.c,v 3.0 1994/10/20 06:03:32 dawes Exp $ */
  
  /*
   * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
***************
*** 729,734 ****
--- 730,738 ----
      if ((pathname = getenv("XCMSDB")) == NULL) {
  	pathname = XCMSDB;
      }
+ #ifdef __EMX__
+     pathname = __XOS2RedirRoot(pathname);
+ #endif
  
      length = strlen(pathname);
      if ((length == 0) || (length >= (BUFSIZ - 5))){
diff -c xc/lib/X11/jump_funcs:1.1.1.1 xc/lib/X11/jump_funcs:3.6
*** xc/lib/X11/jump_funcs:1.1.1.1	Mon Jan 30 17:47:06 1995
--- xc/lib/X11/jump_funcs	Mon Jan 30 17:47:06 1995
***************
*** 1,5 ****
  # $XConsortium: jump_funcs,v 1.7 95/01/27 22:17:51 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_funcs,v 3.3 1995/01/14 10:41:20 dawes Exp $
  #
  00000000 T _XSaveContext        libX11         Context
  00000000 T _XFindContext        libX11         Context
--- 1,5 ----
  # $XConsortium: jump_funcs,v 1.7 95/01/27 22:17:51 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_funcs,v 3.6 1995/01/28 15:42:53 dawes Exp $
  #
  00000000 T _XSaveContext        libX11         Context
  00000000 T _XFindContext        libX11         Context
***************
*** 424,430 ****
  00000000 T _XFree               libX11         XlibInt
  00000000 T __XGetHostname       libX11         XlibInt
  00000000 T __XScreenOfWindow    libX11         XlibInt
! 00000000 U __DUMMY__            libX11         XlibInt
  00000000 T __XAllocIDs          libX11       XlibInt
  00000000 T __XAllocTemp         libX11       XlibInt
  00000000 T __XFreeTemp          libX11       XlibInt
--- 424,430 ----
  00000000 T _XFree               libX11         XlibInt
  00000000 T __XGetHostname       libX11         XlibInt
  00000000 T __XScreenOfWindow    libX11         XlibInt
! 00000000 T __DUMMY__            libX11         XlibInt
  00000000 T __XAllocIDs          libX11       XlibInt
  00000000 T __XAllocTemp         libX11       XlibInt
  00000000 T __XFreeTemp          libX11       XlibInt
***************
*** 650,656 ****
  00000000 T __XRegisterFilterByType libX11         XRegstFlt
  00000000 T __XUnregisterFilter  libX11         XRegstFlt
  #ifdef X_LOCALE
! 00000000 U __DUMMY__ 		libX11         XSetLocale
  #else
  00000000 T __XlcMapOSLocaleName libX11         XSetLocale
  #endif
--- 650,656 ----
  00000000 T __XRegisterFilterByType libX11         XRegstFlt
  00000000 T __XUnregisterFilter  libX11         XRegstFlt
  #ifdef X_LOCALE
! 00000000 T __DUMMY__ libX11         XSetLocale
  #else
  00000000 T __XlcMapOSLocaleName libX11         XSetLocale
  #endif
***************
*** 1109,1121 ****
  00000000 T __XdmcpAuthSetup     libX11         Wraphelp
  00000000 T __XdmcpAuthDoIt      libX11         Wraphelp
  #else
! 00000000 T __DUMMY__		libX11	       Wrap
! 00000000 T __DUMMY__		libX11	       Wrap
! 00000000 T __DUMMY__		libX11	       Wraphelp
! 00000000 T __DUMMY__		libX11	       Wraphelp
  #endif
  #ifdef X_LOCALE
! 00000000 T __Xsetlocale		libX11         SetLocale
  #else
! 00000000 T __DUMMY__		libX11	       SetLocale
  #endif
--- 1109,1121 ----
  00000000 T __XdmcpAuthSetup     libX11         Wraphelp
  00000000 T __XdmcpAuthDoIt      libX11         Wraphelp
  #else
! 00000000 T __DUMMY__           libX11         Wrap
! 00000000 T __DUMMY__ libX11         Wrap
! 00000000 T __DUMMY__     libX11         Wraphelp
! 00000000 T __DUMMY__      libX11         Wraphelp
  #endif
  #ifdef X_LOCALE
! 00000000 T __Xsetlocale         libX11         SetLocale
  #else
! 00000000 T __DUMMY__         libX11         SetLocale
  #endif
diff -c xc/lib/X11/jump_ignore:1.1.1.1 xc/lib/X11/jump_ignore:3.2
*** xc/lib/X11/jump_ignore:1.1.1.1	Mon Jan 30 17:47:07 1995
--- xc/lib/X11/jump_ignore	Mon Jan 30 17:47:07 1995
***************
*** 1,3 ****
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:48:04 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_ignore,v 3.0 1994/04/28 12:31:17 dawes Exp $
  # jump_ignore
--- 1,4 ----
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:48:04 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_ignore,v 3.2 1995/01/29 02:05:24 dawes Exp $
  # jump_ignore
+ 00000000 T __XANYSET            libX11         XlibInt
diff -c xc/lib/X11/jump_vars:1.1.1.1 xc/lib/X11/jump_vars:3.1
*** xc/lib/X11/jump_vars:1.1.1.1	Mon Jan 30 17:47:07 1995
--- xc/lib/X11/jump_vars	Mon Jan 30 17:47:07 1995
***************
*** 1,5 ****
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:04 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_vars,v 3.0 1994/04/28 12:31:18 dawes Exp $
  #
  00008000 K __XkeyTable          libX11         XStrKeysym
  00000100 K __Xevent_to_mask     libX11         evtomask
--- 1,5 ----
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:04 kaleb Exp $
! # $XFree86: xc/lib/X11/jump_vars,v 3.1 1995/01/28 15:42:57 dawes Exp $
  #
  00008000 K __XkeyTable          libX11         XStrKeysym
  00000100 K __Xevent_to_mask     libX11         evtomask
diff -c xc/lib/X11/lcGenConv.c:1.1.1.2 xc/lib/X11/lcGenConv.c:3.1
*** xc/lib/X11/lcGenConv.c:1.1.1.2	Mon Jan 30 17:47:08 1995
--- xc/lib/X11/lcGenConv.c	Mon Jan 30 17:47:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: lcGenConv.c,v 1.6 94/11/21 18:23:20 kaleb Exp $ */
+ /* $XFree86: xc/lib/X11/lcGenConv.c,v 3.1 1995/01/28 15:42:59 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by TOSHIBA Corp.
   *
diff -c xc/lib/X11/lcInit.c:1.1.1.1 xc/lib/X11/lcInit.c:3.0
*** xc/lib/X11/lcInit.c:1.1.1.1	Mon Jan 30 17:47:08 1995
--- xc/lib/X11/lcInit.c	Mon Jan 30 17:47:08 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: lcInit.c,v 1.2 94/01/20 18:06:58 rws Exp $ */
+ /* $XFree86: xc/lib/X11/lcInit.c,v 3.0 1994/06/28 12:21:04 dawes Exp $ */
  /*
   * Copyright 1992, 1993 by TOSHIBA Corp.
   *
***************
*** 27,32 ****
--- 28,34 ----
  #include "Xlibint.h"
  #include "Xlcint.h"
  
+ #ifndef X11_TINY_LC
  #define USE_GENERIC_LOADER
  #ifdef NOTDEF
  #define USE_UTF_LOADER
***************
*** 33,38 ****
--- 35,41 ----
  #define USE_EUC_LOADER
  #endif
  #define USE_SJIS_LOADER
+ #endif
  
  
  extern XLCd _XlcDefaultLoader(
diff -c /dev/null xc/lib/XExExt/Imakefile:3.0
*** /dev/null	Mon Jan 30 17:47:13 1995
--- xc/lib/XExExt/Imakefile	Mon Jan 30 17:47:13 1995
***************
*** 0 ****
--- 1,26 ----
+ XCOMM $XFree86: xc/lib/XExExt/Imakefile,v 3.0 1994/06/28 12:22:27 dawes Exp $
+ #define DoNormalLib NormalLibXExExt
+ #define DoSharedLib SharedLibXExExt
+ #define DoDebugLib DebugLibXExExt
+ #define DoProfileLib ProfileLibXExExt
+ #define LibName XExExt
+ #define SoRev SOXEXEXTREV
+ #define LibHeaders NO
+ 
+ #include <Threads.tmpl>
+ 
+ #ifdef SharedXExExtReqs
+ REQUIREDLIBS = SharedXExExtReqs
+ #endif
+ 
+ SCRNSAVSRC = XScrnSaver.c
+ SCRNSAVOBJ = XScrnSaver.o
+ 
+      INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
+          SRCS = $(SCRNSAVSRC)
+          OBJS = $(SCRNSAVOBJ)
+      LINTLIBS = $(LINTXLIB)
+ 
+ #include <Library.tmpl>
+ 
+ DependTarget()
diff -c /dev/null xc/lib/XExExt/XScrnSaver.c:3.0
*** /dev/null	Mon Jan 30 17:47:14 1995
--- xc/lib/XExExt/XScrnSaver.c	Mon Jan 30 17:47:15 1995
***************
*** 0 ****
--- 1,441 ----
+ /*
+  * $XConsortium: XScrnSaver.c,v 1.5 94/04/17 20:59:35 rws Exp $
+  *
+ Copyright (c) 1992  X Consortium
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of the X Consortium shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from the X Consortium.
+  *
+  * Author:  Keith Packard, MIT X Consortium
+  */
+ 
+ #define NEED_EVENTS
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
+ #include "Xext.h"			/* in ../include */
+ #include "extutil.h"			/* in ../include */
+ #include "saverproto.h"			/* in ../include */
+ #include "scrnsaver.h"
+ 
+ 
+ static XExtensionInfo _screen_saver_info_data;
+ static XExtensionInfo *screen_saver_info = &_screen_saver_info_data;
+ static /* const */ char *screen_saver_extension_name = ScreenSaverName;
+ 
+ #define ScreenSaverCheckExtension(dpy,i,val) \
+   XextCheckExtension (dpy, i, screen_saver_extension_name, val)
+ #define ScreenSaverSimpleCheckExtension(dpy,i) \
+   XextSimpleCheckExtension (dpy, i, screen_saver_extension_name)
+ 
+ static int close_display();
+ static Bool wire_to_event();
+ static Status event_to_wire();
+ static /* const */ XExtensionHooks screen_saver_extension_hooks = {
+     NULL,				/* create_gc */
+     NULL,				/* copy_gc */
+     NULL,				/* flush_gc */
+     NULL,				/* free_gc */
+     NULL,				/* create_font */
+     NULL,				/* free_font */
+     close_display,			/* close_display */
+     wire_to_event,			/* wire_to_event */
+     event_to_wire,			/* event_to_wire */
+     NULL,				/* error */
+     NULL,				/* error_string */
+ };
+ 
+ static XEXT_GENERATE_FIND_DISPLAY (find_display, screen_saver_info,
+ 				   screen_saver_extension_name, 
+ 				   &screen_saver_extension_hooks,
+ 				   ScreenSaverNumberEvents, NULL)
+ 
+ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, screen_saver_info)
+ 
+ 
+ static Bool wire_to_event (dpy, re, event)
+     Display *dpy;
+     XEvent  *re;
+     xEvent  *event;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     XScreenSaverNotifyEvent	*se;
+     xScreenSaverNotifyEvent	*sevent;
+ 
+     ScreenSaverCheckExtension (dpy, info, False);
+ 
+     switch ((event->u.u.type & 0x7f) - info->codes->first_event) {
+     case ScreenSaverNotify:
+     	se = (XScreenSaverNotifyEvent *) re;
+ 	sevent = (xScreenSaverNotifyEvent *) event;
+     	se->type = sevent->type & 0x7f;
+     	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
+     	se->send_event = (sevent->type & 0x80) != 0;
+     	se->display = dpy;
+     	se->window = sevent->window;
+     	se->window = sevent->root;
+     	se->state = sevent->state;
+ 	se->kind = sevent->kind;
+ 	se->forced = True;
+ 	if (sevent->forced == xFalse)
+ 	    se->forced = False;
+ 	se->time = sevent->timestamp;
+     	return True;
+     }
+     return False;
+ }
+ 
+ static Status event_to_wire (dpy, re, event)
+     Display *dpy;
+     XEvent  *re;
+     xEvent  *event;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     XScreenSaverNotifyEvent	*se;
+     xScreenSaverNotifyEvent	*sevent;
+ 
+     ScreenSaverCheckExtension (dpy, info, 0);
+ 
+     switch ((re->type & 0x7f) - info->codes->first_event) {
+     case ScreenSaverNotify:
+     	se = (XScreenSaverNotifyEvent *) re;
+ 	sevent = (xScreenSaverNotifyEvent *) event;
+     	sevent->type = se->type | (se->send_event ? 0x80 : 0);
+     	sevent->sequenceNumber = se->serial & 0xffff;
+     	sevent->root = se->root;
+     	sevent->window = se->window;
+     	sevent->state = se->state;
+ 	sevent->kind = se->kind;
+ 	sevent->forced = xFalse;
+ 	if (se->forced == True)
+ 	    sevent->forced = xTrue;
+ 	sevent->timestamp = se->time;
+     	return 1;
+     }
+     return 0;
+ }
+ 
+ /****************************************************************************
+  *                                                                          *
+  *			    ScreenSaver public interfaces                         *
+  *                                                                          *
+  ****************************************************************************/
+ 
+ Bool XScreenSaverQueryExtension (dpy, event_basep, error_basep)
+     Display *dpy;
+     int *event_basep, *error_basep;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+ 
+     if (XextHasExtension(info)) {
+ 	*event_basep = info->codes->first_event;
+ 	*error_basep = info->codes->first_error;
+ 	return True;
+     } else {
+ 	return False;
+     }
+ }
+ 
+ 
+ Status XScreenSaverQueryVersion(dpy, major_versionp, minor_versionp)
+     Display *dpy;
+     int	    *major_versionp, *minor_versionp;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xScreenSaverQueryVersionReply	    rep;
+     register xScreenSaverQueryVersionReq  *req;
+ 
+     ScreenSaverCheckExtension (dpy, info, 0);
+ 
+     LockDisplay (dpy);
+     GetReq (ScreenSaverQueryVersion, req);
+     req->reqType = info->codes->major_opcode;
+     req->saverReqType = X_ScreenSaverQueryVersion;
+     req->clientMajor = ScreenSaverMajorVersion;
+     req->clientMinor = ScreenSaverMinorVersion;
+     if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+ 	UnlockDisplay (dpy);
+ 	SyncHandle ();
+ 	return 0;
+     }
+     *major_versionp = rep.majorVersion;
+     *minor_versionp = rep.minorVersion;
+     UnlockDisplay (dpy);
+     SyncHandle ();
+     return 1;
+ }
+ 
+ XScreenSaverInfo *XScreenSaverAllocInfo ()
+ {
+     return (XScreenSaverInfo *) Xmalloc (sizeof (XScreenSaverInfo));
+ }
+ 
+ Status XScreenSaverQueryInfo (dpy, drawable, saver_info)
+     Display		*dpy;
+     Drawable		drawable;
+     XScreenSaverInfo	*saver_info;
+ {
+     XExtDisplayInfo			*info = find_display (dpy);
+     xScreenSaverQueryInfoReply		rep;
+     register xScreenSaverQueryInfoReq	*req;
+ 
+     ScreenSaverCheckExtension (dpy, info, 0);
+ 
+     LockDisplay (dpy);
+     GetReq (ScreenSaverQueryInfo, req);
+     req->reqType = info->codes->major_opcode;
+     req->saverReqType = X_ScreenSaverQueryInfo;
+     req->drawable = drawable;
+     if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+ 	UnlockDisplay (dpy);
+ 	SyncHandle ();
+ 	return 0;
+     }
+     UnlockDisplay (dpy);
+     SyncHandle ();
+     saver_info->window = rep.window;
+     saver_info->state = rep.state;
+     saver_info->kind = rep.kind;
+     saver_info->til_or_since = rep.tilOrSince;
+     saver_info->idle = rep.idle;
+     saver_info->eventMask = rep.eventMask;
+     return 1;
+ }
+ 
+ void XScreenSaverSelectInput (dpy, drawable, mask)
+     register Display	*dpy;
+     Drawable		drawable;
+     unsigned long	mask;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     register xScreenSaverSelectInputReq   *req;
+ 
+     ScreenSaverSimpleCheckExtension (dpy, info);
+ 
+     LockDisplay (dpy);
+     GetReq (ScreenSaverSelectInput, req);
+     req->reqType = info->codes->major_opcode;
+     req->saverReqType = X_ScreenSaverSelectInput;
+     req->drawable = drawable;
+     req->eventMask = mask;
+     UnlockDisplay (dpy);
+     SyncHandle ();
+ }
+ 
+ static void
+ XScreenSaverProcessWindowAttributes (dpy, req, valuemask, attributes)
+     register Display *dpy;
+     xChangeWindowAttributesReq *req;
+     register unsigned long valuemask;
+     register XSetWindowAttributes *attributes;
+     {
+     unsigned long values[32];
+     register unsigned long *value = values;
+     unsigned int nvalues;
+ 
+     if (valuemask & CWBackPixmap)
+ 	*value++ = attributes->background_pixmap;
+ 	
+     if (valuemask & CWBackPixel)
+     	*value++ = attributes->background_pixel;
+ 
+     if (valuemask & CWBorderPixmap)
+     	*value++ = attributes->border_pixmap;
+ 
+     if (valuemask & CWBorderPixel)
+     	*value++ = attributes->border_pixel;
+ 
+     if (valuemask & CWBitGravity)
+     	*value++ = attributes->bit_gravity;
+ 
+     if (valuemask & CWWinGravity)
+ 	*value++ = attributes->win_gravity;
+ 
+     if (valuemask & CWBackingStore)
+         *value++ = attributes->backing_store;
+     
+     if (valuemask & CWBackingPlanes)
+ 	*value++ = attributes->backing_planes;
+ 
+     if (valuemask & CWBackingPixel)
+     	*value++ = attributes->backing_pixel;
+ 
+     if (valuemask & CWOverrideRedirect)
+     	*value++ = attributes->override_redirect;
+ 
+     if (valuemask & CWSaveUnder)
+     	*value++ = attributes->save_under;
+ 
+     if (valuemask & CWEventMask)
+ 	*value++ = attributes->event_mask;
+ 
+     if (valuemask & CWDontPropagate)
+ 	*value++ = attributes->do_not_propagate_mask;
+ 
+     if (valuemask & CWColormap)
+ 	*value++ = attributes->colormap;
+ 
+     if (valuemask & CWCursor)
+ 	*value++ = attributes->cursor;
+ 
+     req->length += (nvalues = value - values);
+ 
+     nvalues <<= 2;			    /* watch out for macros... */
+     Data32 (dpy, (long *) values, (long)nvalues);
+ 
+     }
+ 
+ void XScreenSaverSetAttributes (dpy, drawable, x, y, width, height,
+ 				border_width, depth, class, visual,
+ 				valuemask, attributes)
+     Display*		    dpy;
+     Drawable		    drawable;
+     int			    x;
+     int			    y;
+     unsigned int	    width;
+     unsigned int	    height;
+     unsigned int	    border_width;
+     int			    depth;
+     unsigned int	    class;
+     Visual *		    visual;
+     unsigned long	    valuemask;
+     XSetWindowAttributes    *attributes;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     register xScreenSaverSetAttributesReq   *req;
+ 
+     ScreenSaverSimpleCheckExtension (dpy, info);
+ 
+     LockDisplay (dpy);
+     GetReq (ScreenSaverSetAttributes, req);
+     req->reqType = info->codes->major_opcode;
+     req->saverReqType = X_ScreenSaverSetAttributes;
+     req->drawable = drawable;
+     req->x = x;
+     req->y = y;
+     req->width = width;
+     req->height = height;
+     req->borderWidth = border_width;
+     req->c_class = class;
+     req->depth = depth;
+     if (visual == CopyFromParent)
+ 	req->visualID = CopyFromParent;
+     else
+ 	req->visualID = visual->visualid;
+     /* abuse an Xlib internal interface - is this legal for us? */
+     if (req->mask = valuemask) 
+         XScreenSaverProcessWindowAttributes (dpy,
+ 			(xChangeWindowAttributesReq *)req, 
+ 			valuemask, attributes);
+     UnlockDisplay (dpy);
+     SyncHandle ();
+ }
+ 
+ 
+ void XScreenSaverUnsetAttributes (dpy, drawable)
+     register Display	*dpy;
+     Drawable		drawable;
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     register xScreenSaverUnsetAttributesReq   *req;
+ 
+     ScreenSaverSimpleCheckExtension (dpy, info);
+ 
+     LockDisplay (dpy);
+     GetReq (ScreenSaverUnsetAttributes, req);
+     req->reqType = info->codes->major_opcode;
+     req->saverReqType = X_ScreenSaverUnsetAttributes;
+     req->drawable = drawable;
+     UnlockDisplay (dpy);
+     SyncHandle ();
+ }
+ 
+ 
+ Status XScreenSaverRegister (dpy, screen, xid, type)
+     Display *dpy;
+     int screen;
+     XID xid;
+     Atom type;
+ {
+     Atom prop;
+     unsigned long ul;
+ 
+     prop = XInternAtom (dpy, ScreenSaverPropertyName, False);
+     if (!prop)
+ 	return 0;
+ 
+     ul = (unsigned long) xid;
+     XChangeProperty (dpy, RootWindow(dpy,screen), prop, type, 32, 
+ 		     PropModeReplace, (unsigned char *) &ul, 1);
+     return 1;
+ }
+ 
+ 
+ 
+ Status XScreenSaverUnregister (dpy, screen)
+     Display *dpy;
+     int screen;
+ {
+     Atom prop;
+ 
+     prop = XInternAtom (dpy, ScreenSaverPropertyName, False);
+     if (!prop)
+ 	return 0;
+ 
+     XDeleteProperty (dpy, RootWindow(dpy,screen), prop);
+     return 1;
+ }
+ 
+ 
+ 
+ Status XScreenSaverGetRegistered (dpy, screen, xid, type)
+     Display *dpy;
+     int screen;
+     XID *xid;
+     Atom *type;
+ {
+     Atom actual_type = None;
+     int actual_format;
+     unsigned long nitems, bytesafter;
+     unsigned long *ulp = (unsigned long *) 0;
+     Atom prop;
+     int retval = 0;
+ 
+     prop = XInternAtom (dpy, ScreenSaverPropertyName, False);
+     if (!prop)
+ 	return retval;
+ 
+     if (XGetWindowProperty (dpy, RootWindow(dpy,screen), prop, 0L, 1L, False,
+ 			    AnyPropertyType, &actual_type,  &actual_format,
+ 			    &nitems, &bytesafter, (unsigned char **) &ulp)
+ 	!= Success)
+ 	return retval;
+ 
+     if (ulp) {
+ 	if (actual_format == 32) {
+ 	    *xid = (XID) ulp[0];
+ 	    *type = actual_type;
+ 	    retval = 1;
+ 	}
+ 	XFree ((char *) ulp);
+     }
+     return retval;
+ }	
diff -c /dev/null xc/lib/XIE/XIEos2.def:3.0
*** /dev/null	Mon Jan 30 17:47:17 1995
--- xc/lib/XIE/XIEos2.def	Mon Jan 30 17:47:17 1995
***************
*** 0 ****
--- 1,117 ----
+ LIBRARY XIE
+ DESCRIPTION "X11R6 XFree86 libXIE.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 XieAbort  @ 1
+ 	 XieAllocatePhotofloGraph  @ 2
+ 	 XieAwait  @ 3
+ 	 XieCreateColorList  @ 4
+ 	 XieCreateLUT  @ 5
+ 	 XieCreatePhotoflo  @ 6
+ 	 XieCreatePhotomap  @ 7
+ 	 XieCreatePhotospace  @ 8
+ 	 XieCreateROI  @ 9
+ 	 XieDestroyColorList  @ 10
+ 	 XieDestroyLUT  @ 11
+ 	 XieDestroyPhotoflo  @ 12
+ 	 XieDestroyPhotomap  @ 13
+ 	 XieDestroyPhotospace  @ 14
+ 	 XieDestroyROI  @ 15
+ 	 XieExecuteImmediate  @ 16
+ 	 XieExecutePhotoflo  @ 17
+ 	 XieFloArithmetic  @ 18
+ 	 XieFloBandCombine  @ 19
+ 	 XieFloBandExtract  @ 20
+ 	 XieFloBandSelect  @ 21
+ 	 XieFloBlend  @ 22
+ 	 XieFloCompare  @ 23
+ 	 XieFloConstrain  @ 24
+ 	 XieFloConvertFromIndex  @ 25
+ 	 XieFloConvertFromRGB  @ 26
+ 	 XieFloConvertToIndex  @ 27
+ 	 XieFloConvertToRGB  @ 28
+ 	 XieFloConvolve  @ 29
+ 	 XieFloDither  @ 30
+ 	 XieFloExportClientHistogram  @ 31
+ 	 XieFloExportClientLUT  @ 32
+ 	 XieFloExportClientPhoto  @ 33
+ 	 XieFloExportClientROI  @ 34
+ 	 XieFloExportDrawable  @ 35
+ 	 XieFloExportDrawablePlane  @ 36
+ 	 XieFloExportLUT  @ 37
+ 	 XieFloExportPhotomap  @ 38
+ 	 XieFloExportROI  @ 39
+ 	 XieFloGeometry  @ 40
+ 	 XieFloImportClientLUT  @ 41
+ 	 XieFloImportClientPhoto  @ 42
+ 	 XieFloImportClientROI  @ 43
+ 	 XieFloImportDrawable  @ 44
+ 	 XieFloImportDrawablePlane  @ 45
+ 	 XieFloImportLUT  @ 46
+ 	 XieFloImportPhotomap  @ 47
+ 	 XieFloImportROI  @ 48
+ 	 XieFloLogical  @ 49
+ 	 XieFloMatchHistogram  @ 50
+ 	 XieFloMath  @ 51
+ 	 XieFloPasteUp  @ 52
+ 	 XieFloPoint  @ 53
+ 	 XieFloUnconstrain  @ 54
+ 	 XieFreeEncodeJPEGBaseline  @ 55
+ 	 XieFreeEncodeJPEGLossless  @ 56
+ 	 XieFreePasteUpTiles  @ 57
+ 	 XieFreePhotofloGraph  @ 58
+ 	 XieFreeTechniques  @ 59
+ 	 XieGetClientData  @ 60
+ 	 XieInitialize  @ 61
+ 	 XieModifyPhotoflo  @ 62
+ 	 XiePurgeColorList  @ 63
+ 	 XiePutClientData  @ 64
+ 	 XieQueryColorList  @ 65
+ 	 XieQueryPhotoflo  @ 66
+ 	 XieQueryPhotomap  @ 67
+ 	 XieQueryTechniques  @ 68
+ 	 XieRedefinePhotoflo  @ 69
+ 	 XieTecCIELabToRGB  @ 70
+ 	 XieTecCIEXYZToRGB  @ 71
+ 	 XieTecClipScale  @ 72
+ 	 XieTecColorAllocAll  @ 73
+ 	 XieTecColorAllocMatch  @ 74
+ 	 XieTecColorAllocRequantize  @ 75
+ 	 XieTecConvolveConstant  @ 76
+ 	 XieTecDecodeG31D  @ 77
+ 	 XieTecDecodeG32D  @ 78
+ 	 XieTecDecodeG42D  @ 79
+ 	 XieTecDecodeJPEGBaseline  @ 80
+ 	 XieTecDecodeJPEGLossless  @ 81
+ 	 XieTecDecodeTIFF2  @ 82
+ 	 XieTecDecodeTIFFPackBits  @ 83
+ 	 XieTecDecodeUncompressedSingle  @ 84
+ 	 XieTecDecodeUncompressedTriple  @ 85
+ 	 XieTecDitherOrderedParam  @ 86
+ 	 XieTecEncodeG31D  @ 87
+ 	 XieTecEncodeG32D  @ 88
+ 	 XieTecEncodeG42D  @ 89
+ 	 XieTecEncodeJPEGBaseline  @ 90
+ 	 XieTecEncodeJPEGLossless  @ 91
+ 	 XieTecEncodeServerChoice  @ 92
+ 	 XieTecEncodeTIFF2  @ 93
+ 	 XieTecEncodeTIFFPackBits  @ 94
+ 	 XieTecEncodeUncompressedSingle  @ 95
+ 	 XieTecEncodeUncompressedTriple  @ 96
+ 	 XieTecGeomAntialiasByArea  @ 97
+ 	 XieTecGeomAntialiasByLowpass  @ 98
+ 	 XieTecGeomGaussian  @ 99
+ 	 XieTecGeomNearestNeighbor  @ 100
+ 	 XieTecHistogramGaussian  @ 101
+ 	 XieTecHistogramHyperbolic  @ 102
+ 	 XieTecRGBToCIELab  @ 103
+ 	 XieTecRGBToCIEXYZ  @ 104
+ 	 XieTecRGBToYCC  @ 105
+ 	 XieTecRGBToYCbCr  @ 106
+ 	 XieTecWhiteAdjustCIELabShift  @ 107
+ 	 XieTecYCCToRGB  @ 108
+ 	 XieTecYCbCrToRGB  @ 109
diff -c /dev/null xc/lib/XIE/XIEos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:47:18 1995
--- xc/lib/XIE/XIEos2.rsp	Mon Jan 30 17:47:18 1995
***************
*** 0 ****
--- 1,5 ----
+ abort.obj await.obj clientdata.obj colorlist.obj conven.obj elements.obj+
+ errors.obj events.obj free.obj ieee.obj init.obj lut.obj photoflo.obj+
+ photomap.obj photospace.obj roi.obj technique.obj utils.obj /NOL /NOD /BAT
+ XIE.dll
+ 
diff -c xc/lib/XIE/jump_funcs:1.1.1.1 xc/lib/XIE/jump_funcs:3.1
*** xc/lib/XIE/jump_funcs:1.1.1.1	Mon Jan 30 17:47:18 1995
--- xc/lib/XIE/jump_funcs	Mon Jan 30 17:47:18 1995
***************
*** 1,5 ****
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_funcs,v 3.0 1994/04/28 12:31:33 dawes Exp $
  00000000 T _XieAbort            libXIE         abort
  00000000 T _XieAwait            libXIE         await
  00000000 T _XiePutClientData    libXIE         clientdata
--- 1,5 ----
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_funcs,v 3.1 1995/01/28 15:43:09 dawes Exp $
  00000000 T _XieAbort            libXIE         abort
  00000000 T _XieAwait            libXIE         await
  00000000 T _XiePutClientData    libXIE         clientdata
diff -c xc/lib/XIE/jump_ignore:1.1.1.1 xc/lib/XIE/jump_ignore:3.1
*** xc/lib/XIE/jump_ignore:1.1.1.1	Mon Jan 30 17:47:18 1995
--- xc/lib/XIE/jump_ignore	Mon Jan 30 17:47:18 1995
***************
*** 1,3 ****
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_ignore,v 3.0 1994/04/28 12:31:35 dawes Exp $
  # jump_ignore
--- 1,3 ----
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_ignore,v 3.1 1995/01/28 15:43:12 dawes Exp $
  # jump_ignore
diff -c xc/lib/XIE/jump_vars:1.1.1.1 xc/lib/XIE/jump_vars:3.1
*** xc/lib/XIE/jump_vars:1.1.1.1	Mon Jan 30 17:47:19 1995
--- xc/lib/XIE/jump_vars	Mon Jan 30 17:47:19 1995
***************
*** 1,5 ****
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_vars,v 3.0 1994/04/28 12:31:38 dawes Exp $
  00000004 D __XieExtInfoHeader   libXIE         init
  000000b4 D __XieElemFuncs       libXIE         init
  00000004 D __XieTechFuncsInitialized libXIE         init
--- 1,5 ----
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:44:37 kaleb Exp $
! # $XFree86: xc/lib/XIE/jump_vars,v 3.1 1995/01/28 15:43:13 dawes Exp $
  00000004 D __XieExtInfoHeader   libXIE         init
  000000b4 D __XieElemFuncs       libXIE         init
  00000004 D __XieTechFuncsInitialized libXIE         init
diff -c xc/lib/Xau/AuLock.c:1.1.1.1 xc/lib/Xau/AuLock.c:3.0
*** xc/lib/Xau/AuLock.c:1.1.1.1	Mon Jan 30 17:47:21 1995
--- xc/lib/Xau/AuLock.c	Mon Jan 30 17:47:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: AuLock.c,v 1.15 94/04/17 20:15:43 rws Exp $ */
+ /* $XFree86: xc/lib/Xau/AuLock.c,v 3.0 1994/10/20 06:04:31 dawes Exp $ */
  
  /*
  
***************
*** 31,37 ****
  #include <X11/Xos.h>
  #include <sys/stat.h>
  #include <errno.h>
! #ifdef X_NOT_STDC_ENV
  extern int errno;
  #define Time_t long
  extern Time_t time ();
--- 32,38 ----
  #include <X11/Xos.h>
  #include <sys/stat.h>
  #include <errno.h>
! #if defined(X_NOT_STDC_ENV)
  extern int errno;
  #define Time_t long
  extern Time_t time ();
***************
*** 47,52 ****
--- 48,56 ----
  #else
  #define link rename
  #endif
+ #endif
+ #ifdef __EMX__
+ #define link rename
  #endif
  
  #if NeedFunctionPrototypes
diff -c xc/lib/Xau/Imakefile:1.1.1.2 xc/lib/Xau/Imakefile:3.1
*** xc/lib/Xau/Imakefile:1.1.1.2	Mon Jan 30 17:47:21 1995
--- xc/lib/Xau/Imakefile	Mon Jan 30 17:47:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.25 94/11/21 18:21:36 kaleb Exp $
+ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.1 1995/01/28 15:43:16 dawes Exp $
  #define DoNormalLib NormalLibXau
  #define DoSharedLib SharedLibXau
  #define DoDebugLib DebugLibXau
diff -c xc/lib/Xaw/Panner.c:1.1.1.2 xc/lib/Xaw/Panner.c:3.2
*** xc/lib/Xaw/Panner.c:1.1.1.2	Mon Jan 30 17:47:29 1995
--- xc/lib/Xaw/Panner.c	Mon Jan 30 17:47:29 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Panner.c,v 1.52 95/01/10 14:31:26 kaleb Exp $
+  * $XFree86: xc/lib/Xaw/Panner.c,v 3.2 1995/01/28 15:43:27 dawes Exp $
   *
  Copyright (c) 1989, 1994  X Consortium
  
***************
*** 42,47 ****
--- 43,52 ----
  
  #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern double atof(char *);
+ #else
+ #if !defined(X_NOT_STDC_ENV) || defined(SCO)
+ #include <stdlib.h>			/* for atof() */
+ #endif
  #endif
  
  static char defaultTranslations[] = 
diff -c xc/lib/Xaw/XawI18n.h:1.1.1.3 xc/lib/Xaw/XawI18n.h:3.2
*** xc/lib/Xaw/XawI18n.h:1.1.1.3	Mon Jan 30 17:47:29 1995
--- xc/lib/Xaw/XawI18n.h	Mon Jan 30 17:47:29 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: XawI18n.h,v 1.12 95/01/25 00:48:44 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.2 1995/01/28 15:43:29 dawes Exp $ */
  
  /************************************************************
  
diff -c /dev/null xc/lib/Xaw/Xawos2.def:3.0
*** /dev/null	Mon Jan 30 17:47:30 1995
--- xc/lib/Xaw/Xawos2.def	Mon Jan 30 17:47:30 1995
***************
*** 0 ****
--- 1,158 ----
+ LIBRARY Xaw
+ DESCRIPTION "X11R6 XFree86 libXaw.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 32768
+ EXPORTS
+ 	XawAsciiSourceFreeString  @ 1
+ 	XawAsciiSave  @ 2
+ 	XawAsciiSaveAsFile  @ 3
+ 	XawAsciiSourceChanged  @ 4
+ 	XawDialogAddButton  @ 5
+ 	XawDialogGetValueString  @ 6
+ 	XawFormDoLayout  @ 7	
+ 	XawListChange  @ 8
+ 	XawListUnhighlight  @ 9
+ 	XawListHighlight  @ 10
+ 	XawListShowCurrent  @ 11
+ 	XawPanedSetMinMax  @ 13
+ 	XawPanedGetMinMax  @ 14
+ 	XawPanedSetRefigureMode  @ 15
+ 	XawPanedGetNumSub  @ 16
+ 	XawScrollbarSetThumb  @ 18
+ 	XawSimpleMenuAddGlobalActions  @ 19
+ 	XawSimpleMenuGetActiveEntry  @ 20
+ 	XawSimpleMenuClearActiveEntry  @ 21
+ 	XawTextDisplay  @ 22
+ 	XawTextEnableRedisplay  @ 23
+ 	XawTextDisableRedisplay  @ 24
+ 	XawTextSetSelectionArray  @ 25
+ 	XawTextGetSelectionPos  @ 26
+ 	XawTextSetSource  @ 27
+ 	XawTextReplace  @ 28
+ 	XawTextTopPosition  @ 29
+ 	XawTextSetInsertionPoint  @ 30
+ 	XawTextGetInsertionPoint  @ 31
+ 	XawTextUnsetSelection  @ 32
+ 	XawTextSetSelection  @ 33
+ 	XawTextInvalidate  @ 34
+ 	XawTextGetSource  @ 35
+ 	XawTextSearch  @ 36
+ 	XawTextDisplayCaret  @ 37
+ 	XawTextSinkDisplayText  @ 38
+ 	XawTextSinkInsertCursor  @ 39
+ 	XawTextSinkClearToBackground  @ 40
+ 	XawTextSinkFindPosition  @ 41
+ 	XawTextSinkFindDistance  @ 42
+ 	XawTextSinkResolve  @ 43
+ 	XawTextSinkMaxLines  @ 44
+ 	XawTextSinkMaxHeight  @ 45
+ 	XawTextSinkSetTabs  @ 46
+ 	XawTextSinkGetCursorBounds  @ 47
+ 	XawTextSourceRead  @ 48
+ 	XawTextSourceReplace  @ 49
+ 	XawTextSourceScan  @ 50
+ 	XawTextSourceSearch  @ 51
+ 	XawTextSourceConvertSelection  @ 52
+ 	XawTextSourceSetSelection  @ 53
+ 	XawToggleChangeRadioGroup  @ 54
+ 	XawToggleGetCurrent  @ 55
+ 	XawToggleSetCurrent  @ 56
+ 	XawToggleUnsetCurrent  @ 57
+ 	XawTreeForceLayout  @ 58
+ 	XawViewportSetLocation	@ 59
+ 	XawViewportSetCoordinates  @ 60
+ 	_XawMultiSinkPosToXY  @ 61
+ 	_XawMultiSave  @ 62
+ 	_XawMultiSaveAsFile  @ 63
+ 	_XawMultiSourceFreeString  @ 64
+ 	_XawTextFormat  @ 65
+ 	_XawTextBuildLineTable	@ 66
+ 	_XawTextGetSTRING  @ 67
+ 	_XawTextSaltAwaySelection  @ 68
+ 	_XawTextPosToXY  @ 69
+ 	_XawTextWCToMB  @ 70
+ 	_XawTextMBToWC  @ 71
+ 	_Xaw_atowc  @ 72
+ 	_XawImResizeVendorShell  @ 73
+ 	_XawImGetShellHeight  @ 74
+ 	_XawImRealize  @ 75
+ 	_XawImInitialize  @ 76
+ 	_XawImReconnect  @ 77
+ 	_XawImRegister  @ 78
+ 	_XawImUnregister  @ 79
+ 	_XawImSetValues  @ 80
+ 	_XawImVASetValues  @ 81
+ 	_XawImSetFocusValues  @ 82
+ 	_XawImVASetFocusValues  @ 83
+ 	_XawImUnsetFocus  @ 84
+ 	_XawImWcLookupString  @ 85
+ 	_XawImGetImAreaHeight  @ 86
+ 	_XawImCallVendorShellExtResize  @ 87
+ 	_XawImDestroy  @ 88
+ 	_XawTextZapSelection  @ 89
+ 	_XawTextInsertFileAction  @ 90
+ 	_XawTextInsertFile  @ 91
+ 	_XawTextDoSearchAction  @ 92
+ 	_XawTextPopdownSearchAction  @ 93
+ 	_XawTextSearch  @ 94
+ 	_XawTextDoReplaceAction  @ 95
+ 	_XawTextSetField  @ 96
+ 	asciiSrcObjectClass  @ 100
+ 	asciiSrcClassRec  @ 101
+ 	dialogWidgetClass  @ 102
+ 	dialogClassRec  @ 103
+ 	formWidgetClass  @ 104
+ 	formClassRec  @ 105
+ 	listWidgetClass  @ 106
+ 	listClassRec  @ 107
+ 	multiSinkObjectClass  @ 108
+ 	multiSinkClassRec  @ 109
+ 	multiSrcObjectClass  @ 110
+ 	multiSrcClassRec  @ 111
+ 	panedWidgetClass  @ 112
+ 	panedClassRec  @ 113
+ 	scrollbarWidgetClass  @ 114
+ 	scrollbarClassRec  @ 115
+ 	simpleMenuWidgetClass  @ 116
+ 	simpleMenuClassRec   @ 117
+ 	FMT8BIT  @ 118
+ 	XawFmt8Bit  @ 119
+ 	XawFmtWide  @ 120
+ 	_XawTextActionsTable  @ 121
+ 	_XawTextActionsTableCount  @ 122
+ 	textWidgetClass  @ 123
+ 	textClassRec  @ 124
+ 	textSinkObjectClass @ 125
+ 	textSinkClassRec  @ 126
+ 	toggleWidgetClass  @ 127
+ 	toggleClassRec  @ 128
+ 	treeWidgetClass @ 129
+ 	treeClassRec  @ 130
+ 	viewportWidgetClass  @ 131
+ 	viewportClassRec  @ 132
+ 	menuButtonClassRec @ 133
+ 	menuButtonWidgetClass @ 134
+ 	smeBSBClassRec @ 135
+ 	smeBSBObjectClass @ 136
+ 	smeLineClassRec @ 137
+ 	smeLineObjectClass @ 138
+ 	labelClassRec @ 139
+ 	labelWidgetClass @ 140
+ 	commandClassRec @ 141
+ 	commandWidgetClass @ 142
+ 	boxClassRec @ 143
+ 	boxWidgetClass @ 144
+ 	simpleClassRec @ 145
+ 	simpleWidgetClass @ 146
+ 	XawInitializeWidgetSet @ 147
+ 	asciiTextClassRec @ 148
+ 	asciiTextWidgetClass @ 149
+ 	portholeClassRec @ 150
+ 	portholeWidgetClass @ 151
+ 	pannerClassRec @ 152
+ 	pannerWidgetClass @ 153
+ 	textSrcClassRec @ 154
+ 	textSrcObjectClass @ 155
diff -c /dev/null xc/lib/Xaw/Xawos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:47:30 1995
--- xc/lib/Xaw/Xawos2.rsp	Mon Jan 30 17:47:30 1995
***************
*** 0 ****
--- 1,9 ----
+ AllWidgets.obj AsciiSink.obj AsciiSrc.obj AsciiText.obj Box.obj Command.obj+
+ Dialog.obj Form.obj Grip.obj Label.obj List.obj MenuButton.obj MultiSink.obj+
+ MultiSrc.obj Paned.obj Panner.obj Porthole.obj Repeater.obj Scrollbar.obj+
+ Simple.obj SimpleMenu.obj Sme.obj SmeBSB.obj SmeLine.obj StripChart.obj+
+ Text.obj TextAction.obj TextPop.obj TextSink.obj TextSrc.obj TextTr.obj+
+ Toggle.obj Tree.obj Vendor.obj Viewport.obj XawI18n.obj XawIm.obj+
+ XawInit.obj /NOL /NOD /BAT
+ Xaw.dll
+ 
diff -c xc/lib/Xaw/jump_funcs:1.1.1.1 xc/lib/Xaw/jump_funcs:3.1
*** xc/lib/Xaw/jump_funcs:1.1.1.1	Mon Jan 30 17:47:30 1995
--- xc/lib/Xaw/jump_funcs	Mon Jan 30 17:47:30 1995
***************
*** 1,5 ****
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_funcs,v 3.0 1994/04/28 12:31:51 dawes Exp $
  #
  00000000 T _XawAsciiSourceFreeString libXaw         AsciiSrc
  00000000 T _XawAsciiSave        libXaw         AsciiSrc
--- 1,5 ----
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_funcs,v 3.1 1995/01/28 15:43:31 dawes Exp $
  #
  00000000 T _XawAsciiSourceFreeString libXaw         AsciiSrc
  00000000 T _XawAsciiSave        libXaw         AsciiSrc
diff -c xc/lib/Xaw/jump_ignore:1.1.1.1 xc/lib/Xaw/jump_ignore:3.1
*** xc/lib/Xaw/jump_ignore:1.1.1.1	Mon Jan 30 17:47:31 1995
--- xc/lib/Xaw/jump_ignore	Mon Jan 30 17:47:31 1995
***************
*** 1,3 ****
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_ignore,v 3.0 1994/04/28 12:31:53 dawes Exp $
  # jump_ignore
--- 1,3 ----
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_ignore,v 3.1 1995/01/28 15:43:32 dawes Exp $
  # jump_ignore
diff -c xc/lib/Xaw/jump_vars:1.1.1.1 xc/lib/Xaw/jump_vars:3.1
*** xc/lib/Xaw/jump_vars:1.1.1.1	Mon Jan 30 17:47:31 1995
--- xc/lib/Xaw/jump_vars	Mon Jan 30 17:47:31 1995
***************
*** 1,5 ****
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_vars,v 3.0 1994/04/28 12:31:54 dawes Exp $
  #
  00001400 D _XawWidgetArray      libXaw         AllWidgets
  00000004 D _XawWidgetCount      libXaw         AllWidgets
--- 1,5 ----
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:46:47 kaleb Exp $
! # $XFree86: xc/lib/Xaw/jump_vars,v 3.1 1995/01/28 15:43:33 dawes Exp $
  #
  00001400 D _XawWidgetArray      libXaw         AllWidgets
  00000004 D _XawWidgetCount      libXaw         AllWidgets
diff -c xc/lib/Xbsd/Berklib.c:1.1.1.2 xc/lib/Xbsd/Berklib.c:3.3
*** xc/lib/Xbsd/Berklib.c:1.1.1.2	Mon Jan 30 17:47:33 1995
--- xc/lib/Xbsd/Berklib.c	Mon Jan 30 17:47:33 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Berklib.c,v 1.25 94/11/30 16:21:19 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.3 1995/01/28 15:43:38 dawes Exp $ */
  /*
  
  Copyright (c) 1987 X Consortium
***************
*** 67,72 ****
--- 68,77 ----
  #ifdef i386
  #define WANT_FFS
  #define WANT_MEMMOVE
+ #ifdef SCO
+ /* silly bcopy in SCO does not handle overlaps */
+ #define WANT_BFUNCS
+ #endif
  #endif
  #endif
  
diff -c xc/lib/Xbsd/Imakefile:1.1.1.2 xc/lib/Xbsd/Imakefile:3.1
*** xc/lib/Xbsd/Imakefile:1.1.1.2	Mon Jan 30 17:47:33 1995
--- xc/lib/Xbsd/Imakefile	Mon Jan 30 17:47:33 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.6 94/11/21 18:24:13 kaleb Exp $
+ XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.1 1995/01/28 15:43:40 dawes Exp $
  SRCS = Berklib.c
  OBJS = Berklib.o
  
diff -c xc/lib/Xdmcp/Fill.c:1.1.1.1 xc/lib/Xdmcp/Fill.c:3.1
*** xc/lib/Xdmcp/Fill.c:1.1.1.1	Mon Jan 30 17:47:36 1995
--- xc/lib/Xdmcp/Fill.c	Mon Jan 30 17:47:36 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Fill.c,v 1.9 94/04/17 20:16:35 rws Exp $
+  * $XFree86: xc/lib/Xdmcp/Fill.c,v 3.1 1994/05/21 23:48:05 dawes Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
***************
*** 44,53 ****
--- 45,57 ----
  #include <winsock.h>
  #undef BOOL
  #else
+ #ifndef MINIX
  #include <sys/socket.h>
+ #endif /* !MINIX */
  #endif
  #endif
  
+ #ifndef MINIX
  int
  XdmcpFill (fd, buffer, from, fromlen)
      int		    fd;
***************
*** 94,96 ****
--- 98,146 ----
      }
      return TRUE;
  }
+ #else /* MINIX */
+ int
+ MNX_XdmcpFill (fd, buffer, from, fromlen, data, datalen)
+     int		    fd;
+     XdmcpBufferPtr  buffer;
+     XdmcpNetaddr    from;	/* return */
+     int		    *fromlen;	/* return */
+     char	    *data;
+     int		    datalen;
+ {
+     BYTE    *newBuf;
+     struct sockaddr_in *from_addr;
+     udp_io_hdr_t *udp_io_hdr;
+ 
+     if (buffer->size < XDM_MAX_MSGLEN)
+     {
+ 	newBuf = (BYTE *) Xalloc (XDM_MAX_MSGLEN);
+ 	if (newBuf)
+ 	{
+ 	    Xfree (buffer->data);
+ 	    buffer->data = newBuf;
+ 	    buffer->size = XDM_MAX_MSGLEN;
+ 	}
+     }
+     buffer->pointer = 0;
+     udp_io_hdr= (udp_io_hdr_t *)data;
+     data += sizeof(udp_io_hdr_t) + udp_io_hdr->uih_ip_opt_len;
+     datalen -= sizeof(udp_io_hdr_t) + udp_io_hdr->uih_ip_opt_len;
+     buffer->count= udp_io_hdr->uih_data_len;
+     if (buffer->count > datalen)
+     {
+     	buffer->count= 0;
+     	return FALSE;
+     }
+     bcopy(data, (char *)buffer->data, buffer->count);
+     from_addr= (struct sockaddr_in *)from;
+     from_addr->sin_family= AF_INET;
+     from_addr->sin_addr.s_addr= udp_io_hdr->uih_src_addr;
+     from_addr->sin_port= udp_io_hdr->uih_src_port;
+     if (buffer->count < 6) {
+ 	buffer->count = 0;
+ 	return FALSE;
+     }
+     return TRUE;
+ }
+ #endif /* !MINIX */
diff -c xc/lib/Xdmcp/Flush.c:1.1.1.1 xc/lib/Xdmcp/Flush.c:3.2
*** xc/lib/Xdmcp/Flush.c:1.1.1.1	Mon Jan 30 17:47:36 1995
--- xc/lib/Xdmcp/Flush.c	Mon Jan 30 17:47:37 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Flush.c,v 1.10 94/04/17 20:16:35 rws Exp $
+  * $XFree86: xc/lib/Xdmcp/Flush.c,v 3.2 1994/06/28 12:23:10 dawes Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
***************
*** 44,50 ****
--- 45,53 ----
  #include <winsock.h>
  #undef BOOL
  #else
+ #ifndef MINIX
  #include <sys/socket.h>
+ #endif /* !MINIX */
  #endif
  #endif
  
***************
*** 56,61 ****
--- 59,70 ----
      int		    tolen;
  {
      int result;
+ #ifdef MINIX
+     struct sockaddr_in *to_addr;
+     char *b;
+     udp_io_hdr_t *udp_io_hdr;
+     int flags, s_errno;
+ #endif /* MINIX */
  
  #ifdef STREAMSCONN
      struct t_unitdata dataunit;
***************
*** 69,78 ****
--- 78,110 ----
      if (result < 0)
  	return FALSE;
  #else
+ #ifndef MINIX
      result = sendto (fd, (char *)buffer->data, buffer->pointer, 0,
  		     (struct sockaddr *)to, tolen);
      if (result != buffer->pointer)
  	return FALSE;
+ #else /* MINIX */
+     to_addr= (struct sockaddr_in *)to;
+     b= (char *)Xalloc(buffer->pointer + sizeof(udp_io_hdr_t));
+     if (b == NULL)
+     	return FALSE;
+     udp_io_hdr= (udp_io_hdr_t *)b;
+     bcopy((char *)buffer->data, b+sizeof(udp_io_hdr_t), buffer->pointer);
+     udp_io_hdr->uih_dst_addr= to_addr->sin_addr.s_addr;
+     udp_io_hdr->uih_dst_port= to_addr->sin_port;
+     udp_io_hdr->uih_ip_opt_len= 0;
+     udp_io_hdr->uih_data_len= buffer->pointer;
+ 
+     /* Make the write synchronous by turning of asynch I/O */
+     flags= fcntl(fd, F_GETFD);
+     fcntl(fd, F_SETFD, flags & ~FD_ASYNCHIO);
+     result= write(fd, b, buffer->pointer + sizeof(udp_io_hdr_t));
+     s_errno= errno;
+     Xfree(b);
+     fcntl(fd, F_SETFD, flags);
+     if (result != buffer->pointer + sizeof(udp_io_hdr_t))
+     	return FALSE;
+ #endif /* MINIX */
  #endif
      return TRUE;
  }
diff -c xc/lib/Xdmcp/GenKey.c:1.1.1.1 xc/lib/Xdmcp/GenKey.c:3.0
*** xc/lib/Xdmcp/GenKey.c:1.1.1.1	Mon Jan 30 17:47:37 1995
--- xc/lib/Xdmcp/GenKey.c	Mon Jan 30 17:47:37 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: GenKey.c,v 1.6 94/04/17 20:16:36 rws Exp $
+  * $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.0 1994/10/20 06:05:14 dawes Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
***************
*** 43,49 ****
      dst[3] = (data >> 24) & 0xff;
  }
  
! #ifdef X_NOT_STDC_ENV
  #define Time_t long
  extern Time_t time ();
  #else
--- 44,51 ----
      dst[3] = (data >> 24) & 0xff;
  }
  
! /* EMX is not STDC, but sometimes it is */
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  #define Time_t long
  extern Time_t time ();
  #else
diff -c xc/lib/Xdmcp/Imakefile:1.1.1.2 xc/lib/Xdmcp/Imakefile:3.1
*** xc/lib/Xdmcp/Imakefile:1.1.1.2	Mon Jan 30 17:47:37 1995
--- xc/lib/Xdmcp/Imakefile	Mon Jan 30 17:47:37 1995
***************
*** 1,3 ****
--- 1,4 ----
+ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.1 1995/01/28 15:43:45 dawes Exp $
  XCOMM $XConsortium: Imakefile,v 1.23 94/11/21 18:22:20 kaleb Exp $
  #define DoNormalLib NormalLibXdmcp
  #define DoSharedLib SharedLibXdmcp
diff -c /dev/null xc/lib/Xext/Xextos2.def:3.0
*** /dev/null	Mon Jan 30 17:47:39 1995
--- xc/lib/Xext/Xextos2.def	Mon Jan 30 17:47:39 1995
***************
*** 0 ****
--- 1,82 ----
+ LIBRARY XEXT
+ DESCRIPTION "X11R6 XFree86 libXEXT.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 XMITMiscGetBugMode  @ 1
+ 	 XMITMiscQueryExtension  @ 2
+ 	 XMITMiscSetBugMode  @ 3
+ 	 XMissingExtension  @ 4
+ 	 XSetExtensionErrorHandler  @ 5
+ 	 XShapeCombineMask  @ 6
+ 	 XShapeCombineRectangles  @ 7
+ 	 XShapeCombineRegion  @ 8
+ 	 XShapeCombineShape  @ 9
+ 	 XShapeGetRectangles  @ 10
+ 	 XShapeInputSelected  @ 11
+ 	 XShapeOffsetShape  @ 12
+ 	 XShapeQueryExtension  @ 13
+ 	 XShapeQueryExtents  @ 14
+ 	 XShapeQueryVersion  @ 15
+ 	 XShapeSelectInput  @ 16
+ 	 XSyncAwait  @ 17
+ 	 XSyncChangeAlarm  @ 18
+ 	 XSyncChangeCounter  @ 19
+ 	 XSyncCreateAlarm  @ 20
+ 	 XSyncCreateCounter  @ 21
+ 	 XSyncDestroyAlarm  @ 22
+ 	 XSyncDestroyCounter  @ 23
+ 	 XSyncFreeSystemCounterList  @ 24
+ 	 XSyncGetPriority  @ 25
+ 	 XSyncInitialize  @ 26
+ 	 XSyncIntToValue  @ 27
+ 	 XSyncIntsToValue  @ 28
+ 	 XSyncListSystemCounters  @ 29
+ 	 XSyncMaxValue  @ 30
+ 	 XSyncMinValue  @ 31
+ 	 XSyncQueryAlarm  @ 32
+ 	 XSyncQueryCounter  @ 33
+ 	 XSyncQueryExtension  @ 34
+ 	 XSyncSetCounter  @ 35
+ 	 XSyncSetPriority  @ 36
+ 	 XSyncValueAdd  @ 37
+ 	 XSyncValueEqual  @ 38
+ 	 XSyncValueGreaterOrEqual  @ 39
+ 	 XSyncValueGreaterThan  @ 40
+ 	 XSyncValueHigh32  @ 41
+ 	 XSyncValueIsNegative  @ 42
+ 	 XSyncValueIsPositive  @ 43
+ 	 XSyncValueIsZero  @ 44
+ 	 XSyncValueLessOrEqual  @ 45
+ 	 XSyncValueLessThan  @ 46
+ 	 XSyncValueLow32  @ 47
+ 	 XSyncValueSubtract  @ 48
+ 	 XTestFakeInput  @ 49
+ 	 XTestFlush  @ 50
+ 	 XTestGetInput  @ 51
+ 	 XTestMovePointer  @ 52
+ 	 XTestPressButton  @ 53
+ 	 XTestPressKey  @ 54
+ 	 XTestQueryInputSize  @ 55
+ 	 XTestReset  @ 56
+ 	 XTestStopInput  @ 57
+ 	 XextAddDisplay  @ 58
+ 	 XextCreateExtension  @ 59
+ 	 XextDestroyExtension  @ 60
+ 	 XextFindDisplay  @ 61
+ 	 XextRemoveDisplay  @ 62
+ 	 XmbufChangeBufferAttributes  @ 63
+ 	 XmbufChangeWindowAttributes  @ 64
+ 	 XmbufClearBufferArea  @ 65
+ 	 XmbufCreateBuffers  @ 66
+ 	 XmbufCreateStereoWindow  @ 67
+ 	 XmbufDestroyBuffers  @ 68
+ 	 XmbufDisplayBuffers  @ 69
+ 	 XmbufGetBufferAttributes  @ 70
+ 	 XmbufGetScreenInfo  @ 71
+ 	 XmbufGetVersion  @ 72
+ 	 XmbufGetWindowAttributes  @ 73
+ 	 XmbufQueryExtension  @ 74
diff -c /dev/null xc/lib/Xext/Xextos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:47:39 1995
--- xc/lib/Xext/Xextos2.rsp	Mon Jan 30 17:47:39 1995
***************
*** 0 ****
--- 1,4 ----
+ MITMisc.obj XMultibuf.obj XShape.obj XSync.obj XTestExt1.obj extutil.obj+
+ globals.obj /NOL /NOD /BAT
+ Xext.dll
+ 
diff -c /dev/null xc/lib/Xi/Xios2.def:3.0
*** /dev/null	Mon Jan 30 17:47:42 1995
--- xc/lib/Xi/Xios2.def	Mon Jan 30 17:47:42 1995
***************
*** 0 ****
--- 1,53 ----
+ LIBRARY XI
+ DESCRIPTION "X11R6 XFree86 libXI.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 XAllowDeviceEvents  @ 1
+ 	 XChangeDeviceControl  @ 2
+ 	 XChangeDeviceDontPropagateList  @ 3
+ 	 XChangeDeviceKeyMapping  @ 4
+ 	 XChangeFeedbackControl  @ 5
+ 	 XChangeKeyboardDevice  @ 6
+ 	 XChangePointerDevice  @ 7
+ 	 XCloseDevice  @ 8
+ 	 XDeviceBell  @ 9
+ 	 XFreeDeviceControl  @ 10
+ 	 XFreeDeviceList  @ 11
+ 	 XFreeDeviceMotionEvents  @ 12
+ 	 XFreeDeviceState  @ 13
+ 	 XFreeFeedbackList  @ 14
+ 	 XGetDeviceButtonMapping  @ 15
+ 	 XGetDeviceControl  @ 16
+ 	 XGetDeviceDontPropagateList  @ 17
+ 	 XGetDeviceFocus  @ 18
+ 	 XGetDeviceKeyMapping  @ 19
+ 	 XGetDeviceModifierMapping  @ 20
+ 	 XGetDeviceMotionEvents  @ 21
+ 	 XGetExtensionVersion  @ 22
+ 	 XGetFeedbackControl  @ 23
+ 	 XGetSelectedExtensionEvents  @ 24
+ 	 XGrabDevice  @ 25
+ 	 XGrabDeviceButton  @ 26
+ 	 XGrabDeviceKey  @ 27
+ 	 XListInputDevices  @ 28
+ 	 XOpenDevice  @ 29
+ 	 XQueryDeviceState  @ 30
+ 	 XSelectExtensionEvent  @ 31
+ 	 XSendExtensionEvent  @ 32
+ 	 XSetDeviceButtonMapping  @ 33
+ 	 XSetDeviceFocus  @ 34
+ 	 XSetDeviceMode  @ 35
+ 	 XSetDeviceModifierMapping  @ 36
+ 	 XSetDeviceValuators  @ 37
+ 	 XUngrabDevice  @ 38
+ 	 XUngrabDeviceButton  @ 39
+ 	 XUngrabDeviceKey  @ 40
+ 	 _xibadclass  @ 41
+ 	 _xibaddevice  @ 42
+ 	 _xibadevent  @ 43
+ 	 _xibadmode  @ 44
+ 	 _xidevicebusy  @ 45
diff -c /dev/null xc/lib/Xi/Xios2.rsp:3.0
*** /dev/null	Mon Jan 30 17:47:42 1995
--- xc/lib/Xi/Xios2.rsp	Mon Jan 30 17:47:43 1995
***************
*** 0 ****
--- 1,9 ----
+ XAllowDv.obj XChgDCtl.obj XChgFCtl.obj XChgKMap.obj XChgKbd.obj XChgPnt.obj+
+ XChgProp.obj XCloseDev.obj XDevBell.obj XExtInt.obj XExtToWire.obj+
+ XGMotion.obj XGetBMap.obj XGetDCtl.obj XGetFCtl.obj XGetKMap.obj+
+ XGetMMap.obj XGetProp.obj XGetVers.obj XGrDvBut.obj XGrDvKey.obj XGrabDev.obj+
+ XGtFocus.obj XGtSelect.obj XListDev.obj XOpenDev.obj XQueryDv.obj XSelect.obj+
+ XSetBMap.obj XSetDVal.obj XSetMMap.obj XSetMode.obj XSndExEv.obj XStFocus.obj+
+ XUngrDev.obj XUngrDvB.obj XUngrDvK.obj /NOL /NOD /BAT
+ Xi.dll
+ 
diff -c xc/lib/Xmu/CrCmap.c:1.1.1.1 xc/lib/Xmu/CrCmap.c:3.0
*** xc/lib/Xmu/CrCmap.c:1.1.1.1	Mon Jan 30 17:47:47 1995
--- xc/lib/Xmu/CrCmap.c	Mon Jan 30 17:47:48 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: CrCmap.c,v 1.6 94/04/17 20:15:53 rws Exp $ */
+ /* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.0 1994/10/20 06:05:50 dawes Exp $ */
  
  /* 
  
***************
*** 38,43 ****
--- 39,47 ----
  #include <stdio.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
+ #ifdef __EMX__
+ #include <stdlib.h>	/* to get qsort() */
+ #endif
  
  extern char	*calloc();
  
diff -c xc/lib/Xmu/CvtStdSel.c:1.1.1.1 xc/lib/Xmu/CvtStdSel.c:3.2
*** xc/lib/Xmu/CvtStdSel.c:1.1.1.1	Mon Jan 30 17:47:48 1995
--- xc/lib/Xmu/CvtStdSel.c	Mon Jan 30 17:47:48 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: CvtStdSel.c,v 1.29 94/04/17 20:15:57 gildea Exp $ */
+ /* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.2 1994/06/28 12:23:29 dawes Exp $ */
  
  /*
   
***************
*** 57,64 ****
--- 58,69 ----
  #define Status int
  #undef BOOL
  #else
+ #ifndef MINIX
  #include <netdb.h>
  #include <sys/socket.h>
+ #else
+ #include <net/gen/netdb.h>
+ #endif /* !MINIX */
  #endif
  #endif
  
***************
*** 204,210 ****
  	*format = 8;
  	return True;
      }
! #ifdef TCPCONN
      if (*target == XA_IP_ADDRESS(d)) {
  	char hostname[1024];
  
--- 209,215 ----
  	*format = 8;
  	return True;
      }
! #if defined(TCPCONN) || defined(MNX_TCPCONN)
      if (*target == XA_IP_ADDRESS(d)) {
  	char hostname[1024];
  
diff -c xc/lib/Xmu/RdBitF.c:1.1.1.1 xc/lib/Xmu/RdBitF.c:3.0
*** xc/lib/Xmu/RdBitF.c:1.1.1.1	Mon Jan 30 17:47:49 1995
--- xc/lib/Xmu/RdBitF.c	Mon Jan 30 17:47:49 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: RdBitF.c,v 1.10 94/04/17 20:16:13 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.0 1994/10/20 06:05:52 dawes Exp $ */
  
  /*
  
***************
*** 273,278 ****
--- 274,282 ----
      FILE *fstream;
      int status;
  
+ #ifdef __EMX__
+     filename = __XOS2RedirRoot(filename);
+ #endif
      if ((fstream = fopen (filename, "r")) == NULL) {
  	return BitmapOpenFailed;
      }
diff -c /dev/null xc/lib/Xmu/Xmuos2.def:3.0
*** /dev/null	Mon Jan 30 17:47:49 1995
--- xc/lib/Xmu/Xmuos2.def	Mon Jan 30 17:47:49 1995
***************
*** 0 ****
--- 1,112 ----
+ LIBRARY Xmu
+ DESCRIPTION "X11R6 XFree86 libXmu.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 32768
+ EXPORTS
+ 	XmuGetAtomName  @ 1
+ 	XmuInternAtom  @ 2
+ 	XmuInternStrings  @ 3
+ 	XmuMakeAtom  @ 4
+ 	XmuNameOfAtom  @ 5
+ 	XmuCopyISOLatin1Lowered  @ 6
+ 	XmuCopyISOLatin1Uppered  @ 7
+ 	XmuCompareISOLatin1  @ 8
+ 	XmuAddCloseDisplayHook  @ 9
+ 	XmuLookupCloseDisplayHook  @ 10
+ 	XmuRemoveCloseDisplayHook  @ 11
+ 	XmuCvtFunctionToCallback  @ 12
+ 	XmuCvtStringToBackingStore  @ 13
+ 	XmuCvtStringToCursor  @ 14
+ 	XmuCvtStringToColorCursor  @ 15
+ 	XmuCvtStringToGravity  @ 16
+ 	XmuCvtStringToJustify  @ 17
+ 	XmuCvtStringToLong  @ 18
+ 	XmuCvtStringToOrientation  @ 19
+ 	XmuCvtStringToBitmap  @ 20
+ 	XmuCvtStringToShapeStyle  @ 21
+ 	XmuReshapeWidget  @ 22
+ 	XmuCvtStringToWidget  @ 23
+ 	XmuNewCvtStringToWidget  @ 24
+ 	XmuCursorNameToIndex  @ 25
+ 	XmuDQCreate  @ 26
+ 	XmuDQDestroy  @ 27
+ 	XmuDQLookupDisplay  @ 28
+ 	XmuDQAddDisplay  @ 29
+ 	XmuDQRemoveDisplay  @ 30
+ 	XmuDrawRoundedRectangle  @ 31
+ 	XmuFillRoundedRectangle  @ 32
+ 	XmuDrawLogo  @ 33
+ 	XmuCreatePixmapFromBitmap  @ 34
+ 	XmuCreateStippledPixmap  @ 35
+ 	XmuReleaseStippledPixmap  @ 36
+ 	XmuLocateBitmapFile  @ 37
+ 	XmuLocatePixmapFile  @ 38
+ 	XmuReadBitmapData  @ 39
+ 	XmuReadBitmapDataFromFile  @ 40
+ 	XmuPrintDefaultErrorMessage  @ 41
+ 	XmuSimpleErrorHandler  @ 42
+ 	XmuRegisterExternalAgent  @ 43
+ 	XmuCallInitializers  @ 44
+ 	XmuAddInitializer  @ 45
+ 	XmuAllStandardColormaps  @ 46
+ 	XmuCreateColormap  @ 47
+ 	XmuDeleteStandardColormap  @ 48
+ 	XmuGetColormapAllocation  @ 49
+ 	XmuLookupStandardColormap  @ 50
+ 	XmuStandardColormap  @ 51
+ 	XmuVisualStandardColormaps  @ 52
+ 	XmuConvertStandardSelection  @ 53
+ 	XmuGetHostname  @ 54
+ 	XmuWnInitializeNodes  @ 55
+ 	XmuWnFetchResources  @ 56
+ 	XmuWnCountOwnedResources  @ 57
+ 	XmuWnNameToNode  @ 58
+ 	XmuClientWindow  @ 59
+ 	XmuUpdateMapHints  @ 60
+ 	XmuScreenOfWindow  @ 61
+ 	XctCreate  @ 62
+ 	XctNextItem  @ 63
+ 	XctFree  @ 64
+ 	XctReset  @ 65
+ 	_XmuCCLookupDisplay  @ 66
+ 	_XEditResCheckMessages  @ 67 
+ 	_XEditResPutString8  @ 68
+ 	_XEditResPut8  @ 69
+ 	_XEditResPut16  @ 70
+ 	_XEditResPut32  @ 71
+ 	_XEditResPutWidgetInfo  @ 72
+ 	_XEditResResetStream  @ 74
+ 	_XEditResGet8  @ 75
+ 	_XEditResGet16  @ 76
+ 	_XEditResGetSigned16  @ 77
+ 	_XEditResGet32  @ 78
+ 	_XEditResGetString8  @ 79
+ 	_XEditResGetWidgetInfo  @ 80
+ 	_XA_ATOM_PAIR  @ 81
+ 	_XA_CHARACTER_POSITION  @ 82
+ 	_XA_CLASS  @ 83
+ 	_XA_CLIENT_WINDOW  @ 84
+ 	_XA_CLIPBOARD  @ 85
+ 	_XA_COMPOUND_TEXT  @ 86
+ 	_XA_DECNET_ADDRESS  @ 87
+ 	_XA_DELETE  @ 88
+ 	_XA_FILENAME  @ 89
+ 	_XA_HOSTNAME  @ 90
+ 	_XA_IP_ADDRESS  @ 91
+ 	_XA_LENGTH  @ 92
+ 	_XA_LIST_LENGTH  @ 93
+ 	_XA_NAME  @ 94
+ 	_XA_NET_ADDRESS  @ 95
+ 	_XA_NULL  @ 96
+ 	_XA_OWNER_OS  @ 97
+ 	_XA_SPAN  @ 98
+ 	_XA_TARGETS  @ 99
+ 	_XA_TEXT  @ 100
+ 	_XA_TIMESTAMP  @ 101
+ 	_XA_USER  @ 102
+ 	XmuDistinguishableColors @ 103
+ 	XmuDistinguishablePixels @ 104
+ 	
diff -c /dev/null xc/lib/Xmu/Xmuos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:47:49 1995
--- xc/lib/Xmu/Xmuos2.rsp	Mon Jan 30 17:47:49 1995
***************
*** 0 ****
--- 1,10 ----
+ AllCmap.obj Atoms.obj ClientWin.obj CloseHook.obj CmapAlloc.obj CrCmap.obj+
+ CrPixFBit.obj CursorName.obj CvtCache.obj CvtStdSel.obj DefErrMsg.obj+
+ DelCmap.obj DisplayQue.obj Distinct.obj DrRndRect.obj DrawLogo.obj+
+ EditresCom.obj ExtAgent.obj FToCback.obj GetHost.obj GrayPixmap.obj+
+ Initer.obj LocBitmap.obj Lookup.obj LookupCmap.obj Lower.obj RdBitF.obj+
+ ScrOfWin.obj ShapeWidg.obj StdCmap.obj StrToBS.obj StrToBmap.obj StrToCurs.obj+
+ StrToGrav.obj StrToJust.obj StrToLong.obj StrToOrnt.obj StrToShap.obj+
+ StrToWidg.obj UpdMapHint.obj VisCmap.obj WidgetNode.obj Xct.obj /NOL /NOD /BAT
+ Xmu.dll
+ 
diff -c xc/lib/Xt/Create.c:1.1.1.1 xc/lib/Xt/Create.c:3.1
*** xc/lib/Xt/Create.c:1.1.1.1	Mon Jan 30 17:47:56 1995
--- xc/lib/Xt/Create.c	Mon Jan 30 17:47:56 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Create.c,v 1.105 94/04/17 20:13:54 converse Exp $ */
+ /* $XFree86: xc/lib/Xt/Create.c,v 3.1 1995/01/07 04:00:59 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
diff -c xc/lib/Xt/Imakefile:1.1.1.1 xc/lib/Xt/Imakefile:3.0
*** xc/lib/Xt/Imakefile:1.1.1.1	Mon Jan 30 17:47:57 1995
--- xc/lib/Xt/Imakefile	Mon Jan 30 17:47:57 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.110 94/04/04 21:54:23 gildea Exp $
+ XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.0 1994/06/28 12:23:47 dawes Exp $
  #define DoNormalLib NormalLibXt
  #define DoSharedLib SharedLibXt
  #define DoDebugLib DebugLibXt
***************
*** 209,214 ****
--- 210,218 ----
  SpecialCLibObjectRule(TMaction,$(_NOOP_),$(RCONST_DEFINES))
  #if DoSharedLib
  SpecialCObjectRule(sharedlib,$(_NOOP_),$(SHLIBDEF))
+ #endif
+ #ifdef MinixArchitecture
+ SpecialCLibObjectRule(Shell,$(ICONFIGFILES),-DXT_NO_SM)
  #endif
  
  DependTarget()
diff -c xc/lib/Xt/Initialize.c:1.1.1.2 xc/lib/Xt/Initialize.c:3.3
*** xc/lib/Xt/Initialize.c:1.1.1.2	Mon Jan 30 17:47:57 1995
--- xc/lib/Xt/Initialize.c	Mon Jan 30 17:47:57 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Initialize.c,v 1.222 94/12/12 18:59:11 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xt/Initialize.c,v 3.3 1995/01/28 15:43:57 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
diff -c xc/lib/Xt/Intrinsic.c:1.1.1.2 xc/lib/Xt/Intrinsic.c:3.3
*** xc/lib/Xt/Intrinsic.c:1.1.1.2	Mon Jan 30 17:47:58 1995
--- xc/lib/Xt/Intrinsic.c	Mon Jan 30 17:47:58 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Intrinsic.c,v 1.196 94/11/21 18:20:56 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.3 1995/01/28 15:44:00 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
***************
*** 1054,1060 ****
      String	lang;
  {
  
! #if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
--- 1055,1061 ----
      String	lang;
  {
  
! #if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
***************
*** 1065,1071 ****
  #define STARTCHAR '\001'
  #define ENDCHAR '\001'
  #else
! #ifdef WIN32
  #define SKIPCOUNT 1
  #define STARTCHAR '='
  #define ENDCHAR ';'
--- 1066,1072 ----
  #define STARTCHAR '\001'
  #define ENDCHAR '\001'
  #else
! #if defined(WIN32) || defined(__EMX__)
  #define SKIPCOUNT 1
  #define STARTCHAR '='
  #define ENDCHAR ';'
diff -c xc/lib/Xt/Intrinsic.h:1.1.1.1 xc/lib/Xt/Intrinsic.h:3.0
*** xc/lib/Xt/Intrinsic.h:1.1.1.1	Mon Jan 30 17:47:59 1995
--- xc/lib/Xt/Intrinsic.h	Mon Jan 30 17:48:00 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Intrinsic.h,v 1.199 94/04/17 20:14:22 converse Exp $ */
+ /* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.0 1994/05/29 02:03:38 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
***************
*** 2058,2065 ****
  #define XtDefaultFont		"XtDefaultFont"
  #define XtDefaultFontSet	"XtDefaultFontSet"
  
! #if defined(CRAY) || defined(__arm)
! #if __STDC__
  #define XtOffset(p_type,field) _Offsetof(p_type,field)
  #else
  #ifdef CRAY2
--- 2059,2066 ----
  #define XtDefaultFont		"XtDefaultFont"
  #define XtDefaultFontSet	"XtDefaultFontSet"
  
! #if defined(CRAY) || defined(__arm) || defined(__ACK)
! #if __STDC__ && !defined(__ACK)
  #define XtOffset(p_type,field) _Offsetof(p_type,field)
  #else
  #ifdef CRAY2
***************
*** 2072,2078 ****
  
  #endif	/* !CRAY2 */
  #endif  /* __STDC__ */
! #else	/* ! (CRAY || __arm) */
  
  #define XtOffset(p_type,field) \
  	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
--- 2073,2079 ----
  
  #endif	/* !CRAY2 */
  #endif  /* __STDC__ */
! #else	/* ! (CRAY || __arm || __ACK) */
  
  #define XtOffset(p_type,field) \
  	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
diff -c xc/lib/Xt/IntrinsicI.h:1.1.1.2 xc/lib/Xt/IntrinsicI.h:3.1
*** xc/lib/Xt/IntrinsicI.h:1.1.1.2	Mon Jan 30 17:48:01 1995
--- xc/lib/Xt/IntrinsicI.h	Mon Jan 30 17:48:01 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: IntrinsicI.h,v 1.59 94/10/10 18:57:48 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.1 1995/01/12 05:56:08 dawes Exp $ */
  
  /***********************************************************
  
diff -c xc/lib/Xt/NextEvent.c:1.1.1.4 xc/lib/Xt/NextEvent.c:3.5
*** xc/lib/Xt/NextEvent.c:1.1.1.4	Mon Jan 30 17:48:01 1995
--- xc/lib/Xt/NextEvent.c	Mon Jan 30 17:48:02 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: NextEvent.c,v 1.145 94/10/10 18:59:29 kaleb Exp $ */
+ /* $XFree86: xc/lib/Xt/NextEvent.c,v 3.5 1995/01/12 05:56:10 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
***************
*** 67,72 ****
--- 68,84 ----
  extern int errno;
  #endif
  
+ #ifdef __EMX__
+ #define BSD_SELECT
+ #include <sys/time.h>
+ #include <sys/select.h>
+ #endif
+ 
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  static TimerEventRec* freeTimerRecs;
  static WorkProcRec* freeWorkRecs;
  static SignalEventRec* freeSignalRecs;
***************
*** 148,153 ****
--- 160,171 ----
  	    *howlong -= (time_spent.tv_sec*1000+time_spent.tv_usec/1000);
  }
  
+ #ifdef AMOEBA
+ /* For IoWait emulation: */
+ static int DoIgnoreEvents;
+ static int DoIgnoreInputs;
+ #endif
+ 
  typedef struct {
      struct timeval cur_time;
      struct timeval start_time;
***************
*** 221,226 ****
--- 239,245 ----
      wait_fds_ptr_t wf;
  {
      int ii;
+ #ifndef AMOEBA
  #ifndef USE_POLL
      wf->nfds = app->fds.nfds;
      if( !ignoreInputs ) {
***************
*** 260,265 ****
--- 279,288 ----
  		}
      }
  #endif
+ #else /* AMOEBA */
+     DoIgnoreEvents = ignoreEvents;
+     DoIgnoreInputs = ignoreInputs;
+ #endif /* AMOEBA */
  }
  
  static void AdjustTimes (app, block, howlong, ignoreTimers, wt)
***************
*** 290,295 ****
--- 313,320 ----
  #endif
  }
  
+ #ifndef AMOEBA
+ 
  static int IoWait (wt, wf)
      wait_times_ptr_t wt;
      wait_fds_ptr_t wf;
***************
*** 305,310 ****
--- 330,373 ----
  #endif
  }
  
+ #else /* AMOEBA */
+ 
+ static int AppIoWait (app, wt, wf)
+     XtAppContext app;
+     wait_times_ptr_t wt;
+     wait_fds_ptr_t wf;
+ {
+     /* Unfortunately we cannot use select() under Amoeba.  We call
+      * _X11TransAmSelect to wait for the display to produce input
+      * or until the timer runs out.  This has two disadvantages:
+      * - We cannot wait for multiple displays (we just wait for the
+      *   first display).
+      * - We cannot wait for other file descriptors (there is no easy solution
+      *   for this, but it seems that not too many applications need it).
+      * There is a workaround, however, in the form of XamSetSema and XamBlock,
+      * which allow you to wait for X events or other things.
+      */
+     long timout;
+     int nfound;
+ 
+     if (wt->wait_time_ptr != NULL) {
+ 	timout = wt->wait_time_ptr->tv_sec*1000 +
+ 		 (wt->wait_time_ptr->tv_usec+999)/1000;
+     } else {
+ 	timout = -1;
+     }
+     if ((DoIgnoreEvents || app->count == 0) && timout >= 0) {
+ 	millisleep(timout);
+ 	nfound = 0;
+     } else {
+ 	nfound = _X11TransAmSelect(ConnectionNumber(app->list[0]), timout);
+     }
+ 
+     return nfound;
+ }
+ 
+ #endif /* AMOEBA */
+ 
  static void FindInputs (app, wf, nfds, ignoreEvents, ignoreInputs, dpy_no, found_input)
      XtAppContext app;
      wait_fds_ptr_t wf;
***************
*** 317,322 ****
--- 380,386 ----
      XtInputMask condition;
      InputEvent *ep;
      int ii;
+ #ifndef AMOEBA
  #ifndef USE_POLL /* { check ready file descriptors block */
  #ifdef XTHREADS
      Fd_set rmask;
***************
*** 442,447 ****
--- 506,531 ----
  	}
      }
  #endif /* } */
+ #else /* AMOEBA */
+     int dd;
+ 
+     *dpy_no = -1;
+     *found_input = False;
+ 
+     for (ii = 0; ii < app->fds.nfds && nfds > 0; ii++) {
+ 	if (!ignoreEvents) {
+ 	    for (dd = 0; dd < app->count; dd++) {
+ 		if (ii == ConnectionNumber (app->list[dd])) {
+ 		    if (*dpy_no == -1) {
+ 			if (XEventsQueued (app->list[dd], QueuedAfterReading))
+ 			    *dpy_no = dd;
+ 		    }
+ 		}
+ 	    }
+ 	}
+ 	/* Inputs not implemented */
+     }
+ #endif /* AMOEBA */
  }
  
  /* 
***************
*** 587,593 ****
--- 671,681 ----
  	    push_thread = TRUE;
  	} else
  #endif /* } */
+ #ifndef AMOEBA
  	nfds = IoWait (&wt, &wf);
+ #else
+ 	nfds = AppIoWait (app, &wt, &wf);
+ #endif
  	if (nfds == -1) {
  	    /*
  	     *  interrupt occured recalculate time value and wait again.
***************
*** 945,950 ****
--- 1033,1039 ----
  	XtInputCallbackProc proc;
  	XtPointer closure;
  {
+ #ifndef AMOEBA
  	InputEvent* sptr;
  	XtInputMask condition = (XtInputMask) Condition;
  
***************
*** 987,992 ****
--- 1076,1085 ----
  	app->input_count++;
  	UNLOCK_APP(app);
  	return((XtInputId)sptr);
+ #else /* AMOEBA */
+         printf("XtAppAddInput not yet implemented\n");
+         abort();
+ #endif /* AMOEBA */
  }
  
  void XtRemoveInput( id )
diff -c xc/lib/Xt/Shell.c:1.1.1.4 xc/lib/Xt/Shell.c:3.2
*** xc/lib/Xt/Shell.c:1.1.1.4	Mon Jan 30 17:48:03 1995
--- xc/lib/Xt/Shell.c	Mon Jan 30 17:48:04 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Shell.c,v 1.168 95/01/06 21:14:23 converse Exp $ */
+ /* $XFree86: xc/lib/Xt/Shell.c,v 3.2 1995/01/27 04:46:59 dawes Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
***************
*** 679,686 ****
--- 680,689 ----
  
  static XtResource sessionResources[]=
  {
+ #ifndef XT_NO_SM
   {XtNconnection, XtCConnection, XtRSmcConn, sizeof(SmcConn),
         Offset(session.connection), XtRSmcConn, (XtPointer) NULL},
+ #endif
   {XtNsessionID, XtCSessionID, XtRString, sizeof(String),
         Offset(session.session_id), XtRString, (XtPointer) NULL},
   {XtNrestartCommand, XtCRestartCommand, XtRCommandArgArray, sizeof(String*),
***************
*** 1103,1108 ****
--- 1106,1112 ----
      ArgList args;		/* unused */
      Cardinal *num_args;		/* unused */
  {
+ #ifndef XT_NO_SM
      SessionShellWidget w = (SessionShellWidget)new;
  
      if (w->session.session_id) w->session.session_id =
***************
*** 1134,1139 ****
--- 1138,1144 ----
  
      if (w->session.connection)
  	SetSessionProperties(w, True, 0L, 0L);
+ #endif /* !XT_NO_SM */
  }
  
  static void Resize(w)
***************
*** 1499,1504 ****
--- 1504,1510 ----
  					"WM_CLIENT_LEADER", False),
  			    XA_WINDOW, 32, PropModeReplace,
  			    (unsigned char *)(&(p->core.window)), 1);
+ #ifndef XT_NO_SM
  	if (p == (Widget) w) {
  	    for ( ; p->core.parent != NULL; p = p->core.parent);
  	    if (XtIsSubclass(p, sessionShellWidgetClass)) {
***************
*** 1514,1519 ****
--- 1520,1526 ----
  		}
  	    }
  	}
+ #endif /* !XT_NO_SM */
  
  	if (wmshell->wm.window_role)
  	    XChangeProperty(XtDisplay((Widget)w), XtWindow((Widget)w),
***************
*** 1670,1675 ****
--- 1677,1683 ----
  static void SessionDestroy(wid)
      Widget wid;
  {
+ #ifndef XT_NO_SM
      SessionShellWidget w = (SessionShellWidget) wid;
  
      StopManagingSession(w, w->session.connection);
***************
*** 1682,1687 ****
--- 1690,1696 ----
      FreeStringArray(w->session.environment);
      XtFree(w->session.current_dir);
      XtFree(w->session.program_path);
+ #endif /* !XT_NO_SM */
  }
  
  /*
***************
*** 2398,2403 ****
--- 2407,2413 ----
      ArgList args;
      Cardinal *num_args;
  {
+ #ifndef XT_NO_SM
      SessionShellWidget nw = (SessionShellWidget) new;
      SessionShellWidget cw = (SessionShellWidget) current;
      unsigned long set_mask = 0L;
***************
*** 2496,2501 ****
--- 2506,2512 ----
      if ((cw->session.join_session && !nw->session.join_session) ||
  	(cw->session.connection && !nw->session.connection))
  	StopManagingSession(nw, nw->session.connection);
+ #endif /* !XT_NO_SM */
  
      if (cw->wm.client_leader != nw->wm.client_leader ||
  	cw->session.session_id != nw->session.session_id) {
***************
*** 2612,2617 ****
--- 2623,2629 ----
  static void XtCallSaveCallbacks();
  static void XtCallSaveCompleteCallbacks();
  
+ #ifndef XT_NO_SM
  static void StopManagingSession(w, connection)
      SessionShellWidget w;
      SmcConn connection; /* connection to close, if any */
***************
*** 2696,2701 ****
--- 2708,2715 ----
  }
  #undef XT_MSG_LENGTH
  
+ #endif /* !XT_NO_SM */
+ 
  static String * NewStringArray(str)
      String *str;
  {
***************
*** 2734,2739 ****
--- 2748,2754 ----
  }
  
  
+ #ifndef XT_NO_SM
  static SmProp * CardPack(name, closure)
      char *name;
      XtPointer closure;
***************
*** 2900,2905 ****
--- 2915,2924 ----
      SessionShellWidget w = (SessionShellWidget) client_data;
      IceProcessMessagesStatus status;
  
+ #ifdef MINIX
+     if (!MNX_IceMessagesAvailable(SmcGetIceConnection(w->session.connection)))
+     	return;
+ #endif
      status = IceProcessMessages(SmcGetIceConnection(w->session.connection),
  				NULL, NULL);
  
***************
*** 3275,3277 ****
--- 3294,3297 ----
      return new;
  }
  
+ #endif /* !XT_NO_SM */
diff -c /dev/null xc/lib/Xt/Xtos2.def:3.0
*** /dev/null	Mon Jan 30 17:48:05 1995
--- xc/lib/Xt/Xtos2.def	Mon Jan 30 17:48:05 1995
***************
*** 0 ****
--- 1,471 ----
+ LIBRARY Xt
+ DESCRIPTION "X11R6 XFree86 libXt.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 32768
+ EXPORTS
+ 	XtAppAddActionHook  @ 1
+ 	XtRemoveActionHook  @ 2
+ 	XtMalloc  @ 3
+ 	XtRealloc  @ 4
+ 	XtCalloc  @ 5
+ 	XtFree  @ 6
+ 	XtMergeArgLists  @ 7
+ 	XtAddCallback  @ 8
+ 	XtAddCallbacks  @ 9
+ 	XtRemoveCallback  @ 10
+ 	XtRemoveCallbacks  @ 11
+ 	XtRemoveAllCallbacks  @ 12
+ 	XtCallCallbacks  @ 13
+ 	XtHasCallbacks  @ 14
+ 	XtCallCallbackList  @ 15
+ 	XtSetMultiClickTime  @ 16
+ 	XtGetMultiClickTime  @ 17
+ 	XtSetTypeConverter  @ 18
+ 	XtAppSetTypeConverter  @ 19
+ 	XtAddConverter  @ 20
+ 	XtAppAddConverter  @ 21
+ 	XtCallConverter  @ 22
+ 	XtConvert  @ 23
+ 	XtConvertAndStore  @ 24
+ 	XtAppReleaseCacheRefs  @ 25
+ 	XtCallbackReleaseCacheRefList  @ 26
+ 	XtCallbackReleaseCacheRef  @ 27
+ 	XtDisplayStringConversionWarning  @ 28
+ 	XtStringConversionWarning  @ 29
+ 	XtCvtIntToBoolean  @ 30
+ 	XtCvtIntToShort  @ 31
+ 	XtCvtStringToBoolean  @ 32 
+ 	XtCvtIntToBool  @ 33
+ 	XtCvtStringToBool  @ 34 
+ 	XtCvtIntToColor  @ 35
+ 	XtCvtStringToPixel  @ 36
+ 	XtCvtStringToCursor  @ 37
+ 	XtCvtStringToDisplay  @ 38
+ 	XtCvtStringToFile  @ 39
+ 	XtCvtIntToFloat  @ 40
+ 	XtCvtStringToFloat  @ 41
+ 	XtCvtStringToFont  @ 42
+ 	XtCvtIntToFont  @ 43
+ 	XtCvtStringToFontSet  @ 44
+ 	XtCvtStringToFontStruct  @ 45
+ 	XtCvtStringToInt  @ 46
+ 	XtCvtStringToShort  @ 47
+ 	XtCvtStringToDimension  @ 48
+ 	XtCvtIntToUnsignedChar  @ 49
+ 	XtCvtStringToUnsignedChar  @ 50
+ 	XtCvtColorToPixel  @ 51
+ 	XtCvtIntToPixel  @ 52
+ 	XtCvtIntToPixmap  @ 53
+ 	XtCvtStringToInitialState  @ 54
+ 	XtCvtStringToVisual  @ 55
+ 	XtCvtStringToAtom  @ 56
+ 	XtCvtStringToDirectoryString  @ 57
+ 	XtCvtStringToCommandArgArray  @ 58
+ 	XtInitializeWidgetClass  @ 59
+ 	XtCreateWidget  @ 60
+ 	XtCreateManagedWidget  @ 61
+ 	XtCreatePopupShell  @ 62
+ 	XtAppCreateShell  @ 63
+ 	XtCreateApplicationShell  @ 64
+ 	XtDestroyWidget  @ 65
+ 	XtOpenDisplay  @ 66
+ 	XtDisplayInitialize  @ 67
+ 	XtCreateApplicationContext  @ 68
+ 	XtDestroyApplicationContext  @ 69
+ 	XtDatabase  @ 70
+ 	XtDisplayToApplicationContext  @ 71
+ 	XtCloseDisplay  @ 72
+ 	XtWidgetToApplicationContext  @ 73
+ 	XtGetApplicationNameAndClass  @ 74
+ 	XtGetErrorDatabase  @ 75
+ 	XtAppGetErrorDatabase  @ 76
+ 	XtGetErrorDatabaseText  @ 77
+ 	XtAppGetErrorDatabaseText  @ 78
+ 	XtErrorMsg  @ 79
+ 	XtAppErrorMsg  @ 80
+ 	XtWarningMsg  @ 81
+ 	XtAppWarningMsg  @ 82
+ 	XtSetErrorMsgHandler  @ 83
+ 	XtAppSetErrorMsgHandler  @ 84
+ 	XtSetWarningMsgHandler  @ 85
+ 	XtAppSetWarningMsgHandler  @ 86
+ 	XtError  @ 87
+ 	XtAppError  @ 88
+ 	XtWarning  @ 89
+ 	XtAppWarning  @ 90
+ 	XtSetErrorHandler  @ 91
+ 	XtAppSetErrorHandler  @ 92
+ 	XtSetWarningHandler  @ 93
+ 	XtAppSetWarningHandler  @ 94
+ 	XtBuildEventMask  @ 95
+ 	XtRemoveEventHandler  @ 96
+ 	XtAddEventHandler  @ 97
+ 	XtInsertEventHandler  @ 98
+ 	XtRemoveRawEventHandler  @ 99
+ 	XtInsertRawEventHandler  @ 100
+ 	XtAddRawEventHandler  @ 101
+ 	XtWindowToWidget  @ 102
+ 	XtDispatchEvent  @ 103
+ 	XtAddGrab  @ 104
+ 	XtRemoveGrab  @ 105
+ 	XtMainLoop  @ 106
+ 	XtAppMainLoop  @ 107
+ 	XtAddExposureToRegion  @ 108
+ 	XtLastTimestampProcessed  @ 109
+ 	XtIsRectObj  @ 110
+ 	XtIsWidget  @ 111
+ 	XtIsComposite  @ 112
+ 	XtIsConstraint  @ 113
+ 	XtIsShell  @ 114
+ 	XtIsOverrideShell  @ 115
+ 	XtIsWMShell  @ 116
+ 	XtIsVendorShell  @ 117
+ 	XtIsTransientShell  @ 118
+ 	XtIsTopLevelShell  @ 119
+ 	XtIsApplicationShell  @ 120
+ 	XtMapWidget  @ 121
+ 	XtUnmapWidget  @ 122
+ 	XtNewString  @ 123
+ 	XtIsSessionShell  @ 124
+ 	XtAllocateGC  @ 125
+ 	XtGetGC  @ 126
+ 	XtReleaseGC  @ 127
+ 	XtDestroyGC  @ 128
+ 	XtMakeGeometryRequest  @ 129
+ 	XtMakeResizeRequest  @ 130
+ 	XtResizeWindow  @ 131
+ 	XtResizeWidget  @ 132
+ 	XtConfigureWidget  @ 133
+ 	XtMoveWidget  @ 134
+ 	XtTranslateCoords  @ 135
+ 	XtQueryGeometry  @ 136
+ 	XtGetActionKeysym  @ 137
+ 	XtGetResourceList  @ 138
+ 	XtGetConstraintResourceList  @ 139
+ 	XtGetValues  @ 140
+ 	XtGetSubvalues  @ 141
+ 	XtToolkitInitialize  @ 142
+ 	XtSetLanguageProc  @ 143
+ 	XtScreenDatabase  @ 144
+ 	XtAppSetFallbackResources  @ 145
+ 	XtAppInitialize  @ 146
+ 	XtInitialize  @ 147
+ 	XtOpenApplication  @ 148
+ 	XtIsSubclass  @ 149
+ 	XtRealizeWidget  @ 150
+ 	XtUnrealizeWidget  @ 151
+ 	XtCreateWindow  @ 152
+ 	XtNameToWidget  @ 153
+ 	XtDisplayOfObject  @ 154
+ 	XtDisplay  @ 155
+ 	XtScreenOfObject  @ 156
+ 	XtScreen  @ 157
+ 	XtWindowOfObject  @ 158
+ 	XtWindow  @ 159
+ 	XtSuperclass  @ 160
+ 	XtClass  @ 161
+ 	XtIsManaged  @ 162
+ 	XtIsRealized  @ 163
+ 	XtIsSensitive  @ 164
+ 	XtParent  @ 165
+ 	XtName  @ 166
+ 	XtIsObject  @ 167
+ 	XtFindFile  @ 168
+ 	XtResolvePathname  @ 169
+ 	XtCallAcceptFocus  @ 170
+ 	XtSetKeyboardFocus  @ 171
+ 	XtUnmanageChildren  @ 172
+ 	XtUnmanageChild  @ 173
+ 	XtManageChildren  @ 174
+ 	XtManageChild  @ 175
+ 	XtSetMappedWhenManaged  @ 176
+ 	XtAddTimeOut  @ 177
+ 	XtAppAddTimeOut  @ 178
+ 	XtRemoveTimeOut  @ 179
+ 	XtAddWorkProc  @ 180
+ 	XtAppAddWorkProc  @ 181
+ 	XtRemoveWorkProc  @ 182
+ 	XtAddInput  @ 183
+ 	XtAppAddInput  @ 184
+ 	XtRemoveInput  @ 185
+ 	XtNextEvent  @ 186
+ 	XtAppNextEvent  @ 187
+ 	XtProcessEvent  @ 188
+ 	XtAppProcessEvent  @ 189
+ 	XtPending  @ 190
+ 	XtAppPending  @ 191
+ 	XtPeekEvent  @ 192
+ 	XtAppPeekEvent  @ 193
+ 	XtGrabKey  @ 194
+ 	XtGrabButton  @ 195
+ 	XtUngrabKey  @ 196
+ 	XtUngrabButton  @ 197
+ 	XtGrabKeyboard  @ 198
+ 	XtUngrabKeyboard  @ 199
+ 	XtGrabPointer  @ 200
+ 	XtUngrabPointer  @ 201
+ 	XtPopup  @ 202
+ 	XtPopupSpringLoaded  @ 203
+ 	XtPopdown  @ 204
+ 	XtCallbackPopdown  @ 205
+ 	XtCallbackNone  @ 206
+ 	XtCallbackNonexclusive  @ 207
+ 	XtCallbackExclusive  @ 208
+ 	XtGetSubresources  @ 209
+ 	XtGetApplicationResources  @ 210
+ 	XtSetSelectionTimeout  @ 211
+ 	XtAppSetSelectionTimeout  @ 212
+ 	XtGetSelectionTimeout  @ 213
+ 	XtAppGetSelectionTimeout  @ 214
+ 	XtOwnSelection  @ 215
+ 	XtOwnSelectionIncremental  @ 216
+ 	XtDisownSelection  @ 217
+ 	XtGetSelectionValue  @ 218
+ 	XtGetSelectionValueIncremental  @ 219
+ 	XtGetSelectionValues  @ 220
+ 	XtGetSelectionValuesIncremental  @ 221
+ 	XtGetSelectionRequest  @ 222
+ 	XtSetSensitive  @ 223
+ 	XtSetSubvalues  @ 224
+ 	XtSetValues  @ 225
+ 	XtSetWMColormapWindows  @ 226
+ 	XtAddActions  @ 227
+ 	XtAppAddActions  @ 228
+ 	XtGetActionList  @ 229
+ 	XtMenuPopupAction  @ 230
+ 	XtCallActionProc  @ 231
+ 	XtRegisterGrabAction  @ 232
+ 	XtConvertCase  @ 233
+ 	XtTranslateKeycode  @ 234
+ 	XtTranslateKey  @ 235
+ 	XtSetKeyTranslator  @ 236
+ 	XtRegisterCaseConverter  @ 237
+ 	XtGetKeysymTable  @ 238
+ 	XtKeysymToKeycodeList  @ 239
+ 	XtCvtStringToAcceleratorTable  @ 240
+ 	XtCvtStringToTranslationTable  @ 241
+ 	XtParseAcceleratorTable  @ 242
+ 	XtParseTranslationTable  @ 243
+ 	XtUninstallTranslations  @ 244
+ 	XtInstallAccelerators  @ 245
+ 	XtInstallAllAccelerators  @ 246
+ 	XtAugmentTranslations  @ 247
+ 	XtOverrideTranslations  @ 248
+ 	XtVaCreateWidget  @ 249
+ 	XtVaCreateManagedWidget  @ 250
+ 	XtVaAppCreateShell  @ 251
+ 	XtVaCreatePopupShell  @ 252
+ 	XtVaSetValues  @ 253
+ 	XtVaSetSubvalues  @ 254
+ 	XtVaAppInitialize  @ 255
+ 	XtVaOpenApplication  @ 256
+ 	XtVaGetSubresources  @ 257
+ 	XtVaGetApplicationResources  @ 258
+ 	XtVaGetValues  @ 259
+ 	XtVaGetSubvalues  @ 260
+ 	XtVaCreateArgsList  @ 261
+ 	XtCvtStringToRestartStyle  @ 262
+ 	XtCvtStringToGravity  @ 263
+ 	XtAppSetExitFlag  @ 264
+ 	XtAppGetExitFlag  @ 265
+ 	XtGetDisplays  @ 266
+ 	XtRemoveEventTypeHandler  @ 267
+ 	XtInsertEventTypeHandler  @ 268
+ 	XtRegisterDrawable  @ 269
+ 	XtUnregisterDrawable  @ 270
+ 	XtDispatchEventToWidget  @ 271
+ 	XtLastEventProcessed  @ 272
+ 	XtSetEventDispatcher  @ 273
+ 	XtRegisterExtensionSelector  @ 274
+ 	XtAppAddBlockHook  @ 275
+ 	XtRemoveBlockHook  @ 276
+ 	XtHooksOfDisplay  @ 277
+ 	XtGetClassExtension  @ 278
+ 	XtGetKeyboardFocusWidget  @ 279
+ 	XtChangeManagedSet  @ 280
+ 	XtAddSignal  @ 281
+ 	XtAppAddSignal  @ 282
+ 	XtRemoveSignal  @ 283
+ 	XtNoticeSignal  @ 284
+ 	XtReservePropertyAtom  @ 285
+ 	XtReleasePropertyAtom  @ 286
+ 	XtCreateSelectionRequest  @ 287
+ 	XtSendSelectionRequest  @ 288
+ 	XtCancelSelectionRequest  @ 289
+ 	XtSetSelectionParameters  @ 290
+ 	XtGetSelectionParameters  @ 291
+ 	XtSessionGetToken  @ 292
+ 	XtSessionReturnToken  @ 293
+ 	XtAppLock  @ 294
+ 	XtAppUnlock  @ 295
+ 	XtProcessLock  @ 296
+ 	XtProcessUnlock  @ 297
+ 	XtToolkitThreadInitialize  @ 298
+ 	_XtDoFreeBindings  @ 299
+ 	_XtAllocError  @ 300
+ 	_XtHeapInit  @ 301
+ 	_XtHeapAlloc  @ 302
+ 	_XtHeapFree  @ 303
+ 	_XtAddCallback  @ 304
+ 	_XtAddCallbackOnce  @ 305
+ 	_XtRemoveCallback  @ 306
+ 	_XtRemoveAllCallbacks  @ 307
+ 	_XtCompileCallbackList  @ 308
+ 	_XtGetCallbackList  @ 309
+ 	_XtCallConditionalCallbackList  @ 310
+ 	_XtSetDefaultConverterTable  @ 311
+ 	_XtFreeConverterTable  @ 312
+ 	_XtTableAddConverter  @ 313
+ 	_XtCacheFlushTag  @ 314
+ 	_XtConvert  @ 315
+ 	_XtConvertInitialize  @ 316
+  	_XtAddDefaultConverters  @ 317
+ 	_XtCreateWidget  @ 318
+ 	_XtCreatePopupShell  @ 319
+ 	_XtAppCreateShell  @ 320
+ 	_XtDoPhase2Destroy  @ 321
+ 	_XtGetProcessContext  @ 322
+ 	_XtDefaultAppContext  @ 323
+ 	_XtAppInit  @ 324
+ 	_XtDestroyAppContexts  @ 325
+ 	_XtSortPerDisplayList  @ 326
+ 	_XtCloseDisplays  @ 327
+ 	_XtDefaultErrorMsg  @ 328
+ 	_XtDefaultWarningMsg  @ 329
+ 	_XtDefaultError  @ 330
+ 	_XtDefaultWarning  @ 331
+ 	_XtSetDefaultErrorHandlers  @ 332
+ 	_XtAllocWWTable  @ 333
+ 	_XtFreeWWTable  @ 334
+ 	_XtConvertTypeToMask  @ 335
+ 	_XtOnGrabList  @ 336
+ 	_XtEventInitialize  @ 337
+ 	_XtFreeEventTable  @ 338
+ 	_XtSendFocusEvent  @ 339
+ 	_XtFreePerWidgetInput  @ 340
+ 	_XtGetPerWidgetInput  @ 341
+ 	_XtFillAncestorList  @ 342
+ 	_XtFindRemapWidget  @ 343
+ 	_XtUngrabBadGrabs  @ 344
+ 	_XtGClistFree  @ 345
+ 	_XtMakeGeometryRequest  @ 346
+ 	_XtInherit  @ 347
+ 	_XtPreparseCommandLine  @ 348
+ 	_XtDisplayInitialize  @ 349
+ 	_XtCheckSubclassFlag  @ 350
+ 	_XtIsSubclassOf  @ 351
+ 	_XtWindowedAncestor  @ 352
+ 	_XtProcessKeyboardEvent  @ 353
+ 	_XtHandleFocus  @ 354
+ 	_XtRemoveAllInputs  @ 355
+ 	_XtRefreshMapping  @ 356
+ 	_XtDestroyServerGrabs  @ 357
+ 	_XtCheckServerGrabsOnWidget  @ 358
+ 	_XtProcessPointerEvent  @ 359
+ 	_XtPopup  @ 360
+ 	_XtCopyFromParent  @ 361
+ 	_XtCopyFromArg  @ 362
+ 	_XtCopyToArg  @ 363
+ 	_XtCompileResourceList  @ 364
+ 	_XtDependencies  @ 365
+ 	_XtResourceDependencies  @ 366
+ 	_XtConstraintResDependencies  @ 367
+ 	_XtCreateIndirectionTable  @ 368
+ 	_XtGetResources  @ 369
+ 	_XtResourceListInitialize  @ 370
+ 	_XtSetDefaultSelectionTimeout  @ 371
+ 	_XtShellGetCoordinates  @ 372
+ 	_XtInitializeActionData  @ 373
+ 	_XtBindActions  @ 374
+ 	_XtUnbindActions  @ 375
+ 	_XtFreeActions  @ 376
+ 	_XtRegisterGrabs  @ 377
+ 	_XtGrabInitialize  @ 378
+ 	_XtComputeLateBindings  @ 379
+ 	_XtAllocTMContext  @ 380
+ 	_XtMatchUsingDontCareMods  @ 381
+ 	_XtMatchUsingStandardMods  @ 382
+ 	_XtBuildKeysymTables  @ 383
+ 	_XtTranslateInitialize  @ 384
+ 	_XtAddTMConverters  @ 385
+ 	_XtPrintXlations  @ 386
+ 	_XtDisplayTranslations  @ 387
+ 	_XtDisplayAccelerators  @ 388
+ 	_XtDisplayInstalledAccelerators  @ 389
+ 	_XtPrintActions  @ 390
+ 	_XtPrintState  @ 391
+ 	_XtPrintEventSeq  @ 392
+ 	_XtGetQuarkIndex  @ 393
+ 	_XtGetTypeIndex  @ 394
+ 	_XtGetModifierIndex  @ 395
+ 	_XtRegularMatch  @ 396
+ 	_XtMatchAtom  @ 397
+ 	_XtTranslateEvent  @ 398
+ 	_XtTraverseStateTree  @ 399
+ 	_XtInstallTranslations  @ 400
+ 	_XtRemoveTranslations  @ 401
+ 	_XtDestroyTMData  @ 402
+ 	_XtCreateXlations  @ 403
+ 	_XtParseTreeToStateTree  @ 404
+ 	_XtAddEventSeqToStateTree  @ 405
+ 	_XtCvtMergeTranslations  @ 406
+ 	_XtGetTranslationValue  @ 407
+ 	_XtRemoveStateTreeByIndex  @ 408
+ 	_XtFreeTranslations  @ 409
+ 	_XtMergeTranslations  @ 410
+ 	_XtUnmergeTranslations  @ 411
+ 	_XtPopupInitialize  @ 412
+ 	_XtVaAppInitialize  @ 413
+ 	_XtVaOpenApplication  @ 414
+ 	_XtCountVaList  @ 415
+ 	_XtVaCreateTypedArgList  @ 416
+ 	_XtVaToArgList  @ 417
+ 	_XtVaToTypedArgList  @ 418
+ 	_XtPeekCallback  @ 419
+ 	_XtCreateHookObj  @ 420
+ 	_XtGetPerDisplay  @ 421
+ 	_XtGetPerDisplayInput  @ 422
+ 	_XtExtensionSelect  @ 423
+ 	_XtAddShellToHookObj  @ 424
+ 	_XtIsHookObject  @ 425
+ 	_XtGetUserName  @ 426
+ 	_XtWaitForSomething  @ 427
+ 	XtDirectConvert @ 433
+ 	colorConvertArgs @ 435
+ 	screenConvertArg @ 436
+ 	XtCXtToolkitError @ 437
+ 	_XtQString @ 438
+ 	_XtAppDestroyCount @ 439
+ 	_XtPerDisplayList @ 440
+ 	_XtGlobalTM @ 444
+ 	XtStrings @ 445
+ 	overrideShellClassRec @ 446
+ 	overrideShellWidgetClass @ 447
+ 	constraintClassRec @ 448
+ 	constraintWidgetClass @ 449
+ 	objectClassRec @ 450
+ 	objectClass @ 451
+ 	widgetClassRec @ 452
+ 	widgetClass @ 453
+ 	rectObjClassRec @ 454
+ 	rectObjClass @ 455
+ 	coreWidgetClass @ 457
+ 	wmShellClassRec @ 458
+ 	wmShellWidgetClass @ 459
+ 	XtShellStrings @ 460
+ 	topLevelShellClassRec @ 461
+ 	topLevelShellWidgetClass @ 462
+ 	transientShellClassRec @ 463
+ 	transientShellWidgetClass @ 464
+ 	shellClassRec @ 465
+ 	shellWidgetClass @ 466
+ 	compositeClassRec @ 467
+ 	compositeWidgetClass @ 468
+ 	applicationShellClassRec @ 469
+ 	applicationShellWidgetClass @ 470
+ 	_XtInheritTranslations @ 471
+ 	sessionShellClassRec @ 472
+ 	sessionShellWidgetClass @ 473
diff -c /dev/null xc/lib/Xt/Xtos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:48:05 1995
--- xc/lib/Xt/Xtos2.rsp	Mon Jan 30 17:48:05 1995
***************
*** 0 ****
--- 1,11 ----
+ ActionHook.obj Alloc.obj ArgList.obj Callback.obj ClickTime.obj Composite.obj+
+ Constraint.obj Convert.obj Converters.obj Core.obj Create.obj Destroy.obj+
+ Display.obj Error.obj Event.obj EventUtil.obj Functions.obj GCManager.obj+
+ Geometry.obj GetActKey.obj GetResList.obj GetValues.obj HookObj.obj Hooks.obj+
+ Initialize.obj Intrinsic.obj Keyboard.obj Manage.obj NextEvent.obj Object.obj+
+ PassivGrab.obj Pointer.obj Popup.obj PopupCB.obj RectObj.obj Resources.obj+
+ Selection.obj SetSens.obj SetValues.obj SetWMCW.obj Shell.obj StringDefs.obj+
+ TMaction.obj TMgrab.obj TMkey.obj TMparse.obj TMprint.obj TMstate.obj+
+ Threads.obj VarCreate.obj VarGet.obj Varargs.obj Vendor.obj /NOL /NOD /BAT
+ Xt.dll
+ 
diff -c xc/lib/Xt/jump_funcs:1.1.1.1 xc/lib/Xt/jump_funcs:3.2
*** xc/lib/Xt/jump_funcs:1.1.1.1	Mon Jan 30 17:48:06 1995
--- xc/lib/Xt/jump_funcs	Mon Jan 30 17:48:06 1995
***************
*** 1,5 ****
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_funcs,v 3.1 1994/05/04 14:56:46 dawes Exp $
  #
  00000000 T _XtAppAddActionHook  libXt          ActionHook
  00000000 T _XtRemoveActionHook  libXt          ActionHook
--- 1,5 ----
  # $XConsortium: jump_funcs,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_funcs,v 3.2 1995/01/28 15:44:02 dawes Exp $
  #
  00000000 T _XtAppAddActionHook  libXt          ActionHook
  00000000 T _XtRemoveActionHook  libXt          ActionHook
diff -c xc/lib/Xt/jump_ignore:1.1.1.1 xc/lib/Xt/jump_ignore:3.1
*** xc/lib/Xt/jump_ignore:1.1.1.1	Mon Jan 30 17:48:07 1995
--- xc/lib/Xt/jump_ignore	Mon Jan 30 17:48:07 1995
***************
*** 1,3 ****
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_ignore,v 3.0 1994/04/28 12:32:14 dawes Exp $
  # jump_ignore
--- 1,3 ----
  # $XConsortium: jump_ignore,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_ignore,v 3.1 1995/01/28 15:44:03 dawes Exp $
  # jump_ignore
diff -c xc/lib/Xt/jump_vars:1.1.1.1 xc/lib/Xt/jump_vars:3.2
*** xc/lib/Xt/jump_vars:1.1.1.1	Mon Jan 30 17:48:07 1995
--- xc/lib/Xt/jump_vars	Mon Jan 30 17:48:07 1995
***************
*** 1,5 ****
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_vars,v 3.1 1994/05/04 14:56:48 dawes Exp $
  #
  00000100 D _compositeClassRec   libXt          Composite
  00000004 D _compositeWidgetClass libXt          Composite
--- 1,5 ----
  # $XConsortium: jump_vars,v 1.2 94/12/07 10:45:51 kaleb Exp $
! # $XFree86: xc/lib/Xt/jump_vars,v 3.2 1995/01/28 15:44:05 dawes Exp $
  #
  00000100 D _compositeClassRec   libXt          Composite
  00000004 D _compositeWidgetClass libXt          Composite
diff -c /dev/null xc/lib/Xtst/Xtstos2.def:3.0
*** /dev/null	Mon Jan 30 17:48:09 1995
--- xc/lib/Xtst/Xtstos2.def	Mon Jan 30 17:48:09 1995
***************
*** 0 ****
--- 1,23 ----
+ LIBRARY XTST
+ DESCRIPTION "X11R6 XFree86 libXTST.dll for OS/2 EMX08H VERSION=6.0"
+ CODE
+ 	PRELOAD
+ DATA
+ 	SINGLE NONSHARED
+ STACKSIZE 4096
+ EXPORTS
+ 	 XTestCompareCurrentCursorWithWindow  @ 1
+ 	 XTestCompareCursorWithWindow  @ 2
+ 	 XTestDiscard  @ 3
+ 	 XTestFakeButtonEvent  @ 4
+ 	 XTestFakeDeviceButtonEvent  @ 5
+ 	 XTestFakeDeviceKeyEvent  @ 6
+ 	 XTestFakeDeviceMotionEvent  @ 7
+ 	 XTestFakeKeyEvent  @ 8
+ 	 XTestFakeMotionEvent  @ 9
+ 	 XTestFakeProximityEvent  @ 10
+ 	 XTestFakeRelativeMotionEvent  @ 11
+ 	 XTestGrabControl  @ 12
+ 	 XTestQueryExtension  @ 13
+ 	 XTestSetGContextOfGC  @ 14
+ 	 XTestSetVisualIDOfVisual  @ 15
diff -c /dev/null xc/lib/Xtst/Xtstos2.rsp:3.0
*** /dev/null	Mon Jan 30 17:48:09 1995
--- xc/lib/Xtst/Xtstos2.rsp	Mon Jan 30 17:48:10 1995
***************
*** 0 ****
--- 1,3 ----
+ Xtest.obj /NOL /NOD /BAT
+ Xtst.dll
+ 
diff -c xc/lib/font/Imakefile:1.1.1.2 xc/lib/font/Imakefile:3.1
*** xc/lib/font/Imakefile:1.1.1.2	Mon Jan 30 17:48:11 1995
--- xc/lib/font/Imakefile	Mon Jan 30 17:48:11 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.10 94/11/28 11:50:26 kaleb Exp $
+ XCOMM $XFree86: xc/lib/font/Imakefile,v 3.1 1995/01/28 15:44:10 dawes Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
diff -c xc/lib/font/Speedo/spfont.c:1.1.1.2 xc/lib/font/Speedo/spfont.c:3.1
*** xc/lib/font/Speedo/spfont.c:1.1.1.2	Mon Jan 30 17:48:13 1995
--- xc/lib/font/Speedo/spfont.c	Mon Jan 30 17:48:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: spfont.c,v 1.23 94/07/25 13:48:35 kaleb Exp $ */
+ /* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.1 1994/08/20 07:29:31 dawes Exp $ */
  /*
   * Copyright 1990, 1991 Network Computing Devices;
   * Portions Copyright 1987 by Digital Equipment Corporation
diff -c xc/lib/font/Type1/t1funcs.c:1.1.1.2 xc/lib/font/Type1/t1funcs.c:3.1
*** xc/lib/font/Type1/t1funcs.c:1.1.1.2	Mon Jan 30 17:48:18 1995
--- xc/lib/font/Type1/t1funcs.c	Mon Jan 30 17:48:18 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: t1funcs.c,v 1.20 94/07/25 13:50:03 kaleb Exp $ */
+ /* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.1 1994/08/20 07:29:43 dawes Exp $ */
  /* Copyright International Business Machines,Corp. 1991
   * All Rights Reserved
   *
diff -c xc/lib/font/bitmap/bitmapfunc.c:1.1.1.1 xc/lib/font/bitmap/bitmapfunc.c:3.1
*** xc/lib/font/bitmap/bitmapfunc.c:1.1.1.1	Mon Jan 30 17:48:20 1995
--- xc/lib/font/bitmap/bitmapfunc.c	Mon Jan 30 17:48:20 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: bitmapfunc.c,v 1.8 94/04/17 20:17:12 gildea Exp $ */
+ /* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.1 1994/12/18 10:55:30 dawes Exp $ */
  
  /*
  
***************
*** 53,58 ****
--- 54,62 ----
  static BitmapFileFunctionsRec readers[] = {
      pcfReadFont, pcfReadFontInfo,
      pcfReadFont, pcfReadFontInfo,
+ #ifdef __EMX__
+     pcfReadFont, pcfReadFontInfo,
+ #endif
      snfReadFont, snfReadFontInfo,
      snfReadFont, snfReadFontInfo,
      bdfReadFont, bdfReadFontInfo,
***************
*** 71,76 ****
--- 75,86 ----
      BitmapOpenBitmap, BitmapOpenScalable,
  	BitmapGetInfoBitmap, BitmapGetInfoScalable, 0,
  	CAPABILITIES,
+ #ifdef __EMX__
+     ".pcz", 4,
+     BitmapOpenBitmap, BitmapOpenScalable,
+ 	BitmapGetInfoBitmap, BitmapGetInfoScalable, 0,
+ 	CAPABILITIES,
+ #endif
      ".snf", 4,
      BitmapOpenBitmap, BitmapOpenScalable,
  	BitmapGetInfoBitmap, BitmapGetInfoScalable, 0,
diff -c xc/lib/font/bitmap/bitscale.c:1.1.1.2 xc/lib/font/bitmap/bitscale.c:3.1
*** xc/lib/font/bitmap/bitscale.c:1.1.1.2	Mon Jan 30 17:48:21 1995
--- xc/lib/font/bitmap/bitscale.c	Mon Jan 30 17:48:21 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: bitscale.c,v 1.28 94/07/25 13:50:59 kaleb Exp $ */
+ /* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.1 1994/08/20 07:29:55 dawes Exp $ */
  
  /*
  
***************
*** 277,285 ****
      else if (m == 2.0) \
          score += (4 * s); \
      else \
!         score += (3 * s) / m; \
  } else { \
!         score += (2 * s) * m; \
  }
  
  /* don't need to favor enlargement when looking for bitmap that can
--- 278,286 ----
      else if (m == 2.0) \
          score += (4 * s); \
      else \
!         score += (int)(((double)(3 * s)) / m); \
  } else { \
!         score += (int)(((double)(2 * s)) * m); \
  }
  
  /* don't need to favor enlargement when looking for bitmap that can
***************
*** 286,294 ****
     be used unscalable */
  #define SCORE2(m,s) \
  if (m >= 1.0) \
!     score += (8 * s) / m; \
  else \
!     score += (8 * s) * m;
  
  static FontEntryPtr
  FindBestToScale(fpe, entry, vals, best, dxp, dyp, sdxp, sdyp, fpep)
--- 287,295 ----
     be used unscalable */
  #define SCORE2(m,s) \
  if (m >= 1.0) \
!     score += (int)(((double)(8 * s)) / m); \
  else \
!     score += (int)(((double)(8 * s)) * m);
  
  static FontEntryPtr
  FindBestToScale(fpe, entry, vals, best, dxp, dyp, sdxp, sdyp, fpep)
diff -c xc/lib/font/fc/fserve.c:1.1.1.1 xc/lib/font/fc/fserve.c:3.0
*** xc/lib/font/fc/fserve.c:1.1.1.1	Mon Jan 30 17:48:24 1995
--- xc/lib/font/fc/fserve.c	Mon Jan 30 17:48:24 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: fserve.c,v 1.43 94/04/17 20:17:39 mor Exp $ */
+ /* $XFree86: xc/lib/font/fc/fserve.c,v 3.0 1994/10/20 06:06:37 dawes Exp $ */
  /*
  
  Copyright (c) 1990  X Consortium
***************
*** 64,70 ****
  #include	"fservestr.h"
  #include	"fslibos.h"
  #include	<errno.h>
! #ifdef X_NOT_STDC_ENV
  extern int errno;
  #define Time_t long
  extern Time_t time ();
--- 65,71 ----
  #include	"fservestr.h"
  #include	"fslibos.h"
  #include	<errno.h>
! #if defined(X_NOT_STDC_ENV) && !defined(__EMX__)
  extern int errno;
  #define Time_t long
  extern Time_t time ();
diff -c xc/lib/font/fc/fsio.c:1.1.1.1 xc/lib/font/fc/fsio.c:3.2
*** xc/lib/font/fc/fsio.c:1.1.1.1	Mon Jan 30 17:48:25 1995
--- xc/lib/font/fc/fsio.c	Mon Jan 30 17:48:25 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: fsio.c,v 1.36 94/03/18 11:01:01 mor Exp $ */
+ /* $XFree86: xc/lib/font/fc/fsio.c,v 3.2 1994/06/28 12:24:10 dawes Exp $ */
  /*
   * Copyright 1990 Network Computing Devices
   *
***************
*** 41,47 ****
  #include	<stdio.h>
  #include	<signal.h>
  #include	<sys/types.h>
! #ifndef WIN32
  #include	<sys/socket.h>
  #endif
  #include	<errno.h>
--- 42,48 ----
  #include	<stdio.h>
  #include	<signal.h>
  #include	<sys/types.h>
! #if !defined(WIN32) && !defined(AMOEBA) && !defined(_MINIX)
  #include	<sys/socket.h>
  #endif
  #include	<errno.h>
***************
*** 54,59 ****
--- 55,65 ----
  #define EINTR WSAEINTR
  #endif
  
+ #ifdef MINIX
+ #include <sys/nbio.h>
+ #define select(n,r,w,x,t) nbio_select(n,r,w,x,t)
+ #endif
+ 
  /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
   * systems are broken and return EWOULDBLOCK when they should return EAGAIN
   */
***************
*** 344,349 ****
--- 350,358 ----
      unsigned long size;
  {
      long        bytes_read;
+ #if defined(SVR4) && defined(i386)
+     int		num_failed_reads = 0;
+ #endif
  
      if (size == 0) {
  
***************
*** 354,364 ****
--- 363,381 ----
  	return 0;
      }
      ESET(0);
+     /*
+      * For SVR4 with a unix-domain connection, ETEST() after selecting
+      * readable means the server has died.  To do this here, we look for
+      * two consecutive reads returning ETEST().
+      */
      while ((bytes_read = _FontTransRead(conn->trans_conn,
  	data, (int) size)) != size) {
  	if (bytes_read > 0) {
  	    size -= bytes_read;
  	    data += bytes_read;
+ #if defined(SVR4) && defined(i386)
+ 	    num_failed_reads = 0;
+ #endif
  	} else if (ETEST()) {
  	    /* in a perfect world, this shouldn't happen */
  	    /* ... but then, its less than perfect... */
***************
*** 367,374 ****
--- 384,402 ----
  		ESET(EPIPE);
  		return -1;
  	    }
+ #if defined(SVR4) && defined(i386)
+ 	    num_failed_reads++;
+ 	    if (num_failed_reads > 1) {
+ 		_fs_connection_died(conn);
+ 		ESET(EPIPE);
+ 		return -1;
+ 	    }
+ #endif
  	    ESET(0);
  	} else if (ECHECK(EINTR)) {
+ #if defined(SVR4) && defined(i386)
+ 	    num_failed_reads = 0;
+ #endif
  	    continue;
  	} else {		/* something bad happened */
  	    if (conn->fs_fd > 0)
***************
*** 476,481 ****
--- 504,510 ----
  _fs_wait_for_readable(conn)
      FSFpePtr    conn;
  {
+ #ifndef AMOEBA
      FdSet r_mask;
      FdSet e_mask;
      int         result;
***************
*** 488,494 ****
--- 517,525 ----
      CLEARBITS(e_mask);
      do {
  	BITSET(r_mask, conn->fs_fd);
+ #ifndef MINIX
  	BITSET(e_mask, conn->fs_fd);
+ #endif
  #ifdef WIN32
  	result = select(0, &r_mask, NULL, &e_mask, NULL);
  #else
***************
*** 505,510 ****
--- 536,545 ----
      } while (result <= 0);
  
      return 0;
+ #else
+     printf("fs_wait_for_readable(): fail\n");
+     return -1;
+ #endif
  }
  
  int
diff -c xc/lib/font/fontfile/bufio.c:1.1.1.1 xc/lib/font/fontfile/bufio.c:3.0
*** xc/lib/font/fontfile/bufio.c:1.1.1.1	Mon Jan 30 17:48:27 1995
--- xc/lib/font/fontfile/bufio.c	Mon Jan 30 17:48:27 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: bufio.c,v 1.8 94/04/17 20:17:00 gildea Exp $ */
+ /* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.0 1994/12/17 09:41:39 dawes Exp $ */
  
  /*
  
***************
*** 129,134 ****
--- 130,139 ----
  BufFileOpenRead (fd)
      int	fd;
  {
+ #ifdef __EMX__
+     /* hv: I'd bet WIN32 has the same effect here */
+     setmode(fd,O_BINARY);
+ #endif
      return BufFileCreate ((char *) fd, BufFileRawFill, BufFileRawSkip, BufFileRawClose);
  }
  
***************
*** 155,160 ****
--- 160,169 ----
  {
      BufFilePtr	f;
  
+ #ifdef __EMX__
+     /* hv: I'd bet WIN32 has the same effect here */
+     setmode(fd,O_BINARY);
+ #endif
      f = BufFileCreate ((char *) fd, BufFileRawFlush, 0, BufFileFlush);
      f->bufp = f->buffer;
      f->left = BUFFILESIZE;
diff -c xc/lib/font/fontfile/fileio.c:1.1.1.1 xc/lib/font/fontfile/fileio.c:3.0
*** xc/lib/font/fontfile/fileio.c:1.1.1.1	Mon Jan 30 17:48:27 1995
--- xc/lib/font/fontfile/fileio.c	Mon Jan 30 17:48:27 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: fileio.c,v 1.4 94/04/17 20:17:04 gildea Exp $ */
+ /* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.0 1994/12/17 09:41:41 dawes Exp $ */
  
  /*
  
***************
*** 55,61 ****
--- 56,67 ----
  	return 0;
      }
      len = strlen (name);
+ #ifndef __EMX__
      if (len > 2 && !strcmp (name + len - 2, ".Z")) {
+ #else
+     if (len > 2 && (!strcmp (name + len - 4, ".pcz") || 
+ 		    !strcmp (name + len - 2, ".Z"))) {
+ #endif
  	cooked = BufFilePushCompressed (raw);
  	if (!cooked) {
  	    BufFileClose (raw, TRUE);
diff -c xc/lib/font/fontfile/filewr.c:1.1.1.1 xc/lib/font/fontfile/filewr.c:3.0
*** xc/lib/font/fontfile/filewr.c:1.1.1.1	Mon Jan 30 17:48:27 1995
--- xc/lib/font/fontfile/filewr.c	Mon Jan 30 17:48:28 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: filewr.c,v 1.4 94/04/17 20:17:05 gildea Exp $ */
+ /* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.0 1994/12/17 09:41:42 dawes Exp $ */
  
  /*
  
***************
*** 40,46 ****
  {
      int	fd;
  
! #ifdef WIN32
      fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
  #else
      fd = creat (name, 0666);
--- 41,47 ----
  {
      int	fd;
  
! #if defined(WIN32) || defined(__EMX__)
      fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
  #else
      fd = creat (name, 0666);
diff -c xc/lib/font/fontfile/fontscale.c:1.1.1.2 xc/lib/font/fontfile/fontscale.c:3.1
*** xc/lib/font/fontfile/fontscale.c:1.1.1.2	Mon Jan 30 17:48:28 1995
--- xc/lib/font/fontfile/fontscale.c	Mon Jan 30 17:48:28 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: fontscale.c,v 1.14 94/07/25 13:52:04 kaleb Exp $ */
+ /* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.1 1994/08/20 07:30:07 dawes Exp $ */
  
  /*
  
diff -c xc/lib/font/util/fontxlfd.c:1.1.1.2 xc/lib/font/util/fontxlfd.c:3.2
*** xc/lib/font/util/fontxlfd.c:1.1.1.2	Mon Jan 30 17:48:31 1995
--- xc/lib/font/util/fontxlfd.c	Mon Jan 30 17:48:31 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: fontxlfd.c,v 1.19 94/06/05 14:42:48 rws Exp $ */
+ /* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.2 1995/01/10 10:19:12 dawes Exp $ */
  
  /*
  
***************
*** 39,45 ****
  #include	"fontxlfd.h"
  #include	<X11/Xos.h>
  #include	<math.h>
! #ifndef X_NOT_STDC_ENV
  #include	<stdlib.h>
  #endif
  #if defined(X_NOT_STDC_ENV) || (defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV))
--- 40,46 ----
  #include	"fontxlfd.h"
  #include	<X11/Xos.h>
  #include	<math.h>
! #if !defined(X_NOT_STDC_ENV) || defined(SCO)
  #include	<stdlib.h>
  #endif
  #if defined(X_NOT_STDC_ENV) || (defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV))
***************
*** 209,222 ****
  xlfd_round_double(x)
  double x;
  {
!     /* Utility for XLFD users to round numbers to XLFD_NDIGITS
!        significant digits.  How do you round to n significant digits on
!        a binary machine?  Let printf() do it for you.  */
!     char formatbuf[40], buffer[40];
! 
!     sprintf(formatbuf, "%%.%dlg", XLFD_NDIGITS);
!     sprintf(buffer, formatbuf, x);
!     return atof(buffer);
  }
  
  static char *
--- 210,289 ----
  xlfd_round_double(x)
  double x;
  {
!    /* Utility for XLFD users to round numbers to XLFD_NDIGITS
!       significant digits.  How do you round to n significant digits on
!       a binary machine?  */
! 
! #if defined(i386) || defined(__i386__)
! #include <float.h>
! 
! /* if we have IEEE 754 fp, we can round to binary digits... */
! 
! #if (FLT_RADIX == 2) && (DBL_DIG == 15) && (DBL_MANT_DIG == 53)
! 
! #ifndef M_LN2
! #define M_LN2       0.69314718055994530942
! #endif
! #ifndef M_LN10
! #define M_LN10      2.30258509299404568402
! #endif
! 
! /* convert # of decimal digits to # of binary digits */
! #define XLFD_NDIGITS_2 ((int)(XLFD_NDIGITS * M_LN10 / M_LN2 + 0.5))
!    
!    union conv_d {
!       double d;
!       unsigned char b[8];
!    } d;
!    int i,j,k,d_exp;
!    
!    /* do minor sanity check for IEEE 754 fp and correct byte order */
!    d.d = 1.0;
!    if (sizeof(double) == 8 && d.b[7] == 0x3f && d.b[6] == 0xf0) {
!       
!       /* 
!        * this code will round IEEE 754 double to XLFD_NDIGITS_2 binary digits
!        */
!       
!       d.d = x;
!       d_exp = (d.b[7] << 4) | (d.b[6] >> 4);
!       
!       i = (DBL_MANT_DIG-XLFD_NDIGITS_2) >> 3;
!       j = 1 << ((DBL_MANT_DIG-XLFD_NDIGITS_2) & 0x07);
!       for (; i<7; i++) {
! 	 k = d.b[i] + j;
! 	 d.b[i] = k;
! 	 if (k & 0x100) j = 1;
! 	 else break;
!       }
!       if ((i==7) && ((d.b[6] & 0xf0) != ((d_exp<<4) & 0xf0))) {
! 	 /* mantissa overflow: increment exponent */
! 	 d_exp = (d_exp & 0x800 ) | ((d_exp & 0x7ff) + 1);
! 	 d.b[7] = d_exp >> 4;
! 	 d.b[6] = (d.b[6] & 0x0f) | (d_exp << 4);
!       }
!       
!       i = (DBL_MANT_DIG-XLFD_NDIGITS_2) >> 3;
!       j = 1 << ((DBL_MANT_DIG-XLFD_NDIGITS_2) & 0x07);      
!       d.b[i] &= ~(j-1);
!       for (;--i>=0;) d.b[i] = 0;
! 
!       return d.d;
!    }
!    else 
! #endif
! #endif /* i386 || __i386__ */
!     {
! 	/*
! 	 * If not IEEE 754:  Let printf() do it for you.  
! 	 */
! 	 
! 	char formatbuf[40], buffer[40];
! 	 
! 	sprintf(formatbuf, "%%.%dlg", XLFD_NDIGITS);
! 	sprintf(buffer, formatbuf, x);
! 	return atof(buffer);
!     }
  }
  
  static char *
diff -c xc/lib/xtrans/Xtrans.c:1.1.1.4 xc/lib/xtrans/Xtrans.c:3.6
*** xc/lib/xtrans/Xtrans.c:1.1.1.4	Mon Jan 30 17:48:34 1995
--- xc/lib/xtrans/Xtrans.c	Mon Jan 30 17:48:34 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtrans.c,v 1.28 94/12/01 16:30:09 kaleb Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.6 1995/01/12 05:54:15 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 80,85 ****
--- 81,88 ----
  #define TRANS_LOCAL_ISC_INDEX		12
  #define TRANS_LOCAL_SCO_INDEX		13
  #define TRANS_AMOEBA_INDEX		14
+ #define TRANS_MNX_INET_INDEX		15
+ #define TRANS_MNX_TCP_INDEX		16
  
  
  static
***************
*** 112,117 ****
--- 115,124 ----
  #if defined(AMRPCCONN) || defined(AMTCPCONN)
      &TRANS(AmConnFuncs),	TRANS_AMOEBA_INDEX,
  #endif /* AMRPCCONN || AMTCPCONN */
+ #if defined(MNX_TCPCONN)
+     &TRANS(MnxINETFuncs),	TRANS_MNX_INET_INDEX,
+     &TRANS(MnxTCPFuncs),	TRANS_MNX_TCP_INDEX,
+ #endif /* MNX_TCPCONN */
  };
  
  #define NUMTRANS	(sizeof(Xtransports)/sizeof(Xtransport_table))
***************
*** 677,682 ****
--- 684,693 ----
       * ret = ciptr->transptr->SetOption (ciptr, option, arg);
       */
  
+ #ifdef MINIX
+     return ciptr->transptr->SetOption(ciptr, option, arg);
+ #else /* !MINIX */
+ 
      switch (option)
      {
      case TRANS_NONBLOCKING:
***************
*** 686,692 ****
  	    /* Set to blocking mode */
  	    break;
  	case 1: /* Set to non-blocking mode */
! #if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu))
  	    ret = fcntl (fd, F_SETFL, O_NONBLOCK);
  #else
  #ifdef FIOSNBIO
--- 697,704 ----
  	    /* Set to blocking mode */
  	    break;
  	case 1: /* Set to non-blocking mode */
! 
! #if defined(O_NONBLOCK) && (!defined(SCO) && !defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu) && !defined(__EMX__))
  	    ret = fcntl (fd, F_SETFL, O_NONBLOCK);
  #else
  #ifdef FIOSNBIO
***************
*** 696,706 ****
  	    ret = ioctl (fd, FIOSNBIO, &arg);
  	}
  #else
! #if (defined(AIXV3) || defined(uniosu) || defined(WIN32)) && defined(FIONBIO)
  	{
  	    int arg;
  	    arg = 1;
  	    ret = ioctl (fd, FIONBIO, &arg);
  	}
  #else
  #ifdef FNDELAY
--- 708,724 ----
  	    ret = ioctl (fd, FIOSNBIO, &arg);
  	}
  #else
! #if (defined(AIXV3) || defined(uniosu) || defined(WIN32) || defined(__EMX__)) && defined(FIONBIO)
  	{
  	    int arg;
  	    arg = 1;
+ /* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail
+  * eventually with EWOULDBLOCK */
+ #ifndef __EMX__
  	    ret = ioctl (fd, FIONBIO, &arg);
+ #else
+ /*	    ret = ioctl(fd, FIONBIO, &arg, sizeof(int));*/
+ #endif
  	}
  #else
  #ifdef FNDELAY
***************
*** 729,734 ****
--- 747,753 ----
      }
      
      return ret;
+ #endif /* MINIX */
  }
  
  #ifdef TRANS_SERVER
***************
*** 1283,1289 ****
  
  #endif /* CRAY */
  
! #if (defined(SYSV) && defined(i386)) || defined(WIN32) || defined(__sxg__) || defined(SCO)
  
  /*
   * emulate readv
--- 1302,1308 ----
  
  #endif /* CRAY */
  
! #if (defined(SYSV) && defined(i386)) || defined(WIN32) || defined(__sxg__) || defined(SCO) || defined(__EMX__)
  
  /*
   * emulate readv
***************
*** 1317,1325 ****
      return total;
  }
  
! #endif /* SYSV && SYSV386 || WIN32 || __sxg__ || SCO */
  
! #if defined(WIN32) || defined(__sxg__) || defined(SCO)
  
  /*
   * emulate writev
--- 1336,1344 ----
      return total;
  }
  
! #endif /* SYSV && i386 || WIN32 || __sxg__ || SCO */
  
! #if defined(WIN32) || defined(__sxg__) || defined(SCO) || defined(__EMX__)
  
  /*
   * emulate writev
diff -c xc/lib/xtrans/Xtrans.h:1.1.1.4 xc/lib/xtrans/Xtrans.h:3.3
*** xc/lib/xtrans/Xtrans.h:1.1.1.4	Mon Jan 30 17:48:35 1995
--- xc/lib/xtrans/Xtrans.h	Mon Jan 30 17:48:35 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtrans.h,v 1.28 94/10/18 15:57:42 mor Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.3 1995/01/12 05:54:17 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 152,158 ****
  #endif
  
  
! #if defined(WIN32) || (defined(USG) && !defined(CRAY) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__))
  
  /*
   *      TRANS(Readv) and TRANS(Writev) use struct iovec, normally found
--- 153,159 ----
  #endif
  
  
! #if defined(WIN32) || (defined(USG) && !defined(CRAY) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__)) || defined(MINIX)
  
  /*
   *      TRANS(Readv) and TRANS(Writev) use struct iovec, normally found
diff -c xc/lib/xtrans/Xtransint.h:1.1.1.2 xc/lib/xtrans/Xtransint.h:3.5
*** xc/lib/xtrans/Xtransint.h:1.1.1.2	Mon Jan 30 17:48:36 1995
--- xc/lib/xtrans/Xtransint.h	Mon Jan 30 17:48:36 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtransint.h,v 1.21 94/05/10 11:08:46 mor Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.5 1994/12/17 09:42:03 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 63,70 ****
   *	DEBUG=3 All Function Tracing
   *	DEBUG=4 printing of intermediate values
   *	DEBUG=5 really detailed stuff
- #define DEBUG 2
   */
  
  #ifndef _XTRANSINT_H_
  #define _XTRANSINT_H_
--- 64,75 ----
   *	DEBUG=3 All Function Tracing
   *	DEBUG=4 printing of intermediate values
   *	DEBUG=5 really detailed stuff
   */
+ #ifndef __EMX__
+ #define DEBUG 1
+ #else
+ #define DEBUG 5
+ #endif
  
  #ifndef _XTRANSINT_H_
  #define _XTRANSINT_H_
***************
*** 85,91 ****
--- 90,101 ----
  #endif
  
  #ifndef WIN32
+ #ifndef MINIX
  #include <sys/socket.h>
+ #endif
+ #ifdef __EMX__
+ #include <sys/ioctl.h>
+ #endif
  
  /*
   * makedepend screws up on #undef OPEN_MAX, so we define a new symbol
***************
*** 125,132 ****
  
  #endif /* TRANS_OPEN_MAX */
  
! 
  #define ESET(val) errno = val
  #define EGET() errno
  
  #else /* WIN32 */
--- 135,145 ----
  
  #endif /* TRANS_OPEN_MAX */
  
! #ifdef __EMX__
! #define ESET(val)
! #else
  #define ESET(val) errno = val
+ #endif
  #define EGET() errno
  
  #else /* WIN32 */
***************
*** 365,371 ****
   * systems, so they may be emulated.
   */
  
! #if defined(CRAY) || (defined(SYSV) && defined(SYSV386)) || defined(WIN32) || defined(__sxg__) || defined(SCO)
  
  #define READV(ciptr, iov, iovcnt)	TRANS(ReadV)(ciptr, iov, iovcnt)
  
--- 378,384 ----
   * systems, so they may be emulated.
   */
  
! #if defined(CRAY) || (defined(SYSV) && defined(i386)) || defined(WIN32) || defined(__sxg__) || defined(SCO) || defined(__EMX__)
  
  #define READV(ciptr, iov, iovcnt)	TRANS(ReadV)(ciptr, iov, iovcnt)
  
***************
*** 381,390 ****
  
  #define READV(ciptr, iov, iovcnt)	readv(ciptr->fd, iov, iovcnt)
  
! #endif /* CRAY || (SYSV && SYSV386) || WIN32 || __sxg__ || SCO */
  
  
! #if defined(CRAY) || defined(WIN32) || defined(__sxg__) || defined(SCO)
  
  #define WRITEV(ciptr, iov, iovcnt)	TRANS(WriteV)(ciptr, iov, iovcnt)
  
--- 394,403 ----
  
  #define READV(ciptr, iov, iovcnt)	readv(ciptr->fd, iov, iovcnt)
  
! #endif /* CRAY || (SYSV && i386) || WIN32 || __sxg__ || SCO */
  
  
! #if defined(CRAY) || defined(WIN32) || defined(__sxg__) || defined(SCO) || defined(__EMX__)
  
  #define WRITEV(ciptr, iov, iovcnt)	TRANS(WriteV)(ciptr, iov, iovcnt)
  
***************
*** 415,427 ****
   */
  
  #if defined(DEBUG)
  #define PRMSG(lvl,x,a,b,c)	if (lvl <= DEBUG){ \
! 			int saveerrno=errno; \
! 			fprintf(stderr, x,a,b,c); fflush(stderr); \
  			errno=saveerrno; \
! 			}
  #else
! #define PRMSG(lvl,x,a,b,c)
  #endif /* DEBUG */
  
  #endif /* _XTRANSINT_H_ */
--- 428,466 ----
   */
  
  #if defined(DEBUG)
+ /* add hack to the format string to avoid warnings about extra arguments
+  * to fprintf.
+  */
+ #if defined(XSERV_t) && defined(TRANS_SERVER)
+ /* Use ErrorF() for the X server */
+ #ifndef __EMX__
  #define PRMSG(lvl,x,a,b,c)	if (lvl <= DEBUG){ \
! 			int hack= 0, saveerrno=errno; \
! 			ErrorF(x+hack,a,b,c); \
  			errno=saveerrno; \
! 			} else ((void)0)
! #else
! #define PRMSG(lvl,x,a,b,c)	if (lvl <= DEBUG){ \
! 			int hack= 0; \
! 			ErrorF(x+hack,a,b,c); \
! 			} else ((void)0)
! #endif /* __EMX__ */
! #else
! #ifndef __EMX__
! #define PRMSG(lvl,x,a,b,c)	if (lvl <= DEBUG){ \
! 			int hack= 0, saveerrno=errno; \
! 			fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
! 			errno=saveerrno; \
! 			} else ((void)0)
! #else
! #define PRMSG(lvl,x,a,b,c)	if (lvl <= DEBUG){ \
! 			int hack= 0; \
! 			fprintf(stdout, x+hack,a,b,c); fflush(stdout); \
! 			} else ((void)0)
! #endif /* __EMX__ */
! #endif /* XSERV_t && TRANS_SERVER */
  #else
! #define PRMSG(lvl,x,a,b,c)	((void)0)
  #endif /* DEBUG */
  
  #endif /* _XTRANSINT_H_ */
diff -c xc/lib/xtrans/Xtranslcl.c:1.1.1.3 xc/lib/xtrans/Xtranslcl.c:3.7
*** xc/lib/xtrans/Xtranslcl.c:1.1.1.3	Mon Jan 30 17:48:37 1995
--- xc/lib/xtrans/Xtranslcl.c	Mon Jan 30 17:48:37 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtranslcl.c,v 1.21 95/01/19 18:06:04 mor Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.7 1995/01/25 10:46:12 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 97,104 ****
--- 98,111 ----
   */
  
  #include <sys/socket.h>
+ #ifndef X_NO_SYS_UN
  #include <sys/un.h>
+ #endif
  
+ #ifdef ISC
+ typedef unsigned short  mode_t;
+ /* POSIX needed for mode_t define in sys/types.h */
+ #endif
  
  /*
   * These functions actually implement the local connection mechanisms.
***************
*** 193,199 ****
  
  /* PTS */
  
! #if defined(SYSV) && !defined(SCO)
  #define SIGNAL_T int
  #else
  #define SIGNAL_T void
--- 200,206 ----
  
  /* PTS */
  
! #if defined(SYSV) && !defined(SCO) && !defined(ISC)
  #define SIGNAL_T int
  #else
  #define SIGNAL_T void
***************
*** 230,240 ****
   * backwards binary compatability only.
   */
  
! #define X_ISC_DIR	"/dev/X"
  #define ISCDEVNODENAME	"/dev/X/ISCCONN/X%s"
  #define ISCTMPNODENAME	"/tmp/.X11-unix/X%s"
! #define SCORNODENAME	"/dev/X/%1sR"
! #define SCOSNODENAME	"/dev/X/%1sS"
  #endif
  #if defined(XIM_t)
  #define PTSNODENAME	"/dev/X/XIM."
--- 237,247 ----
   * backwards binary compatability only.
   */
  
! #define X_ISC_DIR	"/dev/X/ISCCONN"
  #define ISCDEVNODENAME	"/dev/X/ISCCONN/X%s"
  #define ISCTMPNODENAME	"/tmp/.X11-unix/X%s"
! #define SCORNODENAME	"/dev/X%1sR"
! #define SCOSNODENAME	"/dev/X%1sS"
  #endif
  #if defined(XIM_t)
  #define PTSNODENAME	"/dev/X/XIM."
***************
*** 433,442 ****
--- 440,459 ----
      chmod(X_STREAMS_DIR, 0777);
  
      if( (fd=open(server_path, O_RDWR)) >= 0 ) {
+ #if 0
+ 	/*
+ 	 * This doesn't prevent the server from starting up, and doesn't
+ 	 * prevent clients from trying to connect to the in-use PTS (which
+ 	 * is often in use by something other than another server).
+ 	 */
  	PRMSG(1, "A server is already running on port %s\n", port, 0,0 );
  	PRMSG(1, "Remove %s if this is incorrect.\n", server_path, 0,0 );
  	close(fd);
  	return(-1);
+ #else
+ 	/* Just remove the old path (which is what happens with UNIXCONN) */
+ 	;
+ #endif
      }
  
      unlink(server_path);
***************
*** 510,516 ****
  
      if( (in=read(ciptr->fd,&length,1)) <= 0 ){
  	if( !in ) {
! 		PRMSG(1,
  		"TRANS(PTSAccept)() Incoming connection closed\n",0,0,0);
  		}
  	else {
--- 527,533 ----
  
      if( (in=read(ciptr->fd,&length,1)) <= 0 ){
  	if( !in ) {
! 		PRMSG(2,
  		"TRANS(PTSAccept)() Incoming connection closed\n",0,0,0);
  		}
  	else {
***************
*** 524,530 ****
  
      if( (in=read(ciptr->fd,buf,length)) <= 0 ){
  	if( !in ) {
! 		PRMSG(1,
  		"TRANS(PTSAccept)() Incoming connection closed\n",0,0,0);
  		}
  	else {
--- 541,547 ----
  
      if( (in=read(ciptr->fd,buf,length)) <= 0 ){
  	if( !in ) {
! 		PRMSG(2,
  		"TRANS(PTSAccept)() Incoming connection closed\n",0,0,0);
  		}
  	else {
***************
*** 2239,2245 ****
  {
      PRMSG(2,"TRANS(LocalBytesReadable)(%x->%d,%x)\n", ciptr, ciptr->fd, pend);
      
! #ifdef SCO
      return ioctl(ciptr->fd, I_NREAD, (char *)pend);
  #else
      return ioctl(ciptr->fd, FIONREAD, (char *)pend);
--- 2256,2262 ----
  {
      PRMSG(2,"TRANS(LocalBytesReadable)(%x->%d,%x)\n", ciptr, ciptr->fd, pend);
      
! #if defined(SCO) || defined(ISC)
      return ioctl(ciptr->fd, I_NREAD, (char *)pend);
  #else
      return ioctl(ciptr->fd, FIONREAD, (char *)pend);
diff -c /dev/null xc/lib/xtrans/Xtransmnx.c:3.1
*** /dev/null	Mon Jan 30 17:48:38 1995
--- xc/lib/xtrans/Xtransmnx.c	Mon Jan 30 17:48:38 1995
***************
*** 0 ****
--- 1,1639 ----
+ /* $XFree86: xc/lib/xtrans/Xtransmnx.c,v 3.1 1994/06/28 12:24:22 dawes Exp $ */
+ 
+ /*
+ Xtransmnx.c
+ 
+ Created:	11 April 1994 by Philip Homburg <philip@cs.vu.nl>
+ */
+ 
+ 
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <sys/nbio.h>
+ #include <net/hton.h>
+ #include <net/netlib.h>
+ #include <net/gen/in.h>
+ #include <net/gen/netdb.h>
+ #include <net/gen/tcp.h>
+ #include <net/gen/tcp_io.h>
+ 
+ struct private
+ {
+ 	int nonblocking;
+ 
+ 	int read_inprogress;
+ 	char *read_buffer;
+ 	size_t read_bufsize;
+ 	size_t read_size;
+ 	size_t read_offset;
+ 
+ 	int write_inprogress;
+ 	char *write_buffer;
+ 	size_t write_bufsize;
+ 	size_t write_size;
+ 	size_t write_offset;
+ 	int write_errno;
+ 
+ 	int listen_completed;
+ 	u16_t listen_port;
+ 	XtransConnInfo listen_list;
+ };
+ #define RD_BUFSIZE	1024
+ #define WR_BUFSIZE	1024
+ 
+ static XtransConnInfo listen_list= NULL;
+ 
+ static XtransConnInfo alloc_ConnInfo(Xtransport *thistrans);
+ static void free_ConnInfo(XtransConnInfo ciptr);
+ static struct private *alloc_private(size_t rd_size, size_t wr_size);
+ static void free_private(struct private *priv);
+ static void read_cb(nbio_ref_t ref, int res, int err);
+ static void write_cb(nbio_ref_t ref, int res, int err);
+ static void listen_cb(nbio_ref_t ref, int res, int err);
+ static int restart_listen(XtransConnInfo ciptr);
+ 
+ #ifdef TRANS_CLIENT
+ static XtransConnInfo
+ TRANS(MnxTcpOpenCOTSClient) (thistrans, protocol, host, port)
+ 
+ Xtransport *thistrans;
+ char 	   *protocol;
+ char 	   *host;
+ char       *port;
+ 
+ {
+ 	XtransConnInfo	ciptr;
+ 	char *tcp_device;
+ 	int s_errno;
+ 	int fd;
+ 	nbio_ref_t ref;
+ 
+ 
+ 	PRMSG(2, "TRANS(MnxTcpOpenCOTSClient)(%s,%s,%s)\n",
+ 		protocol, host, port);
+ 
+ 	if ((ciptr= alloc_ConnInfo(thistrans)) == NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSClient): alloc_ConnInfo failed\n",
+ 			0, 0, 0);
+ 		return NULL;
+ 	}
+ 	if ((ciptr->priv= (char *)alloc_private(RD_BUFSIZE, WR_BUFSIZE)) ==
+ 		NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSClient): alloc_private() failed\n",
+ 			0, 0, 0);
+ 		s_errno= errno;
+ 		free_ConnInfo(ciptr);
+ 		errno= s_errno;
+ 		return NULL;
+ 	}
+ 
+ 	if ((tcp_device= getenv("TCP_DEVICE")) == NULL)
+ 		tcp_device= TCP_DEVICE;
+ 	PRMSG(4, "TRANS(MnxTcpOpenCOTSClient): tcp_device= '%s'\n",
+ 		tcp_device, 0, 0);
+ 
+ 	if ((fd= open(tcp_device, O_RDWR)) == -1)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSClient): open '%s' failed: %s\n",
+ 			tcp_device, strerror(errno), 0);
+ 		s_errno= errno;
+ 		free_ConnInfo(ciptr);
+ 		errno= s_errno;
+ 		return NULL;
+ 	}
+ 	ciptr->fd= fd;
+ 	ref.ref_ptr= ciptr;
+ 	nbio_register(fd);
+ 	nbio_setcallback(fd, ASIO_READ, read_cb, ref);
+ 	nbio_setcallback(fd, ASIO_WRITE, write_cb, ref);
+ 	return ciptr;
+ }
+ #endif /* TRANS_CLIENT */
+ 
+ #ifdef TRANS_SERVER
+ static XtransConnInfo
+ TRANS(MnxTcpOpenCOTSServer) (thistrans, protocol, host, port)
+ 
+ Xtransport *thistrans;
+ char 	   *protocol;
+ char 	   *host;
+ char 	   *port;
+ 
+ {
+ 	XtransConnInfo	ciptr;
+ 	char *tcp_device;
+ 	int s_errno;
+ 	int fd;
+ 	nbio_ref_t ref;
+ 
+ 
+ 	PRMSG(2, "TRANS(MnxTcpOpenCOTSServer)(%s,%s,%s)\n",
+ 		protocol, host, port);
+ 
+ 	if ((ciptr= alloc_ConnInfo(thistrans)) == NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSServer): alloc_ConnInfo failed\n",
+ 			0, 0, 0);
+ 		return NULL;
+ 	}
+ 	if ((ciptr->priv= (char *)alloc_private(RD_BUFSIZE, WR_BUFSIZE)) ==
+ 		NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSServer): alloc_private() failed\n",
+ 			0, 0, 0);
+ 		s_errno= errno;
+ 		free_ConnInfo(ciptr);
+ 		errno= s_errno;
+ 		return NULL;
+ 	}
+ 
+ 	if ((tcp_device= getenv("TCP_DEVICE")) == NULL)
+ 		tcp_device= TCP_DEVICE;
+ 	PRMSG(4, "TRANS(MnxTcpOpenCOTSServer): tcp_device= '%s'\n",
+ 		tcp_device, 0, 0);
+ 
+ 	if ((fd= open(tcp_device, O_RDWR)) == -1)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpOpenCOTSServer): open '%s' failed: %s\n",
+ 			tcp_device, strerror(errno), 0);
+ 		s_errno= errno;
+ 		free_ConnInfo(ciptr);
+ 		errno= s_errno;
+ 		return NULL;
+ 	}
+ 	PRMSG(5, "TRANS(MnxTcpOpenCOTSServer): fd= '%d'\n", fd, 0, 0);
+ 	ciptr->fd= fd;
+ 	ref.ref_ptr= ciptr;
+ 	nbio_register(fd);
+ 	nbio_setcallback(fd, ASIO_IOCTL, listen_cb, ref);
+ 	return ciptr;
+ }
+ #endif /* TRANS_SERVER */
+ 
+ #ifdef TRANS_CLIENT
+ static XtransConnInfo
+ TRANS(MnxTcpOpenCLTSClient) (thistrans, protocol, host, port)
+ 
+ Xtransport *thistrans;
+ char 	   *protocol;
+ char 	   *host;
+ char 	   *port;
+ 
+ {
+ 	abort();
+ }
+ #endif /* TRANS_CLIENT */
+ 
+ #ifdef TRANS_SERVER
+ static XtransConnInfo
+ TRANS(MnxTcpOpenCLTSServer) (thistrans, protocol, host, port)
+ 
+ Xtransport *thistrans;
+ char 	   *protocol;
+ char 	   *host;
+ char 	   *port;
+ 
+ {
+ 	abort();
+ }
+ #endif /* TRANS_SERVER */
+ 
+ #ifdef TRANS_REOPEN
+ 
+ static XtransConnInfo
+ TRANS(MnxTcpReopenCOTSServer) (thistrans, fd, port)
+ 
+ Xtransport *thistrans;
+ int	   fd;
+ char	   *port;
+ 
+ {
+     XtransConnInfo	ciptr;
+     int			i;
+ 
+     PRMSG (2,
+ 	"TRANS(MnxTcpReopenCOTSServer) (%d, %s)\n", fd, port, 0);
+ 
+     abort();
+ }
+ 
+ static XtransConnInfo
+ TRANS(MnxTcpReopenCLTSServer) (thistrans, fd, port)
+ 
+ Xtransport *thistrans;
+ int	   fd;
+ char	   *port;
+ 
+ {
+     XtransConnInfo	ciptr;
+     int			i;
+ 
+ 
+     PRMSG (2,
+ 	"TRANS(MnxTcpReopenCLTSServer) (%d, %s)\n", fd, port, 0);
+ 
+     abort();
+ }
+ 
+ #endif /* TRANS_REOPEN */
+ 
+ 
+ 
+ static int
+ TRANS(MnxTcpSetOption) (ciptr, option, arg)
+ 
+ XtransConnInfo 	ciptr;
+ int 		option;
+ int 		arg;
+ 
+ {
+ 	int flags;
+ 	struct private *priv;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpSetOption)(%d,%d,%d)\n",
+ 		ciptr->fd, option, arg);
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 	switch(option)
+ 	{
+ 	case TRANS_NONBLOCKING:
+ 		flags= fcntl(ciptr->fd, F_GETFD);
+ 		if (flags == -1)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpSetOption): fcntl F_GETFD failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			return -1;
+ 		}
+ 		if (arg == 0)
+ 			flags &= ~FD_ASYNCHIO;
+ 		else if (arg == 1)
+ 			flags |= FD_ASYNCHIO;
+ 		else
+ 		{
+ 			PRMSG(1,
+ 		"TRANS(MnxTcpSetOption): bad arg for TRANS_NONBLOCKING: %d\n",
+ 				arg, 0, 0);
+ 			return -1;
+ 		}
+ 		if (fcntl(ciptr->fd, F_SETFD, flags) == -1)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpSetOption): fcntl F_SETFD failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			return -1;
+ 		}
+ 		priv->nonblocking= arg;
+ 		return 0;
+ 	case TRANS_CLOSEONEXEC:
+ 		flags= fcntl(ciptr->fd, F_GETFD);
+ 		if (flags == -1)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpSetOption): fcntl F_GETFD failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			return -1;
+ 		}
+ 		if (arg == 0)
+ 			flags &= ~FD_CLOEXEC;
+ 		else if (arg == 1)
+ 			flags |= FD_CLOEXEC;
+ 		else
+ 		{
+ 			PRMSG(1,
+ 		"TRANS(MnxTcpSetOption): bad arg for TRANS_CLOSEONEXEC: %d\n",
+ 				arg, 0, 0);
+ 			return -1;
+ 		}
+ 		if (fcntl(ciptr->fd, F_SETFD, flags) == -1)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpSetOption): fcntl F_SETFD failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			return -1;
+ 		}
+ 		return 0;
+ 	default:
+ 		PRMSG(1, "TRANS(MnxTcpSetOption): unknown option '%d'\n",
+ 			option, 0, 0);
+ 		errno= EINVAL;
+ 		return -1;
+ 	}
+ }
+ 
+ 
+ #ifdef TRANS_SERVER
+ static int
+ TRANS(MnxTcpCreateListener) (ciptr, port)
+ 
+ XtransConnInfo	ciptr;
+ char		*port;
+ 
+ {
+ 	struct servent *servp;
+ 	tcpport_t num_port;
+ 	char *check;
+ 	nwio_tcpconf_t tcpconf;
+ 	nwio_tcpcl_t tcpcl;
+ 	int r, s_errno, flags;
+ 	struct private *priv;
+ 	struct sockaddr_in *addr;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpCreateListener)(%d,%s)\n", ciptr->fd, port, 0);
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 
+ 	if (port == NULL)
+ 		num_port= 0;
+ 	else
+ 	{
+ 		num_port= strtol(port, &check, 10);
+ 		num_port= htons(num_port);
+ 		if (check[0] == '\0')
+ 			port= NULL;
+ 	}
+ 
+ #ifdef X11_t
+ 	/*
+ 	 * X has a well known port, that is transport dependent. It is easier
+ 	 * to handle it here, than try and come up with a transport independent
+ 	 * representation that can be passed in and resolved the usual way.
+ 	 *
+ 	 * The port that is passed here is really a string containing the
+ 	 * idisplay from ConnectDisplay().
+ 	 */
+ 	if (port == NULL)
+ 		num_port= htons(ntohs(num_port) + X_TCP_PORT);
+ #endif
+ 	if (port != NULL)
+ 	{
+ 		if ((servp = getservbyname (port, "tcp")) == NULL)
+ 		{
+ 			PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): can't get service for %s\n",
+ 				port, 0, 0);
+ 			errno= EINVAL;
+ 			return TRANS_CREATE_LISTENER_FAILED;
+ 		}
+ 		num_port= servp->s_port;
+ 	}
+ 
+ 	tcpconf.nwtc_flags= NWTC_SHARED | NWTC_UNSET_RA | NWTC_UNSET_RP;
+ 	if (num_port != 0)
+ 	{
+ 		tcpconf.nwtc_locport= num_port;
+ 		tcpconf.nwtc_flags |= NWTC_LP_SET;
+ 	}
+ 	else
+ 		tcpconf.nwtc_flags |= NWTC_LP_SEL;
+ 
+ 	if (ioctl(ciptr->fd, NWIOSTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): NWIOSTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 
+ 	if (ioctl(ciptr->fd, NWIOGTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpListen): NWIOGTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 
+ 	priv->listen_port= tcpconf.nwtc_locport;
+ 
+ 	if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpAccept): malloc failed\n", 0, 0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 	addr->sin_family= AF_INET;
+ 	addr->sin_addr.s_addr= tcpconf.nwtc_locaddr;
+ 	addr->sin_port= tcpconf.nwtc_locport;
+ 	if (ciptr->addr)
+ 		free(ciptr->addr);
+ 	ciptr->addr= (char *)addr;
+ 	ciptr->addrlen= sizeof(struct sockaddr_in);
+ 
+ 	flags= fcntl(ciptr->fd, F_GETFD);
+ 	if (flags == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_GETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 	if (fcntl(ciptr->fd, F_SETFD, flags | FD_ASYNCHIO) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_SETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 
+ 	tcpcl.nwtcl_flags= 0;
+ 	r= ioctl(ciptr->fd, NWIOTCPLISTEN, &tcpcl);
+ 	s_errno= errno;
+ 
+ 	if (fcntl(ciptr->fd, F_SETFD, flags) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_SETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return TRANS_CREATE_LISTENER_FAILED;
+ 	}
+ 
+ 	if (r == -1 && s_errno == EINPROGRESS)
+ 	{
+ 		nbio_inprogress(ciptr->fd, ASIO_IOCTL, 1 /* read */,
+ 			1 /* write */, 0 /* exception */);
+ 		return 0;
+ 	}
+ 	if (r == 0)
+ 	{
+ 		priv->listen_completed= 1;
+ 		return 0;
+ 	}
+ 
+ 	errno= s_errno;
+ 	PRMSG(1, "TRANS(MnxTcpCreateListener): NWIOTCPLISTEN failed: %s\n",
+ 		strerror(errno), 0, 0);
+ 	return TRANS_CREATE_LISTENER_FAILED;
+ }
+ #endif /* TRANS_SERVER */
+ 
+ 
+ #ifdef TRANS_SERVER
+ static int
+ TRANS(MnxTcpResetListener) (ciptr)
+ 
+ XtransConnInfo	ciptr;
+ {
+ 	PRMSG(2, "TRANS(MnxTcpResetListener)(%d)\n", ciptr->fd, 0, 0);
+ 	return TRANS_RESET_NOOP;
+ }
+ #endif /* TRANS_SERVER */
+ 
+ #ifdef TRANS_SERVER
+ static XtransConnInfo
+ TRANS(MnxTcpAccept) (ciptr_listen, status)
+ 
+ XtransConnInfo ciptr_listen;
+ int	       *status;
+ 
+ {
+ 	XtransConnInfo	ciptr;
+ 	int s_errno;
+ 	int fd;
+ 	nbio_ref_t ref;
+ 	struct private *priv;
+ 	nwio_tcpconf_t tcpconf;
+ 	struct sockaddr_in *addr;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpAccept)(%d,%p)\n", ciptr_listen->fd, status, 0);
+ 
+ 	priv= (struct private *)ciptr_listen->priv;
+ 	*status= TRANS_ACCEPT_MISC_ERROR;
+ 
+ 	if (!priv->listen_completed)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpAccept): listen is not completed\n",
+ 			0, 0, 0);
+ 		*status= TRANS_ACCEPT_FAILED;
+ 		return NULL;
+ 	}
+ 	priv->listen_completed= 0;
+ 
+ 	if ((ciptr= alloc_ConnInfo(ciptr_listen->transptr)) == NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpAccept): alloc_ConnInfo failed\n",
+ 			0, 0, 0);
+ 		*status= TRANS_ACCEPT_BAD_MALLOC;
+ 		return NULL;
+ 	}
+ 	if ((ciptr->priv= (char *)alloc_private(RD_BUFSIZE, WR_BUFSIZE)) ==
+ 		NULL)
+ 	{
+ 		PRMSG(1,
+ 			"TRANS(MnxTcpAccept): alloc_private() failed\n",
+ 			0, 0, 0);
+ 		s_errno= errno;
+ 		free_ConnInfo(ciptr);
+ 		errno= s_errno;
+ 		*status= TRANS_ACCEPT_BAD_MALLOC;
+ 		return NULL;
+ 	}
+ 
+ 	fd= dup(ciptr_listen->fd);
+ 	if (fd == -1)
+ 	{
+ 		s_errno= errno;
+ 		PRMSG(1, "TRANS(MnxTcpAccept): dup failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		free_ConnInfo(ciptr);
+ 		*status= TRANS_ACCEPT_FAILED;
+ 		return NULL;
+ 	}
+ 	if (restart_listen(ciptr_listen) == -1)
+ 	{
+ 		priv->listen_list= listen_list;
+ 		listen_list= ciptr_listen;
+ 		PRMSG(1, "TRANS(MnxTcpAccept): unable to restart listen\n",
+ 			0, 0, 0);
+ 	}
+ 	ciptr->fd= fd;
+ 	ref.ref_ptr= ciptr;
+ 	nbio_register(fd);
+ 	nbio_setcallback(fd, ASIO_WRITE, write_cb, ref);
+ 	nbio_setcallback(fd, ASIO_READ, read_cb, ref);
+ 
+ 	if (ioctl(ciptr->fd, NWIOGTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpAccept): NWIOGTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		close(fd);
+ 		free_ConnInfo(ciptr);
+ 		*status= TRANS_ACCEPT_MISC_ERROR;
+ 		return NULL;
+ 	}
+ 	if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpAccept): malloc failed\n", 0, 0, 0);
+ 		close(fd);
+ 		free_ConnInfo(ciptr);
+ 		*status= TRANS_ACCEPT_BAD_MALLOC;
+ 		return NULL;
+ 	}
+ 	addr->sin_family= AF_INET;
+ 	addr->sin_addr.s_addr= tcpconf.nwtc_locaddr;
+ 	addr->sin_port= tcpconf.nwtc_locport;
+ 	if (ciptr->addr)
+ 		free(ciptr->addr);
+ 	ciptr->addr= (char *)addr;
+ 	ciptr->addrlen= sizeof(struct sockaddr_in);
+ 	if (*(u8_t *)&tcpconf.nwtc_remaddr == 127)
+ 	{
+ 		/* Make ConvertAddress return FamilyLocal */
+ 		addr->sin_addr.s_addr= tcpconf.nwtc_remaddr;
+ 	}
+ 
+ 	if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): malloc failed\n", 0, 0, 0);
+ 		close(fd);
+ 		free_ConnInfo(ciptr);
+ 		*status= TRANS_ACCEPT_BAD_MALLOC;
+ 		return NULL;
+ 	}
+ 	addr->sin_family= AF_INET;
+ 	addr->sin_addr.s_addr= tcpconf.nwtc_remaddr;
+ 	addr->sin_port= tcpconf.nwtc_remport;
+ 	ciptr->peeraddr= (char *)addr;
+ 	ciptr->peeraddrlen= sizeof(struct sockaddr_in);
+ 	*status= 0;
+ 	return ciptr;
+ }
+ #endif /* TRANS_SERVER */
+ 
+ TRANS(MnxTcpConnect) (ciptr, host, port)
+ 
+ XtransConnInfo 	ciptr;
+ char 		*host;
+ char 		*port;
+ 
+ {
+ 	struct hostent *hostp;
+ 	struct servent *servp;
+ 	char hostnamebuf[256];		/* tmp space */
+ 	tcpport_t num_port;
+ 	ipaddr_t num_addr;
+ 	char *check;
+ 	nwio_tcpconf_t tcpconf;
+ 	nwio_tcpcl_t tcpcl;
+ 	struct sockaddr_in *addr;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpConnect)(%d,%s,%s)\n", ciptr->fd, host, port);
+ 
+ 	if (!host)
+ 	{
+ 		hostnamebuf[0] = '\0';
+ 		(void) TRANS(GetHostname) (hostnamebuf, sizeof hostnamebuf);
+ 		host = hostnamebuf;
+ 	}
+ 
+ 
+ 	num_port= strtol(port, &check, 10);
+ 	num_port= htons(num_port);
+ 	if (check[0] == '\0')
+ 		port= NULL;
+ #ifdef X11_t
+ 	/*
+ 	 * X has a well known port, that is transport dependent. It is easier
+ 	 * to handle it here, than try and come up with a transport independent
+ 	 * representation that can be passed in and resolved the usual way.
+ 	 *
+ 	 * The port that is passed here is really a string containing the
+ 	 * idisplay from ConnectDisplay().
+ 	 */
+ 	if (port == NULL)
+ 		num_port= htons(ntohs(num_port) + X_TCP_PORT);
+ #endif
+ 
+ 	num_addr= inet_addr(host);
+ 	if (num_addr != -1)
+ 		host= NULL;
+ 
+ 	if (host != NULL)
+ 	{
+ 		if ((hostp = gethostbyname(host)) == NULL)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpConnect): can't get address for %s\n",
+ 				host, 0, 0);
+ 			errno= EINVAL;
+ 			return TRANS_CONNECT_FAILED;
+ 		}
+ 		if (hostp->h_addrtype != AF_INET)  /* is IP host? */
+ 		{
+ 		    PRMSG(1, "TRANS(MnxTcpConnect): %s in not an INET host\n",
+ 			  host, 0, 0);
+ 		    errno= EINVAL;
+ 		    return TRANS_CONNECT_FAILED;
+ 		}
+ 		num_addr= *(ipaddr_t *)hostp->h_addr;
+ 	}
+ 
+ 	if (port != NULL)
+ 	{
+ 		if ((servp = getservbyname (port, "tcp")) == NULL)
+ 		{
+ 			PRMSG(1,
+ 			"TRANS(MnxTcpConnect): can't get service for %s\n",
+ 				port, 0, 0);
+ 			errno= EINVAL;
+ 			return TRANS_CONNECT_FAILED;
+ 		}
+ 		num_port= servp->s_port;
+ 	}
+ 
+ 	tcpconf.nwtc_flags= NWTC_EXCL | NWTC_LP_SEL | NWTC_SET_RA |
+ 		NWTC_SET_RP;
+ 	tcpconf.nwtc_remaddr= num_addr;
+ 	tcpconf.nwtc_remport= num_port;
+ 	if (ioctl(ciptr->fd, NWIOSTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): NWIOSTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		return TRANS_CONNECT_FAILED;
+ 	}
+ 
+ 	tcpcl.nwtcl_flags= 0;
+ 	if (ioctl(ciptr->fd, NWIOTCPCONN, &tcpcl) == -1)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): connect failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		if (errno == ECONNREFUSED || errno == EINTR)
+ 			return TRANS_TRY_CONNECT_AGAIN;
+ 		else
+ 			return TRANS_CONNECT_FAILED;
+ 	}
+ 
+ 	if (ioctl(ciptr->fd, NWIOGTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): NWIOGTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		return TRANS_CONNECT_FAILED;
+ 	}
+ 	if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): malloc failed\n", 0, 0, 0);
+ 		return TRANS_CONNECT_FAILED;
+ 	}
+ 	addr->sin_family= AF_INET;
+ 	addr->sin_addr.s_addr= tcpconf.nwtc_locaddr;
+ 	addr->sin_port= tcpconf.nwtc_locport;
+ 	ciptr->addr= (char *)addr;
+ 	ciptr->addrlen= sizeof(struct sockaddr_in);
+ 	if (*(u8_t *)&tcpconf.nwtc_remaddr == 127)
+ 	{
+ 		/* Make ConvertAddress return FamilyLocal */
+ 		addr->sin_addr.s_addr= tcpconf.nwtc_remaddr;
+ 	}
+ 
+ 	if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpConnect): malloc failed\n", 0, 0, 0);
+ 		return TRANS_CONNECT_FAILED;
+ 	}
+ 	addr->sin_family= AF_INET;
+ 	addr->sin_addr.s_addr= tcpconf.nwtc_remaddr;
+ 	addr->sin_port= tcpconf.nwtc_remport;
+ 	ciptr->peeraddr= (char *)addr;
+ 	ciptr->peeraddrlen= sizeof(struct sockaddr_in);
+ 
+ 	return 0;
+ }
+ 
+ static int
+ TRANS(MnxTcpBytesReadable) (ciptr, pend)
+ 
+ XtransConnInfo ciptr;
+ BytesReadable_t *pend;
+ 
+ {
+ 	struct private *priv;
+ 	int r;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpBytesReadable)(%x,%d,%x)\n",
+ 		ciptr, ciptr->fd, pend);
+ 
+ 	*pend= 0;
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 	if (priv->read_inprogress)
+ 	{
+ 		PRMSG(5, "TRANS(MnxTcpBytesReadable): read inprogress, %d\n",
+ 			*pend, 0, 0);
+ 		return *pend;
+ 	}
+ 	if (priv->read_offset < priv->read_size)
+ 	{
+ 		*pend= priv->read_size-priv->read_offset;
+ 		PRMSG(5, "TRANS(MnxTcpBytesReadable): %d\n",
+ 			*pend, 0, 0);
+ 		return *pend;
+ 	}
+ 	priv->read_offset= 0;
+ 	r= read(ciptr->fd, priv->read_buffer, priv->read_bufsize);
+ 	if (r >= 0)
+ 	{
+ 		if (r == 0)
+ 			r= 1;	/* Signal EOF condition */
+ 
+ 		priv->read_size= r;
+ 		PRMSG(5, "TRANS(MnxTcpBytesReadable): %d\n",
+ 			*pend, 0, 0);
+ 		*pend= r;
+ 	}
+ 	else if (r == -1 && errno == EINPROGRESS)
+ 	{
+ 		priv->read_inprogress= 1;
+ 		nbio_inprogress(ciptr->fd, ASIO_READ, 1 /* read */,
+ 			0 /* write */, 0 /* exception */);
+ 	}
+ 	else
+ 	{
+ 		PRMSG(1, "TRANS(MnxTcpBytesReadable): read failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return -1;
+ 	}
+ 	PRMSG(5, "TRANS(MnxTcpBytesReadable): %d\n", *pend, 0, 0);
+ 	return *pend;
+ }
+ 
+ 
+ static int
+ TRANS(MnxTcpRead) (ciptr, buf, size)
+ 
+ XtransConnInfo	ciptr;
+ char		*buf;
+ int		size;
+ 
+ {
+ 	int len, r, ret, s_errno;
+ 	int offset;
+ 	struct private *priv;
+ 	asio_fd_set_t fd_set;
+ 	fwait_t fw;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpRead)(%d,%x,%d)\n", ciptr->fd, buf, size);
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 	offset= 0;
+ 
+ 	if (priv->read_inprogress)
+ 	{
+ 		PRMSG(5, "TRANS(MnxTcpRead): EAGAIN\n", 0, 0, 0);
+ 		errno= EAGAIN;
+ 		return -1;
+ 	}
+ 
+ 	/* Copy any data left in the buffer */
+ 	if (priv->read_offset < priv->read_size)
+ 	{
+ 		len= priv->read_size-priv->read_offset;
+ 		if (len > size-offset)
+ 			len= size-offset;
+ 		PRMSG(5, "TRANS(MnxTcpRead): copying %d bytes\n", len, 0, 0);
+ 
+ 		memcpy(buf+offset, priv->read_buffer + priv->read_offset,
+ 			len);
+ 		offset += len;
+ 		priv->read_offset += len;
+ 		if (priv->read_offset < priv->read_size)
+ 			return offset;
+ 	}
+ 
+ 	/* Try to read directly into the user's buffer. */
+ 	ret= 0;
+ 	s_errno= 0;
+ 	while(offset < size)
+ 	{
+ 		r= read(ciptr->fd, buf+offset, size-offset);
+ 		if (r == -1 && errno == EINPROGRESS)
+ 		{
+ 			r= fcancel(ciptr->fd, ASIO_READ);
+ 			if (r == -1)
+ 				abort();
+ 			ASIO_FD_ZERO(&fd_set);
+ 			ASIO_FD_SET(ciptr->fd, ASIO_READ, &fd_set);
+ 			fw.fw_flags= FWF_NONBLOCK;
+ 			fw.fw_bits= fd_set.afds_bits;
+ 			fw.fw_maxfd= ASIO_FD_SETSIZE;
+ 			r= fwait(&fw);
+ 			if (r == -1 || fw.fw_fd != ciptr->fd ||
+ 				fw.fw_operation != ASIO_READ)
+ 			{
+ 				abort();
+ 			}
+ 			r= fw.fw_result;
+ 			errno= fw.fw_errno;
+ 		}
+ 
+ 		if (r > 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpRead): read %d bytes\n", r,
+ 				0, 0);
+ 			offset += r;
+ 			continue;
+ 		}
+ 		else if (r == 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpRead): read EOF\n", 0, 0, 0);
+ 			break;
+ 		}
+ 		else
+ 		{
+ 			if (errno == EINTR)
+ 			{
+ 				PRMSG(5, "TRANS(MnxTcpRead): EINTR\n",
+ 					0, 0, 0);
+ 				errno= EAGAIN;
+ 			}
+ 			else
+ 			{
+ 				PRMSG(1, "TRANS(MnxTcpRead): read error %s\n",
+ 					strerror(errno), 0, 0);
+ 			}
+ 			s_errno= errno;
+ 			ret= -1;
+ 			break;
+ 		}
+ 	}
+ 	if (offset != 0)
+ 		ret= offset;
+ 
+ 	if (priv->read_offset != priv->read_size)
+ 		abort();
+ 	priv->read_offset= 0;
+ 	priv->read_size= 0;
+ 	if (priv->nonblocking)
+ 	{
+ 		r= read(ciptr->fd, priv->read_buffer, priv->read_bufsize);
+ 		if (r >= 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpRead): buffered %d bytes\n",
+ 				r, 0, 0);
+ 			priv->read_size= r;
+ 		}
+ 		else if (r == -1 && errno == EINPROGRESS)
+ 		{
+ 			priv->read_inprogress= 1;
+ 			nbio_inprogress(ciptr->fd, ASIO_READ, 1 /* read */,
+ 				0 /* write */, 0 /* exception */);
+ 		}
+ 		else
+ 		{
+ 			PRMSG(1, "TRANS(MnxTcpRead): read failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 		}
+ 	}
+ 	errno= s_errno;
+ 	return ret;
+ }
+ 
+ 
+ static int
+ TRANS(MnxTcpWrite) (ciptr, buf, size)
+ 
+ XtransConnInfo ciptr;
+ char 	       *buf;
+ int 	       size;
+ 
+ {
+ 	int len, r, ret, s_errno;
+ 	int offset;
+ 	struct private *priv;
+ 	asio_fd_set_t fd_set;
+ 	fwait_t fw;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpWrite)(%d,%x,%d)\n", ciptr->fd, buf, size);
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 	offset= 0;
+ 
+ 	if (priv->write_errno)
+ 	{
+ 		PRMSG(5, "TRANS(MnxTcpWrite): write_errno %d\n",
+ 			priv->write_errno, 0, 0);
+ 		errno= priv->write_errno;
+ 		return -1;
+ 	}
+ 
+ 	if (priv->write_inprogress)
+ 	{
+ 		PRMSG(5, "TRANS(MnxTcpWrite): EAGAIN\n", 0, 0, 0);
+ 		errno= EAGAIN;
+ 		return -1;
+ 	}
+ 
+ 	/* Try to write directly out of the user's buffer. */
+ 	ret= 0;
+ 	s_errno= 0;
+ 	while(offset < size)
+ 	{
+ 		r= write(ciptr->fd, buf+offset, size-offset);
+ 		if (r == -1 && errno == EINPROGRESS)
+ 		{
+ 			r= fcancel(ciptr->fd, ASIO_WRITE);
+ 			if (r == -1)
+ 				abort();
+ 			ASIO_FD_ZERO(&fd_set);
+ 			ASIO_FD_SET(ciptr->fd, ASIO_WRITE, &fd_set);
+ 			fw.fw_flags= FWF_NONBLOCK;
+ 			fw.fw_bits= fd_set.afds_bits;
+ 			fw.fw_maxfd= ASIO_FD_SETSIZE;
+ 			r= fwait(&fw);
+ 			if (r == -1 || fw.fw_fd != ciptr->fd ||
+ 				fw.fw_operation != ASIO_WRITE)
+ 			{
+ 				abort();
+ 			}
+ 			r= fw.fw_result;
+ 			errno= fw.fw_errno;
+ 		}
+ 		if (r > 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpWrite): wrote %d bytes\n", r,
+ 				0, 0);
+ 			offset += r;
+ 			continue;
+ 		}
+ 		else if (r == 0)
+ 			abort();
+ 		else
+ 		{
+ 			if (errno == EINTR)
+ 			{
+ 				PRMSG(5, "TRANS(MnxTcpWrite): EINTR\n",
+ 					0, 0, 0);
+ 				errno= EAGAIN;
+ 			}
+ 			else
+ 			{
+ 				PRMSG(1,
+ 				"TRANS(MnxTcpWrite): write error: %s\n",
+ 					strerror(errno), 0, 0);
+ 			}
+ 			s_errno= errno;
+ 			ret= -1;
+ 			break;
+ 		}
+ 	}
+ 
+ 	/* Copy any data to the buffer */
+ 	if (offset < size)
+ 	{
+ 		len= priv->write_bufsize;
+ 		if (len > size-offset)
+ 			len= size-offset;
+ 		PRMSG(5, "TRANS(MnxTcpWrite): copying %d bytes\n", len, 0, 0);
+ 
+ 		memcpy(priv->write_buffer, buf+offset, len);
+ 		offset += len;
+ 		priv->write_offset= 0;
+ 		priv->write_size= len;
+ 	}
+ 	if (offset != 0)
+ 		ret= offset;
+ 
+ 	while (priv->write_offset < priv->write_size)
+ 	{
+ 		r= write(ciptr->fd, priv->write_buffer+priv->write_offset,
+ 			priv->write_size-priv->write_offset);
+ 		if (r > 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpWrite): wrote %d bytes\n",
+ 				r, 0, 0);
+ 			priv->write_offset += r;
+ 			continue;
+ 		}
+ 		else if (r == -1 && errno == EINPROGRESS)
+ 		{
+ 			priv->write_inprogress= 1;
+ 			nbio_inprogress(ciptr->fd, ASIO_WRITE, 0 /* read */,
+ 				1 /* write */, 0 /* exception */);
+ 		}
+ 		else
+ 		{
+ 			PRMSG(1, "TRANS(MnxTcpWrite): write failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			priv->write_errno= errno;
+ 		}
+ 		break;
+ 	}
+ 
+ 	errno= s_errno;
+ 	return ret;
+ }
+ 
+ 
+ static int
+ TRANS(MnxTcpReadv) (ciptr, buf, size)
+ 
+ XtransConnInfo	ciptr;
+ struct iovec 	*buf;
+ int 		size;
+ 
+ {
+ 	int i, offset, total, len, r;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpReadv)(%d,%x,%d)\n", ciptr->fd, buf, size);
+ 
+ 	/* Simply call read a number of times. */
+ 	total= 0;
+ 	offset= 0;
+ 	i= 0;
+ 	while(i<size)
+ 	{
+ 		PRMSG(5, "TRANS(MnxTcpReadv): [%d] size %d-%d\n",
+ 			i, buf[i].iov_len, offset);
+ 		if (offset >= buf[i].iov_len)
+ 		{
+ 			offset= 0;
+ 			i++;
+ 			continue;
+ 		}
+ 		len= buf[i].iov_len-offset;
+ 		r= TRANS(MnxTcpRead)(ciptr, buf[i].iov_base+offset, len);
+ 		if (r == -1)
+ 		{
+ 			if (errno == EAGAIN)
+ 			{
+ 				PRMSG(5,
+ 				"TRANS(MnxTcpReadv): read returned: %s\n",
+ 					strerror(errno), 0, 0);
+ 			}
+ 			else
+ 			{
+ 				PRMSG(1,
+ 				"TRANS(MnxTcpReadv): read failed: %s\n",
+ 					strerror(errno), 0, 0);
+ 			}
+ 			if (total != 0)
+ 				return total;
+ 			else
+ 				return -1;
+ 		}
+ 		if (r == 0)
+ 			break;
+ 		if (r > len)
+ 			abort();
+ 		total += r;
+ 		offset += r;
+ 	}
+ 	return total;
+ }
+ 
+ static int
+ TRANS(MnxTcpWritev) (ciptr, buf, size)
+ 
+ XtransConnInfo 	ciptr;
+ struct iovec 	*buf;
+ int 		size;
+ 
+ {
+ 	int i, offset, total, len, r;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpWritev)(%d,%x,%d)\n", ciptr->fd, buf, size);
+ 
+ 	/* Simply call write a number of times. */
+ 	total= 0;
+ 	offset= 0;
+ 	i= 0;
+ 	while(i<size)
+ 	{
+ 		if (offset >= buf[i].iov_len)
+ 		{
+ 			offset= 0;
+ 			i++;
+ 			continue;
+ 		}
+ 		len= buf[i].iov_len-offset;
+ 		r= TRANS(MnxTcpWrite)(ciptr, buf[i].iov_base+offset, len);
+ 		if (r == -1)
+ 		{
+ 			if (errno == EAGAIN)
+ 			{
+ 				PRMSG(5, "TRANS(MnxTcpWritev): AGAIN\n",
+ 					0, 0, 0);
+ 			}
+ 			else
+ 			{
+ 				PRMSG(1,
+ 				"TRANS(MnxTcpWritev): write failed: %s\n",
+ 					strerror(errno), 0, 0);
+ 			}
+ 			if (total != 0)
+ 				return total;
+ 			else
+ 				return -1;
+ 		}
+ 		if (r == 0 || r > len)
+ 			abort();
+ 		total += r;
+ 		offset += r;
+ 	}
+ 	return total;
+ }
+ 
+ 
+ static int
+ TRANS(MnxTcpDisconnect) (ciptr)
+ 
+ XtransConnInfo ciptr;
+ 
+ {
+ 	PRMSG(2, "TRANS(MnxTcpDisconnect)(%x,%d)\n", ciptr, ciptr->fd, 0);
+ 
+ 	return ioctl(ciptr->fd, NWIOTCPSHUTDOWN, NULL);
+ }
+ 
+ static int
+ TRANS(MnxTcpClose) (ciptr)
+ 
+ XtransConnInfo ciptr;
+ 
+ {
+ 	XtransConnInfo list, t_ciptr;
+ 	struct private *priv;
+ 
+ 	PRMSG(2, "TRANS(MnxTcpClose)(%x,%d)\n", ciptr, ciptr->fd, 0);
+ 
+ 
+ 	if (listen_list)
+ 	{
+ 		list= listen_list;
+ 		listen_list= NULL;
+ 		while(list)
+ 		{
+ 			t_ciptr= list;
+ 			priv= (struct private *)t_ciptr->priv;
+ 			list= priv->listen_list;
+ 			if (t_ciptr == ciptr)
+ 				continue;
+ 			if (restart_listen(t_ciptr) == -1)
+ 			{
+ 				priv->listen_list= listen_list;
+ 				listen_list= t_ciptr;
+ 			}
+ 		}
+ 	}
+ 
+ 	free_private((struct private *)ciptr->priv);
+ 	nbio_unregister(ciptr->fd);
+ 	return close (ciptr->fd);
+ }
+ 
+ 
+ static XtransConnInfo
+ alloc_ConnInfo(thistrans)
+ Xtransport *thistrans;
+ {
+ 	XtransConnInfo ciptr;
+ 
+ 	PRMSG(2, "alloc_ConnInfo(%p)\n", thistrans, 0, 0);
+ 
+ 	if ((ciptr= (XtransConnInfo) malloc(sizeof(struct _XtransConnInfo)))
+ 		== NULL)
+ 	{
+ 		PRMSG(1, "alloc_ConnInfo: malloc failed\n", 0, 0, 0);
+ 		return NULL;
+ 	}
+ 	ciptr->transptr= thistrans;
+ 	ciptr->priv= NULL;
+ 	ciptr->flags= 0;
+ 	ciptr->fd= -1;
+ 	ciptr->port= NULL;
+ 	ciptr->family= AF_INET;
+ 	ciptr->addr= NULL;
+ 	ciptr->addrlen= 0;
+ 	ciptr->peeraddr= NULL;
+ 	ciptr->peeraddrlen= 0;
+ 	return ciptr;
+ }
+ 
+ static void
+ free_ConnInfo(ciptr)
+ XtransConnInfo ciptr;
+ {
+ 	if (ciptr == NULL)
+ 		return;
+ 	free_private((struct private *)ciptr->priv);
+ 	free(ciptr);
+ }
+ 
+ static struct private *
+ alloc_private(rd_size, wr_size)
+ size_t rd_size;
+ size_t wr_size;
+ {
+ 	struct private *priv;
+ 	int s_errno;
+ 	char *buf;
+ 
+ 	PRMSG(2, "alloc_private(%d, %d)\n", rd_size, wr_size, 0);
+ 
+ 	if ((priv= (struct private *)malloc(sizeof(struct private))) == NULL)
+ 	{
+ 		PRMSG(1, "alloc_private: malloc failed\n", 0, 0, 0);
+ 		return NULL;
+ 	}
+ 	priv->nonblocking= 0;
+ 	priv->read_inprogress= 0;
+ 	priv->read_buffer= NULL;
+ 	priv->read_bufsize= rd_size;
+ 	priv->read_size= 0;
+ 	priv->read_offset= 0;
+ 
+ 	if (rd_size != 0)
+ 	{
+ 		if ((buf= malloc(rd_size)) == NULL)
+ 		{
+ 			PRMSG(1, "alloc_private: malloc failed\n", 0, 0, 0);
+ 			s_errno= errno;
+ 			free_private(priv);
+ 			errno= s_errno;
+ 			return NULL;
+ 		}
+ 		priv->read_buffer= buf;
+ 	}
+ 
+ 	priv->write_inprogress= 0;
+ 	priv->write_buffer= NULL;
+ 	priv->write_bufsize= rd_size;
+ 	priv->write_size= 0;
+ 	priv->write_offset= 0;
+ 	priv->write_errno= 0;
+ 
+ 	if (wr_size != 0)
+ 	{
+ 		if ((buf= malloc(wr_size)) == NULL)
+ 		{
+ 			PRMSG(1, "alloc_private: malloc failed\n", 0, 0, 0);
+ 			s_errno= errno;
+ 			free_private(priv);
+ 			errno= s_errno;
+ 			return NULL;
+ 		}
+ 		priv->write_buffer= buf;
+ 	}
+ 
+ 	priv->listen_completed= 0;
+ 	priv->listen_port= 0;
+ 	priv->listen_list= NULL;
+ 
+ 	return priv;
+ }
+ 
+ static void
+ free_private(priv)
+ struct private *priv;
+ {
+ 	if (priv == NULL)
+ 		return;
+ 	free(priv->read_buffer);
+ 	free(priv->write_buffer);
+ 	free(priv);
+ }
+ 
+ static void
+ read_cb(ref, res, err)
+ nbio_ref_t ref;
+ int res;
+ int err;
+ {
+ 	XtransConnInfo ciptr;
+ 	struct private *priv;
+ 
+ 	PRMSG(2, "read_cb(%x,%d,%d)\n", ref.ref_ptr, res, err);
+ 
+ 	ciptr= ref.ref_ptr;
+ 	priv= (struct private *)ciptr->priv;
+ 	if (res > 0)
+ 		priv->read_size= res;
+ 	priv->read_inprogress= 0;
+ }
+ 
+ static void
+ write_cb(ref, res, err)
+ nbio_ref_t ref;
+ int res;
+ int err;
+ {
+ 	XtransConnInfo ciptr;
+ 	struct private *priv;
+ 	int r;
+ 
+ 	PRMSG(2, "write_cb(%x,%d,%d)\n", ref.ref_ptr, res, err);
+ 
+ 	ciptr= ref.ref_ptr;
+ 	priv= (struct private *)ciptr->priv;
+ 	if (res > 0)
+ 		priv->write_offset += res;
+ 	else if (res == 0)
+ 		abort();
+ 	else
+ 	{
+ 		priv->write_errno= err;
+ 		return;
+ 	}
+ 	priv->write_inprogress= 0;
+ 
+ 	while (priv->write_offset < priv->write_size)
+ 	{
+ 		r= write(ciptr->fd, priv->write_buffer+priv->write_offset,
+ 			priv->write_size-priv->write_offset);
+ 		if (r > 0)
+ 		{
+ 			PRMSG(5, "TRANS(MnxTcpWrite): wrote %d bytes\n",
+ 				r, 0, 0);
+ 			priv->write_offset += r;
+ 			continue;
+ 		}
+ 		else if (r == -1 && errno == EINPROGRESS)
+ 		{
+ 			priv->write_inprogress= 1;
+ 			nbio_inprogress(ciptr->fd, ASIO_WRITE, 0 /* read */,
+ 				1 /* write */, 0 /* exception */);
+ 		}
+ 		else
+ 		{
+ 			PRMSG(1, "TRANS(MnxTcpWrite): write failed: %s\n",
+ 				strerror(errno), 0, 0);
+ 			priv->write_errno= errno;
+ 		}
+ 		break;
+ 	}
+ }
+ 
+ static void
+ listen_cb(ref, res, err)
+ nbio_ref_t ref;
+ int res;
+ int err;
+ {
+ 	XtransConnInfo ciptr;
+ 	struct private *priv;
+ 	struct sockaddr_in *addr;
+ 	nwio_tcpconf_t tcpconf;
+ 
+ 	PRMSG(2, "listen_cb(%x,%d,%d)\n", ref.ref_ptr, res, err);
+ 
+ 	ciptr= ref.ref_ptr;
+ 	priv= (struct private *)ciptr->priv;
+ 	if (res == 0)
+ 	{
+ 		if (ioctl(ciptr->fd, NWIOGTCPCONF, &tcpconf) == -1)
+ 		{
+ 			PRMSG(1,
+ 			"listen_cb: NWIOGTCPCONF failed: %s\n",
+ 				strerror(errno),0, 0);
+ 			return;
+ 		}
+ 		if ((addr= (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in)))
+ 			== NULL)
+ 		{
+ 			PRMSG(1, "listen_cb: malloc failed\n", 0, 0, 0);
+ 			return;
+ 		}
+ 		addr->sin_family= AF_INET;
+ 		addr->sin_addr.s_addr= tcpconf.nwtc_locaddr;
+ 		addr->sin_port= tcpconf.nwtc_locport;
+ 		if (ciptr->addr)
+ 			free(ciptr->addr);
+ 		ciptr->addr= (char *)addr;
+ 		ciptr->addrlen= sizeof(struct sockaddr_in);
+ 		priv->listen_completed= 1;
+ 		return;
+ 	}
+ 	PRMSG(2, "listen_cb: listen failed: %s\n", strerror(err), 0, 0);
+ 	if (restart_listen(ciptr) == -1)
+ 	{
+ 		priv->listen_list= listen_list;
+ 		listen_list= ciptr;
+ 	}
+ }
+ 
+ static int
+ restart_listen(ciptr)
+ XtransConnInfo	ciptr;
+ {
+ 	char *tcp_device;
+ 	nwio_tcpconf_t tcpconf;
+ 	nwio_tcpcl_t tcpcl;
+ 	int fd, r, s_errno, flags;
+ 	struct private *priv;
+ 	nbio_ref_t ref;
+ 
+ 	PRMSG(2, "restart_listen(%d)\n", ciptr->fd, 0, 0);
+ 
+ 	nbio_unregister(ciptr->fd);
+ 
+ 	if ((tcp_device= getenv("TCP_DEVICE")) == NULL)
+ 		tcp_device= TCP_DEVICE;
+ 
+ 	if ((fd= open(tcp_device, O_RDWR)) == -1)
+ 	{
+ 		PRMSG(1, "restart_listen: open '%s' failed: %s\n",
+ 			tcp_device, strerror(errno), 0);
+ 		return -1;
+ 	}
+ 	PRMSG(5, "restart_listen: fd= '%d'\n", fd, 0, 0);
+ 	if (fd != ciptr->fd)
+ 	{
+ 		if (dup2(fd, ciptr->fd) == -1)
+ 			abort();	/* no way to recover */
+ 		close(fd);
+ 	}
+ 	fd= ciptr->fd;
+ 	ref.ref_ptr= ciptr;
+ 	nbio_register(fd);
+ 	nbio_setcallback(fd, ASIO_IOCTL, listen_cb, ref);
+ 
+ 	priv= (struct private *)ciptr->priv;
+ 
+ 	tcpconf.nwtc_flags= NWTC_SHARED | NWTC_UNSET_RA | NWTC_UNSET_RP;
+ 	tcpconf.nwtc_locport= priv->listen_port;
+ 	tcpconf.nwtc_flags |= NWTC_LP_SET;
+ 
+ 	if (ioctl(ciptr->fd, NWIOSTCPCONF, &tcpconf) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(restart_listen): NWIOSTCPCONF failed: %s\n",
+ 			strerror(errno),0, 0);
+ 		return -1;
+ 	}
+ 
+ 	flags= fcntl(ciptr->fd, F_GETFD);
+ 	if (flags == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_GETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return -1;
+ 	}
+ 	if (fcntl(ciptr->fd, F_SETFD, flags | FD_ASYNCHIO) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_SETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return -1;
+ 	}
+ 
+ 	tcpcl.nwtcl_flags= 0;
+ 	r= ioctl(ciptr->fd, NWIOTCPLISTEN, &tcpcl);
+ 	s_errno= errno;
+ 
+ 	if (fcntl(ciptr->fd, F_SETFD, flags) == -1)
+ 	{
+ 		PRMSG(1,
+ 		"TRANS(MnxTcpCreateListener): fcntl F_SETFD failed: %s\n",
+ 			strerror(errno), 0, 0);
+ 		return -1;
+ 	}
+ 
+ 	if (r == -1 && s_errno == EINPROGRESS)
+ 	{
+ 		nbio_inprogress(ciptr->fd, ASIO_IOCTL, 1 /* read */,
+ 			1 /* write */, 0 /* exception */);
+ 		return 0;
+ 	}
+ 	if (r == 0)
+ 	{
+ 		priv->listen_completed= 1;
+ 		return 0;
+ 	}
+ 	errno= s_errno;
+ 	PRMSG(1, "TRANS(MnxTcpCreateListener): NWIOTCPLISTEN failed: %s\n",
+ 		strerror(errno), 0, 0);
+ 	return -1;
+ }
+ 
+ 
+ Xtransport	TRANS(MnxINETFuncs) =
+ {
+ 	/* Minix TCP Interface */
+ 	"inet",
+ 	0,
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpOpenCOTSClient),
+ #endif /* TRANS_CLIENT */
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpOpenCOTSServer),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpOpenCLTSClient),
+ #endif /* TRANS_CLIENT */
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpOpenCLTSServer),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_REOPEN
+ 	TRANS(MnxTcpReopenCOTSServer),
+ 	TRANS(MnxTcpReopenCLTSServer),
+ #endif
+ 	TRANS(MnxTcpSetOption),
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpCreateListener),
+ 	TRANS(MnxTcpResetListener),
+ 	TRANS(MnxTcpAccept),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpConnect),
+ #endif /* TRANS_CLIENT */
+ 	TRANS(MnxTcpBytesReadable),
+ 	TRANS(MnxTcpRead),
+ 	TRANS(MnxTcpWrite),
+ 	TRANS(MnxTcpReadv),
+ 	TRANS(MnxTcpWritev),
+ 	TRANS(MnxTcpDisconnect),
+ 	TRANS(MnxTcpClose),
+ 	TRANS(MnxTcpClose),
+ };
+ 
+ Xtransport	TRANS(MnxTCPFuncs) =
+ {
+ 	/* Minix TCP Interface */
+ 	"tcp",
+ 	TRANS_ALIAS,
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpOpenCOTSClient),
+ #endif /* TRANS_CLIENT */
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpOpenCOTSServer),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpOpenCLTSClient),
+ #endif /* TRANS_CLIENT */
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpOpenCLTSServer),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_REOPEN
+ 	TRANS(MnxTcpReopenCOTSServer),
+ 	TRANS(MnxTcpReopenCLTSServer),
+ #endif
+ 	TRANS(MnxTcpSetOption),
+ #ifdef TRANS_SERVER
+ 	TRANS(MnxTcpCreateListener),
+ 	TRANS(MnxTcpResetListener),
+ 	TRANS(MnxTcpAccept),
+ #endif /* TRANS_SERVER */
+ #ifdef TRANS_CLIENT
+ 	TRANS(MnxTcpConnect),
+ #endif /* TRANS_CLIENT */
+ 	TRANS(MnxTcpBytesReadable),
+ 	TRANS(MnxTcpRead),
+ 	TRANS(MnxTcpWrite),
+ 	TRANS(MnxTcpReadv),
+ 	TRANS(MnxTcpWritev),
+ 	TRANS(MnxTcpDisconnect),
+ 	TRANS(MnxTcpClose),
+ 	TRANS(MnxTcpClose),
+ };
diff -c xc/lib/xtrans/Xtranssock.c:1.1.1.5 xc/lib/xtrans/Xtranssock.c:3.11
*** xc/lib/xtrans/Xtranssock.c:1.1.1.5	Mon Jan 30 17:48:40 1995
--- xc/lib/xtrans/Xtranssock.c	Mon Jan 30 17:48:40 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtranssock.c,v 1.34 95/01/12 18:25:25 kaleb Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.11 1995/01/28 15:44:19 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 67,73 ****
--- 68,76 ----
  #endif
  
  #ifdef UNIXCONN
+ #ifndef X_NO_SYS_UN
  #include <sys/un.h>
+ #endif
  #include <sys/stat.h>
  #endif
  
***************
*** 96,103 ****
  #if !defined(_SEQUENT_) && !defined(ESIX)
  #include <net/errno.h>
  #endif /* _SEQUENT_  || ESIX */
  #include <sys/stropts.h>
! #endif /* i386 && SYSV || _SEQUENT_ */
  #endif /* !WIN32 */
  
  #ifdef WIN32
--- 99,108 ----
  #if !defined(_SEQUENT_) && !defined(ESIX)
  #include <net/errno.h>
  #endif /* _SEQUENT_  || ESIX */
+ #ifndef ISC
  #include <sys/stropts.h>
! #endif
! #endif /* i386 && SYSV && !SCO || _SEQUENT_ */
  #endif /* !WIN32 */
  
  #ifdef WIN32
***************
*** 125,130 ****
--- 130,157 ----
  #undef SO_DONTLINGER
  #endif
  
+ #ifdef __EMX__
+ static int IBMsockInit = 0;
+ #define SocketInitOnce()\
+     if (!IBMsockInit) {\
+ 	sock_init();\
+ 	IBMsockInit = 1;\
+     }
+ #undef EINTR
+ #define EINTR SOCEINTR
+ #undef EINVAL
+ #define EINVAL SOCEINVAL
+ #undef errno
+ #define errno sock_errno()
+ #undef close
+ #define close soclose
+ #undef ioctl
+ #define ioctl sockioctl
+ #define SOCKET int
+ #else
+ /* others don't need this */
+ #define SocketInitOnce() /**/
+ #endif
  
  /*
   * This is the Socket implementation of the X Transport service layer
***************
*** 423,428 ****
--- 450,457 ----
      PRMSG (2, "TRANS(SocketOpenCOTSClient) (%s,%s,%s)\n",
  	protocol, host, port);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 465,470 ****
--- 494,501 ----
  
      PRMSG (2,"TRANS(SocketOpenCOTSServer) (%s,%s,%s)\n", protocol, host, port);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 481,486 ****
--- 512,521 ----
  	return NULL;
      }
  
+     /*
+      * Using this prevents the bind() check for an existing server listening
+      * on the same port, but it is required for other reasons.
+      */
  #ifdef SO_REUSEADDR
  
      /*
***************
*** 521,526 ****
--- 556,563 ----
  
      PRMSG (2,"TRANS(SocketOpenCLTSClient) (%s,%s,%s)\n", protocol, host, port);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 563,568 ****
--- 600,607 ----
  
      PRMSG (2,"TRANS(SocketOpenCLTSServer) (%s,%s,%s)\n", protocol, host, port);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 605,610 ****
--- 644,651 ----
      PRMSG (2,
  	"TRANS(SocketReopenCOTSServer) (%d, %s)\n", fd, port, 0);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 640,649 ****
      XtransConnInfo	ciptr;
      int			i;
  
- 
      PRMSG (2,
  	"TRANS(SocketReopenCLTSServer) (%d, %s)\n", fd, port, 0);
  
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
--- 681,691 ----
      XtransConnInfo	ciptr;
      int			i;
  
      PRMSG (2,
  	"TRANS(SocketReopenCLTSServer) (%d, %s)\n", fd, port, 0);
  
+     SocketInitOnce();
+ 
      if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
      {
  	PRMSG (1,
***************
*** 951,957 ****
  
      if (stat (unsock->sun_path, &statb) == -1 ||
          ((statb.st_mode & S_IFMT) !=
! #if (defined (sun) && defined(SVR4)) || defined(NCR)
  	  		S_IFIFO))
  #else
  			S_IFSOCK))
--- 993,999 ----
  
      if (stat (unsock->sun_path, &statb) == -1 ||
          ((statb.st_mode & S_IFMT) !=
! #if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(SCO) || !defined(S_IFSOCK)
  	  		S_IFIFO))
  #else
  			S_IFSOCK))
***************
*** 1484,1489 ****
--- 1526,1533 ----
  BytesReadable_t *pend;
  
  {
+ int ret;
+ char dummybuf[1500];
      PRMSG (2,"TRANS(SocketBytesReadable) (%x,%d,%x)\n",
  	ciptr, ciptr->fd, pend);
  
***************
*** 1493,1500 ****
  #if (defined(i386) && defined(SYSV) && !defined(SCO)) || defined(_SEQUENT_)
      return ioctl (ciptr->fd, I_NREAD, (char *) pend);
  #else
      return ioctl (ciptr->fd, FIONREAD, (char *) pend);
! #endif /* i386 && SYSV || _SEQUENT_ */
  #endif /* WIN32 */
  }
  
--- 1537,1548 ----
  #if (defined(i386) && defined(SYSV) && !defined(SCO)) || defined(_SEQUENT_)
      return ioctl (ciptr->fd, I_NREAD, (char *) pend);
  #else
+ #if defined(__EMX__)
+     return ioctl (ciptr->fd, FIONREAD, (char*) pend, sizeof(int));
+ #else
      return ioctl (ciptr->fd, FIONREAD, (char *) pend);
! #endif /* __EMX__ */
! #endif /* i386 && SYSV && !SCO || _SEQUENT_ */
  #endif /* WIN32 */
  }
  
***************
*** 1507,1516 ****
  int		size;
  
  {
      PRMSG (2,"TRANS(SocketRead) (%d,%x,%d)\n", ciptr->fd, buf, size);
  
! #ifdef WIN32
!     return recv ((SOCKET)ciptr->fd, buf, size, 0);
  #else
      return read (ciptr->fd, buf, size);
  #endif /* WIN32 */
--- 1555,1569 ----
  int		size;
  
  {
+ int ret;
+ 
      PRMSG (2,"TRANS(SocketRead) (%d,%x,%d)\n", ciptr->fd, buf, size);
  
! #if defined(WIN32) || defined(__EMX__)
!     ret = recv ((SOCKET)ciptr->fd, buf, size, 0);
! printf("recv: return = %d\n",ret);
! if (ret==-1) psock_errno("read");
! return ret;
  #else
      return read (ciptr->fd, buf, size);
  #endif /* WIN32 */
***************
*** 1527,1533 ****
  {
      PRMSG (2,"TRANS(SocketWrite) (%d,%x,%d)\n", ciptr->fd, buf, size);
  
! #ifdef WIN32
      return send ((SOCKET)ciptr->fd, buf, size, 0);
  #else
      return write (ciptr->fd, buf, size);
--- 1580,1586 ----
  {
      PRMSG (2,"TRANS(SocketWrite) (%d,%x,%d)\n", ciptr->fd, buf, size);
  
! #if defined(WIN32) || defined(__EMX__)
      return send ((SOCKET)ciptr->fd, buf, size, 0);
  #else
      return write (ciptr->fd, buf, size);
diff -c xc/lib/xtrans/Xtransutil.c:1.1.1.4 xc/lib/xtrans/Xtransutil.c:3.3
*** xc/lib/xtrans/Xtransutil.c:1.1.1.4	Mon Jan 30 17:48:41 1995
--- xc/lib/xtrans/Xtransutil.c	Mon Jan 30 17:48:41 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Xtransutil.c,v 1.18 94/10/18 15:57:42 mor Exp $ */
+ /* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.3 1995/01/12 05:54:23 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 93,99 ****
  
      switch( *familyp )
      {
! #if defined(TCPCONN) || defined(STREAMSCONN)
      case AF_INET:
      {
  	/*
--- 94,100 ----
  
      switch( *familyp )
      {
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
      case AF_INET:
      {
  	/*
***************
*** 129,135 ****
  	}
  	break;
      }
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) */
  
  #if defined(DNETCONN)
      case AF_DECnet:
--- 130,136 ----
  	}
  	break;
      }
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) || MNX_TCPCONN */
  
  #if defined(DNETCONN)
      case AF_DECnet:
***************
*** 251,257 ****
      }
  #endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
  
! #if defined(TCPCONN) || defined(STREAMSCONN)
      case AF_INET:
      {
  	struct sockaddr_in *saddr = (struct sockaddr_in *) addr;
--- 252,258 ----
      }
  #endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
      case AF_INET:
      {
  	struct sockaddr_in *saddr = (struct sockaddr_in *) addr;
***************
*** 263,269 ****
  	sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf);
  	break;
      }
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) */
  
  #if defined(DNETCONN)
      case AF_DECnet:
--- 264,270 ----
  	sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf);
  	break;
      }
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) || MNX_TCPCONN */
  
  #if defined(DNETCONN)
      case AF_DECnet:
***************
*** 335,341 ****
      }
  #endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
  
! #if defined(TCPCONN) || defined(STREAMSCONN)
      case AF_INET:
      {
  	struct sockaddr_in *saddr = (struct sockaddr_in *) peer_addr;
--- 336,342 ----
      }
  #endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
  
! #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
      case AF_INET:
      {
  	struct sockaddr_in *saddr = (struct sockaddr_in *) peer_addr;
***************
*** 371,377 ****
  	break;
      }
  
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) */
  
  #if defined(DNETCONN)
      case AF_DECnet:
--- 372,378 ----
  	break;
      }
  
! #endif /* defined(TCPCONN) || defined(STREAMSCONN) || MNX_TCPCONN */
  
  #if defined(DNETCONN)
      case AF_DECnet:
diff -c xc/lib/xtrans/transport.c:1.1.1.1 xc/lib/xtrans/transport.c:3.0
*** xc/lib/xtrans/transport.c:1.1.1.1	Mon Jan 30 17:48:41 1995
--- xc/lib/xtrans/transport.c	Mon Jan 30 17:48:41 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: transport.c,v 1.6 94/04/17 20:23:07 mor Exp $ */
+ /* $XFree86: xc/lib/xtrans/transport.c,v 3.0 1994/05/08 05:16:40 dawes Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 68,73 ****
--- 69,77 ----
  #endif
  #if defined(AMRPCCONN) || defined(AMTCPCONN)
  #include "Xtransam.c"
+ #endif
+ #if defined(MNX_TCPCONN)
+ #include "Xtransmnx.c"
  #endif
  #include "Xtrans.c"
  #include "Xtransutil.c"
diff -c xc/util/compress/compress.c:1.1.1.1 xc/util/compress/compress.c:3.0
*** xc/util/compress/compress.c:1.1.1.1	Mon Jan 30 17:48:49 1995
--- xc/util/compress/compress.c	Mon Jan 30 17:48:49 1995
***************
*** 490,496 ****
  	zcat_flg = 1;
      }
  
! #ifdef BSD4_2
      /* 4.2BSD dependent - take it out if not */
      setlinebuf( stderr );
  #endif /* BSD4_2 */
--- 490,496 ----
  	zcat_flg = 1;
      }
  
! #if defined(BSD4_2) && !defined(__EMX__)
      /* 4.2BSD dependent - take it out if not */
      setlinebuf( stderr );
  #endif /* BSD4_2 */
***************
*** 1362,1371 ****
--- 1362,1376 ----
  	mode = statbuf.st_mode & 07777;
  	if (chmod(ofname, mode))		/* Copy modes */
  	    perror(ofname);
+ #ifndef __EMX__
  	chown(ofname, statbuf.st_uid, statbuf.st_gid);	/* Copy ownership */
+ #endif
  	timep[0] = statbuf.st_atime;
  	timep[1] = statbuf.st_mtime;
  	utime(ofname, timep);	/* Update last accessed and modified times */
+ #ifdef __EMX__
+ 	fclose(stdin);
+ #endif
  	if (unlink(ifname))	/* Remove input file */
  	    perror(ifname);
  	if(!quiet)
diff -c xc/workInProgress/Imakefile:1.1.1.2 xc/workInProgress/Imakefile:3.2
*** xc/workInProgress/Imakefile:1.1.1.2	Mon Jan 30 17:48:55 1995
--- xc/workInProgress/Imakefile	Mon Jan 30 17:48:55 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.3 94/12/19 22:28:19 mor Exp $
+ XCOMM $XFree86: xc/workInProgress/Imakefile,v 3.2 1995/01/14 10:56:46 dawes Exp $
  
  #define IHaveSubdirs
  #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
***************
*** 7,13 ****
  FRESCODIRS = Fresco Xtf
  #endif
  
! #if BuildLBX
  LBXDIRS = lbx
  #endif
  
--- 8,14 ----
  FRESCODIRS = Fresco Xtf
  #endif
  
! #if BuildLBX || BuildLBXCompatible
  LBXDIRS = lbx
  #endif
  
diff -c xc/workInProgress/Fresco/src/Imakefile:1.1.1.3 xc/workInProgress/Fresco/src/Imakefile:3.1
*** xc/workInProgress/Fresco/src/Imakefile:1.1.1.3	Mon Jan 30 17:49:09 1995
--- xc/workInProgress/Fresco/src/Imakefile	Mon Jan 30 17:49:09 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.11 94/08/17 21:56:42 matt Exp $
+ XCOMM $XFree86: xc/workInProgress/Fresco/src/Imakefile,v 3.1 1994/12/17 11:23:17 dawes Exp $
  #define DoNormalLib NormalLibFresco
  #define DoSharedLib SharedLibFresco
  #define DoDebugLib DebugLibFresco
***************
*** 11,17 ****
  REQUIREDLIBS = SharedFrescoReqs
  #endif
  
! #ifdef HasPoll
  POLL_DEFINES = -DUSE_POLL
  #endif
  
--- 12,18 ----
  REQUIREDLIBS = SharedFrescoReqs
  #endif
  
! #if HasPoll
  POLL_DEFINES = -DUSE_POLL
  #endif
  
diff -c xc/workInProgress/Fresco/src/Xdrawing.cxx:1.1.1.2 xc/workInProgress/Fresco/src/Xdrawing.cxx:3.1
*** xc/workInProgress/Fresco/src/Xdrawing.cxx:1.1.1.2	Mon Jan 30 17:49:10 1995
--- xc/workInProgress/Fresco/src/Xdrawing.cxx	Mon Jan 30 17:49:10 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: Xdrawing.cxx,v 1.5 94/09/01 18:45:46 matt Exp $
+  * $XFree86: xc/workInProgress/Fresco/src/Xdrawing.cxx,v 3.1 1994/09/17 13:52:33 dawes Exp $
   */
  
  /*
***************
*** 2199,2206 ****
  
  Boolean FontSpec::is_scalable() {
      return (
! 	atoi(fields_[pixels]) == 0 ||
! 	atoi(fields_[points]) == 0 || atoi(fields_[width]) == 0
      );
  }
  
--- 2200,2208 ----
  
  Boolean FontSpec::is_scalable() {
      return (
! 	(fields_[pixels] && atoi(fields_[pixels]) == 0) ||
! 	(fields_[points] && atoi(fields_[points]) == 0) ||
! 	(fields_[width] && atoi(fields_[width]) == 0)
      );
  }
  
diff -c xc/workInProgress/Fresco/src/fresco.cxx:1.1.1.3 xc/workInProgress/Fresco/src/fresco.cxx:3.1
*** xc/workInProgress/Fresco/src/fresco.cxx:1.1.1.3	Mon Jan 30 17:49:11 1995
--- xc/workInProgress/Fresco/src/fresco.cxx	Mon Jan 30 17:49:11 1995
***************
*** 1,5 ****
--- 1,6 ----
  /*
   * $XConsortium: fresco.cxx,v 1.12 94/09/14 20:17:37 matt Exp $
+  * $XFree86: xc/workInProgress/Fresco/src/fresco.cxx,v 3.1 1994/09/17 13:52:36 dawes Exp $
   */
  
  /*
***************
*** 43,48 ****
--- 44,50 ----
  #include <ctype.h>
  #include <stdio.h>
  #include <stdlib.h>
+ #include <unistd.h>
  #include <string.h>
  
  #if defined(__sgi)
diff -c xc/workInProgress/MTXserver/Imakefile:1.1.1.1 xc/workInProgress/MTXserver/Imakefile:3.0
*** xc/workInProgress/MTXserver/Imakefile:1.1.1.1	Mon Jan 30 17:49:13 1995
--- xc/workInProgress/MTXserver/Imakefile	Mon Jan 30 17:49:13 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 2.5 94/01/23 02:36:41 rob Exp $
+ XCOMM $XFree86: xc/workInProgress/MTXserver/Imakefile,v 3.0 1994/06/18 16:38:03 dawes Exp $
  /*
   * Merged X Server Master Makefile
   */
***************
*** 66,72 ****
          DBM_LIBRARY = DBMLibrary
  #endif
          SYSLIBS = $(MTSERVERLIBS) MathLibrary Krb5Libraries $(THREADS_LIBS) $(DBM_LIBRARY)
!            CBRT = mi/cbrt.o
          STDDIRS = dix os mi $(EXTDIRS) $(MTSERVERDIRS)
  
  XCOMM
--- 67,73 ----
          DBM_LIBRARY = DBMLibrary
  #endif
          SYSLIBS = $(MTSERVERLIBS) MathLibrary Krb5Libraries $(THREADS_LIBS) $(DBM_LIBRARY)
!            CBRT = mi/libcbrt.a
          STDDIRS = dix os mi $(EXTDIRS) $(MTSERVERDIRS)
  
  XCOMM
diff -c xc/workInProgress/MTXserver/mi/Imakefile:1.1.1.1 xc/workInProgress/MTXserver/mi/Imakefile:3.0
*** xc/workInProgress/MTXserver/mi/Imakefile:1.1.1.1	Mon Jan 30 17:49:51 1995
--- xc/workInProgress/MTXserver/mi/Imakefile	Mon Jan 30 17:49:51 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 6.1 94/01/11 18:36:15 gildea Exp $
+ XCOMM $XFree86: xc/workInProgress/MTXserver/mi/Imakefile,v 3.0 1994/06/18 16:38:50 dawes Exp $
  #define DoThreadedServer XServerThreaded
  #include <Server.tmpl>
  
***************
*** 32,42 ****
  LintLibraryTarget(mi,$(SRCS))
  NormalLintTarget($(SRCS))
  
! all:: cbrt.o
  
  SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
  SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
  
  LinkSourceFile(mi.h,$(SERVERSRC)/mi)
  LinkSourceFile(mibstore.h,$(SERVERSRC)/mi)
  LinkSourceFile(mibstorest.h,$(SERVERSRC)/mi)
--- 33,44 ----
  LintLibraryTarget(mi,$(SRCS))
  NormalLintTarget($(SRCS))
  
! NormalLibraryTarget(cbrt,cbrt.o)
  
  SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
  SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
  
+ LinkSourceFile(cbrt.c,$(SERVERSRC)/mi)
  LinkSourceFile(mi.h,$(SERVERSRC)/mi)
  LinkSourceFile(mibstore.h,$(SERVERSRC)/mi)
  LinkSourceFile(mibstorest.h,$(SERVERSRC)/mi)
diff -c xc/workInProgress/lbx/lib/lbxutil/Imakefile:1.1.1.2 xc/workInProgress/lbx/lib/lbxutil/Imakefile:3.1
*** xc/workInProgress/lbx/lib/lbxutil/Imakefile:1.1.1.2	Mon Jan 30 17:50:01 1995
--- xc/workInProgress/lbx/lib/lbxutil/Imakefile	Mon Jan 30 17:50:01 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.4 94/09/13 17:22:05 mor Exp $
+ XCOMM $XFree86: xc/workInProgress/lbx/lib/lbxutil/Imakefile,v 3.1 1995/01/14 10:58:09 dawes Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
***************
*** 13,17 ****
--- 14,20 ----
  NormalDepLibraryTarget(lbxutil,$(SUBDIRS) $(DONES),$(OBJS))
  
  ForceSubdirs($(SUBDIRS))
+ 
+ InstallLinkKitLibrary(lbxutil,$(LINKKITDIR)/lib)
  
  DependSubdirs($(SUBDIRS))
diff -c xc/workInProgress/lbx/lib/lbxutil/image/mkg3states.c:1.1.1.1 xc/workInProgress/lbx/lib/lbxutil/image/mkg3states.c:3.1
*** xc/workInProgress/lbx/lib/lbxutil/image/mkg3states.c:1.1.1.1	Mon Jan 30 17:50:05 1995
--- xc/workInProgress/lbx/lib/lbxutil/image/mkg3states.c	Mon Jan 30 17:50:05 1995
***************
*** 1,4 ****
! /* $XConsortium: mkg3states.c,v 1.2 95/01/17 20:29:41 mor Exp $ */
  /*
   * Copyright (c) 1991, 1992 Sam Leffler
   * Copyright (c) 1991, 1992 Silicon Graphics, Inc.
--- 1,4 ----
! /* $XConsortium: mkg3states.c,v 1.1 95/01/17 19:29:06 mor Exp $ */
  /*
   * Copyright (c) 1991, 1992 Sam Leffler
   * Copyright (c) 1991, 1992 Silicon Graphics, Inc.
diff -c xc/workInProgress/lbx/programs/Xserver/lbx/Imakefile:1.1.1.2 xc/workInProgress/lbx/programs/Xserver/lbx/Imakefile:3.4
*** xc/workInProgress/lbx/programs/Xserver/lbx/Imakefile:1.1.1.2	Mon Jan 30 17:50:09 1995
--- xc/workInProgress/lbx/programs/Xserver/lbx/Imakefile	Mon Jan 30 17:50:09 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: Imakefile,v 1.8 94/12/01 20:28:16 mor Exp $ */
+ /* $XFree86: xc/workInProgress/lbx/programs/Xserver/lbx/Imakefile,v 3.4 1995/01/14 10:58:42 dawes Exp $ */
  /*
   * $NCDId: @(#)Imakefile,v 1.16 1994/11/18 20:32:34 lemke Exp $
   *
***************
*** 35,43 ****
  	-I$(FONTSRC)/include \
  	-I$(SERVERSRC)/include
  #else
! INCLUDES =  -I$(TOP)/include -I$(TOP)/include/fonts -I$(SERVERSRC)/include  -I$(EXTINCSRC) -I../../../include/extensions
  #endif
  
  SRCS =	\
  	lbxmain.c lbxdix.c lbxtags.c lbxprop.c lbxgfx.c lbxtables.c \
          lbxswap.c lbxsquish.c lbxexts.c lbxopts.c
--- 36,46 ----
  	-I$(FONTSRC)/include \
  	-I$(SERVERSRC)/include
  #else
! INCLUDES =  -I$(INCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/include  -I$(EXTINCSRC) -I../../../include/extensions
  #endif
  
+ DEFINES = -DLBX
+ 
  SRCS =	\
  	lbxmain.c lbxdix.c lbxtags.c lbxprop.c lbxgfx.c lbxtables.c \
          lbxswap.c lbxsquish.c lbxexts.c lbxopts.c
***************
*** 51,55 ****
--- 54,60 ----
  NormalLibraryTarget(lbx,$(OBJS))
  LintLibraryTarget(lbx,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(lbx,$(LINKKITDIR)/lib)
  
  DependTarget()
diff -c xc/workInProgress/lbx/programs/lbxproxy/Imakefile:1.1.1.1 xc/workInProgress/lbx/programs/lbxproxy/Imakefile:3.2
*** xc/workInProgress/lbx/programs/lbxproxy/Imakefile:1.1.1.1	Mon Jan 30 17:50:11 1995
--- xc/workInProgress/lbx/programs/lbxproxy/Imakefile	Mon Jan 30 17:50:11 1995
***************
*** 1,11 ****
  XCOMM $XConsortium: Imakefile,v 1.7 94/04/13 18:07:51 rws Exp $
  
  #include <Server.tmpl>
  #define       IHaveSubdirs
  
  SUBDIRS = di os
! LBXLIBS = di/libdilbx.a os/libos.a ../../lib/lbxutil/liblbxutil.a  ../../lib/Xext/liblbxXext.a
! OTHERLIBS = $(XEXTLIB) $(XLIB) $(XAULIB) $(XDMCPLIB)
  
  ServerTarget(lbxproxy,$(SUBDIRS),NullParameter,$(LBXLIBS),$(OTHERLIBS))
  
--- 1,16 ----
  XCOMM $XConsortium: Imakefile,v 1.7 94/04/13 18:07:51 rws Exp $
+ XCOMM $XFree86: xc/workInProgress/lbx/programs/lbxproxy/Imakefile,v 3.2 1995/01/15 10:41:13 dawes Exp $
  
  #include <Server.tmpl>
  #define       IHaveSubdirs
  
  SUBDIRS = di os
! LBXLIBS = di/libdilbx.a os/libos.a ../../lib/lbxutil/liblbxutil.a
! #ifndef i386IscArchitecture
! OTHERLIBS = $(LBXXEXTLIB) $(XLIB) $(XAULIB) $(XDMCPLIB)
! #else
! OTHERLIBS = $(LBXXEXTLIB) $(XLIB) $(XAULIB) $(XDMCPLIB) -linet
! #endif
  
  ServerTarget(lbxproxy,$(SUBDIRS),NullParameter,$(LBXLIBS),$(OTHERLIBS))
  
***************
*** 12,14 ****
--- 17,21 ----
  DependSubdirs($(SUBDIRS))
  
  ForceSubdirs($(SUBDIRS))
+ 
+ InstallManPage(lbxproxy,$(MANDIR))
diff -c /dev/null xc/workInProgress/lbx/programs/lbxproxy/lbxproxy.man:3.0
*** /dev/null	Mon Jan 30 17:50:11 1995
--- xc/workInProgress/lbx/programs/lbxproxy/lbxproxy.man	Mon Jan 30 17:50:11 1995
***************
*** 0 ****
--- 1,125 ----
+ .\" $XFree86: xc/workInProgress/lbx/programs/lbxproxy/lbxproxy.man,v 3.0 1995/01/15 10:41:16 dawes Exp $
+ .\" Copyright (c) 1984 - 1991, 1993, 1994  X Consortium
+ .\" 
+ .\" Permission is hereby granted, free of charge, to any person obtaining
+ .\" a copy of this software and associated documentation files (the
+ .\" "Software"), to deal in the Software without restriction, including
+ .\" without limitation the rights to use, copy, modify, merge, publish,
+ .\" distribute, sublicense, and/or sell copies of the Software, and to
+ .\" permit persons to whom the Software is furnished to do so, subject to
+ .\" the following conditions:
+ .\" 
+ .\" The above copyright notice and this permission notice shall be included
+ .\" in all copies or substantial portions of the Software.
+ .\" 
+ .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ .\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ .\" OTHER DEALINGS IN THE SOFTWARE.
+ .\" 
+ .\" Except as contained in this notice, the name of the X Consortium shall
+ .\" not be used in advertising or otherwise to promote the sale, use or
+ .\" other dealings in this Software without prior written authorization
+ .\" from the X Consortium.
+ .TH lbxproxy 1 "Release 6"  "X Version 11"
+ .SH NAME
+ lbxproxy \- LBX proxy server for the X Window System
+ .SH SYNOPSIS
+ .B lbxproxy
+ [:displaynumber] [option ...]
+ .SH NOTE
+ This manual page is not definitive or ``official''.  It is derived from
+ information contained in the \fBREADME\fP file in the lbx source.
+ .SH DESCRIPTION
+ .I lbxproxy
+ is the Low Bandwidth X pseudo-server.  It runs on the remote side of low
+ bandwidth, high-latency connections (e.g., serial lines and wide-area
+ network).  It accepts connections from X clients at the remote end and
+ forwards them to an X server at the local end.  The LBX protocol used for
+ the low bandwidth connection includes compression and optimisations
+ designed to make effective use of the bandwidth availble.  The current
+ version of LBX is \fBNOT\fP a standard of the X Consortium, and will
+ \fBNOT\fP be compatible with the final version.  The current version
+ should be treated as an ``alpha'' or ``prototype'' for people interested
+ in experimenting with it.
+ .SH OPTIONS
+ .I lbxproxy
+ accepts the following options
+ .TP 8
+ .B :\fIdisplaynumber\fP
+ .I lbxproxy
+ runs as the given \fIdisplaynumber\fP, which by default is 0.  A value
+ different from 0 should be used if the host running
+ .I lbxproxy
+ has a local X display.
+ If multiple 
+ .I lbxproxy
+ servers or other X servers are to run simultaneously on a host, each must have
+ a unique display number.  See the DISPLAY
+ NAMES section of the \fIX(1)\fP manual page to learn how to specify
+ which display number clients should try to use.
+ .TP 8
+ .B \-ac
+ disables host-based access control mechanisms.  Enables access by any host,
+ and permits any host to modify the access control list.
+ Use with extreme caution.
+ This option exists primarily for running test suites remotely.
+ .TP 8
+ .B -display \fIdisplay-number\fP
+ sets the name of the X server display that
+ .I lbxproxy
+ connects to.
+ .TP 8
+ .B \-help
+ prints a usage message.
+ .TP 8
+ .B \-I
+ causes all remaining command line arguments to be ignored.
+ .TP 8
+ .B \-to \fIseconds\fP
+ sets default connection timeout in seconds.
+ .SH "NETWORK CONNECTIONS"
+ .I lbxproxy
+ supports client connections via most of the connection types supported
+ by the X servers (refer to the \fIXserver(1)\fP and hardware-specific
+ X server manual pages for details).  Note that in the current implementation
+ some of the conenctions types have not been implemented correctly.
+ This mostly applies to System V.
+ .SH EXAMPLES
+ To setup \fIlbxproxy\fP, start the X server as usual, and then start the
+ proxy.  The lbxproxy is a pseudo-server, so any clients that wish to use
+ it need to adjust their \fBDISPLAY\fP.  By default, the proxy will listen
+ on <hostname>:1.  This can be changed with the `:displaynumber' argument.
+ .PP
+ If the proxy is to be running on a host named `sharedhost', connecting
+ to an LBX-capable X server on a desktop machine named `mydesktop', you
+ could use the following command to start the proxy (which would be
+ known as display `sharedhost:7'):
+ .PP
+ .nf
+   mydesktop%  rlogin sharedhost
+   sharedhost% lbxproxy -display mydesktop:0 :7 &
+   sharedhost% xclient -display sharedhost:7
+ .ni
+ .PP
+ If you are running LBX over a TERM connection between `mydesktop' and
+ `sharedhost', try something like this:
+ .PP
+ .nf
+   mydesktop%  trsh
+   sharedhost% tredir -r 6008 6000
+   sharedhost% lbxproxy -display sharedhost:8 :7 &
+   sharedhost% xclient -display sharedhost:7
+ .ni
+ .SH "SEE ALSO"
+ General information: X(1)
+ .PP
+ Server-specific man pages: 
+ Xserver(1), Xdec(1), XmacII(1), Xsun(1), Xnest(1), Xvfb(1),
+ XF86_Acc(1), XF86_Mono(1), XF86_SVGA(1), XF86_VGA16(1), XFree86(1)
+ .SH AUTHORS
+ The LBX team includes Dave Lemke, Dale Tonogai, Keith Packard and
+ Jim Fulton from NCD, and Chris Kanterjiev from Xerox.
diff -c xc/workInProgress/lbx/programs/lbxproxy/di/lbxfuncs.c:1.1.1.2 xc/workInProgress/lbx/programs/lbxproxy/di/lbxfuncs.c:3.1
*** xc/workInProgress/lbx/programs/lbxproxy/di/lbxfuncs.c:1.1.1.2	Mon Jan 30 17:50:15 1995
--- xc/workInProgress/lbx/programs/lbxproxy/di/lbxfuncs.c	Mon Jan 30 17:50:16 1995
***************
*** 23,28 ****
--- 23,29 ----
   */
  
  /* $XConsortium: lbxfuncs.c,v 1.7 94/12/01 20:50:00 mor Exp $ */
+ /* $XFree86: xc/workInProgress/lbx/programs/lbxproxy/di/lbxfuncs.c,v 3.1 1995/01/14 10:58:57 dawes Exp $ */
  
  /*
   * top level LBX request & reply handling
diff -c xc/workInProgress/lbx/programs/lbxproxy/os/access.c:1.1.1.2 xc/workInProgress/lbx/programs/lbxproxy/os/access.c:3.2
*** xc/workInProgress/lbx/programs/lbxproxy/os/access.c:1.1.1.2	Mon Jan 30 17:50:18 1995
--- xc/workInProgress/lbx/programs/lbxproxy/os/access.c	Mon Jan 30 17:50:18 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: access.c,v 1.5 95/01/27 15:05:53 kaleb Exp $ */
+ /* $XFree86: xc/workInProgress/lbx/programs/lbxproxy/os/access.c,v 3.2 1995/01/28 16:24:00 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
diff -c xc/workInProgress/lbx/programs/lbxproxy/os/connection.c:1.1.1.1 xc/workInProgress/lbx/programs/lbxproxy/os/connection.c:3.2
*** xc/workInProgress/lbx/programs/lbxproxy/os/connection.c:1.1.1.1	Mon Jan 30 17:50:19 1995
--- xc/workInProgress/lbx/programs/lbxproxy/os/connection.c	Mon Jan 30 17:50:19 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: connection.c,v 1.6 94/04/17 21:17:12 dpw Exp $ */
+ /* $XFree86: xc/workInProgress/lbx/programs/lbxproxy/os/connection.c,v 3.2 1995/01/11 03:59:02 dawes Exp $ */
  /***********************************************************
  
  Copyright (c) 1987, 1989  X Consortium
***************
*** 734,739 ****
--- 735,741 ----
      } else {
  	XLOCAL_MSG((0,"open_isc_local(): can't open %s\n",DEV_SPX));
  #ifndef SVR4
+ #ifndef ISC
  	/*
  	 * At this point, most SVR4 versions will fail on this, so leave out the
  	 * warning
***************
*** 741,746 ****
--- 743,749 ----
  	Error("open_isc_local(): can't open \"%s\"",DEV_SPX);
  	return(-1);
  #endif
+ #endif
      }
  
      (void) close(fds);
***************
*** 822,827 ****
--- 825,831 ----
      } else {
  	XLOCAL_MSG((0,"open_sco_local(): can't open %s",DEV_SPX));
  #ifndef SVR4
+ #ifndef ISC
  	/*
  	 * At this point, most SVR4 versions will fail on this, so
  	 * leave out the warning
***************
*** 829,834 ****
--- 833,839 ----
  	Error("open_sco_local(): can't open \"%s\"",DEV_SPX);
  	return(-1);
  #endif
+ #endif
      }
  
      (void) close(fds);
***************
*** 1296,1302 ****
  
      for (i=0; i<MAXSOCKS; i++) ConnectionTranslation[i] = 0;
      for (i=0; i<MAXSOCKS; i++) ConnectionOutputTranslation[i] = 0;
! #ifndef X_NOT_POSIX
      lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
  #else
  #ifdef hpux
--- 1301,1307 ----
  
      for (i=0; i<MAXSOCKS; i++) ConnectionTranslation[i] = 0;
      for (i=0; i<MAXSOCKS; i++) ConnectionOutputTranslation[i] = 0;
! #if !defined(X_NOT_POSIX) && !defined(__FreeBSD__) && !defined(__386BSD__) && !defined(__NetBSD__)
      lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
  #else
  #ifdef hpux
***************
*** 1647,1653 ****
  	}
  #endif /* TCP_NODELAY */
      /* ultrix reads hang on Unix sockets, hpux reads fail, AIX fails too */
! #if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu))
  	(void) fcntl (newconn, F_SETFL, O_NONBLOCK);
  #else
  #ifdef FIOSNBIO
--- 1652,1658 ----
  	}
  #endif /* TCP_NODELAY */
      /* ultrix reads hang on Unix sockets, hpux reads fail, AIX fails too */
! #if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu) && !defined(SCO))
  	(void) fcntl (newconn, F_SETFL, O_NONBLOCK);
  #else
  #ifdef FIOSNBIO
diff -c xc/workInProgress/xsm/Imakefile:1.1.1.2 xc/workInProgress/xsm/Imakefile:3.1
*** xc/workInProgress/xsm/Imakefile:1.1.1.2	Mon Jan 30 17:50:28 1995
--- xc/workInProgress/xsm/Imakefile	Mon Jan 30 17:50:28 1995
***************
*** 1,4 ****
--- 1,5 ----
  XCOMM $XConsortium: Imakefile,v 1.16 94/12/27 17:42:37 mor Exp $
+ XCOMM $XFree86: xc/workInProgress/xsm/Imakefile,v 3.1 1995/01/27 05:02:12 dawes Exp $
  #if !defined(RshCmd)
  #if SystemV
  #ifdef HPArchitecture
***************
*** 11,16 ****
--- 12,22 ----
  #endif
  #endif
  
+ #ifdef MinixArchitecture
+        SHELLSRC = Shell.c
+        SHELLOBJ = Shell.o
+ #endif
+ 
           RSHCMD = RshCmd
  
          DEPLIBS = XawClientDepLibs
***************
*** 18,33 ****
  
             SRCS1 = auth.c choose.c info.c list.c lock.c log.c \
  		   mainwin.c misc.c popup.c printhex.c prop.c remote.c \
! 		   restart.c save.c saveutil.c signals.c xsm.c xtwatch.c
                     
             OBJS1 = auth.o choose.o info.o list.o lock.o log.o \
  		   mainwin.o misc.o popup.o printhex.o prop.o remote.o \
! 	           restart.o save.o saveutil.o signals.o xsm.o xtwatch.o
  
            PROGS1 = xsm
  
!            SRCS2 = xsmclient.c
!            OBJS2 = xsmclient.o
            PROGS2 = xsmclient
  
              SRCS = $(SRCS1) $(SRCS2)
--- 24,41 ----
  
             SRCS1 = auth.c choose.c info.c list.c lock.c log.c \
  		   mainwin.c misc.c popup.c printhex.c prop.c remote.c \
! 		   restart.c save.c saveutil.c signals.c xsm.c xtwatch.c \
! 		   $(SHELLSRC)
                     
             OBJS1 = auth.o choose.o info.o list.o lock.o log.o \
  		   mainwin.o misc.o popup.o printhex.o prop.o remote.o \
! 	           restart.o save.o saveutil.o signals.o xsm.o xtwatch.o \
! 		   $(SHELLOBJ)
  
            PROGS1 = xsm
  
!            SRCS2 = xsmclient.c $(SHELLSRC)
!            OBJS2 = xsmclient.o $(SHELLOBJ)
            PROGS2 = xsmclient
  
              SRCS = $(SRCS1) $(SRCS2)
***************
*** 42,46 ****
--- 50,57 ----
  #endif
  SpecialCObjectRule(restart,$(_NOOP_),'-DSYSTEM_INIT_FILE="'$(XSMDIR)'/system.xsm"')
  SpecialCObjectRule(signals,NullParameter,$(SIGNAL_DEFINES))
+ #ifdef MinixArchitecture
+ ObjectFromSpecialSource(Shell,$(TOOLKITSRC)/Shell,-I$(TOOLKITSRC))
+ #endif
  InstallNonExecFile(system.xsm,$(XSMDIR))
  InstallAppDefaults(XSm)
diff -c xc/workInProgress/xsm/restart.c:1.1.1.3 xc/workInProgress/xsm/restart.c:3.1
*** xc/workInProgress/xsm/restart.c:1.1.1.3	Mon Jan 30 17:50:29 1995
--- xc/workInProgress/xsm/restart.c	Mon Jan 30 17:50:29 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: restart.c,v 1.25 95/01/03 17:30:37 mor Exp $ */
+ /* $XFree86: xc/workInProgress/xsm/restart.c,v 3.1 1995/01/27 05:02:14 dawes Exp $ */
  /******************************************************************************
  
  Copyright (c) 1993  X Consortium
***************
*** 308,313 ****
--- 309,318 ----
  		 * The client is being restarted on a remote machine.
  		 */
  
+ #ifdef MINIX
+ 		if (env == NULL)
+ 			env= &no_env;
+ #endif
  		sprintf (logtext, "Restarting remotely on %s : ",
  		    restart_machine);
  		for (pp = args; *pp; pp++)
diff -c xc/workInProgress/xsm/xsm.h:1.1.1.2 xc/workInProgress/xsm/xsm.h:3.4
*** xc/workInProgress/xsm/xsm.h:1.1.1.2	Mon Jan 30 17:50:29 1995
--- xc/workInProgress/xsm/xsm.h	Mon Jan 30 17:50:30 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xsm.h,v 1.36 95/01/03 17:22:47 mor Exp $ */
+ /* $XFree86: xc/workInProgress/xsm/xsm.h,v 3.4 1995/01/27 10:38:33 dawes Exp $ */
  /******************************************************************************
  
  Copyright (c) 1993  X Consortium
***************
*** 48,53 ****
--- 49,58 ----
  #endif
  #endif /* PATH_MAX */
  
+ /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
+ #if defined(__STDC__) && defined(ISC)
+ extern FILE *fdopen(int, char const *);
+ #endif
  #ifndef _POSIX_SOURCE
  #define _POSIX_SOURCE
  #include <stdio.h>
diff -c xc/workInProgress/xsm/xsmclient.c:1.1.1.2 xc/workInProgress/xsm/xsmclient.c:3.1
*** xc/workInProgress/xsm/xsmclient.c:1.1.1.2	Mon Jan 30 17:50:30 1995
--- xc/workInProgress/xsm/xsmclient.c	Mon Jan 30 17:50:30 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xsmclient.c,v 1.20 94/05/20 12:25:42 mor Exp $ */
+ /* $XFree86: xc/workInProgress/xsm/xsmclient.c,v 3.1 1994/11/26 12:55:45 dawes Exp $ */
  /******************************************************************************
  
  Copyright (c) 1993  X Consortium
***************
*** 52,58 ****
--- 53,61 ----
  #include <unistd.h>
  #endif
  #include <limits.h>
+ #ifndef MINIX
  #include <sys/param.h>
+ #endif
  #ifndef PATH_MAX
  #ifdef MAXPATHLEN
  #define PATH_MAX MAXPATHLEN
diff -c xc/workInProgress/xsm/xtwatch.c:1.1.1.1 xc/workInProgress/xsm/xtwatch.c:3.0
*** xc/workInProgress/xsm/xtwatch.c:1.1.1.1	Mon Jan 30 17:50:31 1995
--- xc/workInProgress/xsm/xtwatch.c	Mon Jan 30 17:50:31 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* $XConsortium: xtwatch.c,v 1.7 94/04/17 21:15:22 mor Exp $ */
+ /* $XFree86: xc/workInProgress/xsm/xtwatch.c,v 3.0 1994/06/28 12:41:26 dawes Exp $ */
  /******************************************************************************
  
  Copyright (c) 1993  X Consortium
***************
*** 28,34 ****
  #include <X11/ICE/ICElib.h>
  #include <X11/Intrinsic.h>
  
- 
  Status
  InitWatchProcs (appContext)
  
--- 29,34 ----
***************
*** 79,83 ****
--- 79,87 ----
  {
      IceConn	ice_conn = (IceConn) client_data;
  
+ #ifdef MINIX
+     if (!MNX_IceMessagesAvailable(ice_conn))
+     	return;
+ #endif
      IceProcessMessages (ice_conn, NULL, NULL);
  }
diff -c xc/fonts/PEX/Imakefile:1.1.1.2 xc/fonts/PEX/Imakefile:3.3
*** xc/fonts/PEX/Imakefile:1.1.1.2	Mon Jan 30 17:50:33 1995
--- xc/fonts/PEX/Imakefile	Mon Jan 30 17:50:33 1995
***************
*** 1,5 ****
--- 1,6 ----
  XCOMM
  XCOMM $XConsortium: Imakefile,v 5.20 94/11/21 18:41:42 kaleb Exp $
+ XCOMM $XFree86: xc/fonts/PEX/Imakefile,v 3.3 1995/01/28 15:41:43 dawes Exp $
  XCOMM 
  XCOMM
  XCOMM Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. 
***************
*** 57,62 ****
--- 58,65 ----
      TOWFONT = ./to_wfont
  
  all:: ProgramTargetName(to_wfont) $(FONTS_BINARY)
+ 
+ install:: ProgramTargetName(to_wfont)
  
  LexFile(lex)
  
diff -c xc/fonts/PEX/lex.l:1.1.1.3 xc/fonts/PEX/lex.l:3.8
*** xc/fonts/PEX/lex.l:1.1.1.3	Mon Jan 30 17:50:33 1995
--- xc/fonts/PEX/lex.l	Mon Jan 30 17:50:33 1995
***************
*** 1,5 ****
--- 1,6 ----
  %{
  /* $XConsortium: lex.l,v 5.9 95/01/05 19:18:40 kaleb Exp $ */
+ /* $XFree86: xc/fonts/PEX/lex.l,v 3.8 1995/01/28 15:41:45 dawes Exp $ */
  
  /*****************************************************************
  
***************
*** 54,60 ****
  #include <math.h>
  #include "to_wfont.h"
  #include <X11/Xosdefs.h>
! #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
  #else
  #if defined(ISC) && __STDC__ && !defined(ISC30)
--- 55,61 ----
  #include <math.h>
  #include "to_wfont.h"
  #include <X11/Xosdefs.h>
! #if !defined(X_NOT_STDC_ENV) || defined(SCO)
  #include <stdlib.h>
  #else
  #if defined(ISC) && __STDC__ && !defined(ISC30)
diff -c xc/fonts/PEX/to_wfont.y:1.1.1.2 xc/fonts/PEX/to_wfont.y:3.3
*** xc/fonts/PEX/to_wfont.y:1.1.1.2	Mon Jan 30 17:50:34 1995
--- xc/fonts/PEX/to_wfont.y	Mon Jan 30 17:50:34 1995
***************
*** 1,5 ****
--- 1,6 ----
  %{
  /* $XConsortium: to_wfont.y,v 5.8 94/11/21 17:11:41 kaleb Exp $ */
+ /* $XFree86: xc/fonts/PEX/to_wfont.y,v 3.3 1995/01/28 15:41:47 dawes Exp $ */
  
  /*****************************************************************
  
***************
*** 640,653 ****
  				free((char *) spath->pts.pt2df);
  		if (path->subpaths != NULL)
  			free((char *) path->subpaths);
- 	free(Table);
- 	free(sp_table);
- 	free(strokes);
- 	}
- 	for (i=0; i < head.num_props; i++, head.properties++) {
- 	  if (head.properties != NULL)
- 	    free((char *) head.properties);
  	}
  }
  
  check_nstroke()
--- 641,655 ----
  				free((char *) spath->pts.pt2df);
  		if (path->subpaths != NULL)
  			free((char *) path->subpaths);
  	}
+ 	if (Table)
+ 		free(Table);
+ 	if (sp_table)
+ 		free(sp_table);
+ 	if (strokes)
+ 		free(strokes);
+ 	if (head.properties != NULL)
+ 		free((char *) head.properties);
  }
  
  check_nstroke()
diff -c xc/doc/man/Xi/Imakefile:1.1.1.1 xc/doc/man/Xi/Imakefile:3.0
*** xc/doc/man/Xi/Imakefile:1.1.1.1	Mon Jan 30 17:52:02 1995
--- xc/doc/man/Xi/Imakefile	Mon Jan 30 17:52:02 1995
***************
*** 1,3 ****
--- 1,5 ----
+ XCOMM $XFree86: xc/doc/man/Xi/Imakefile,v 3.0 1994/06/26 13:01:56 dawes Exp $
+ 
  MANDIR = $(LIBMANDIR)
  MANSUFFIX = $(LIBMANSUFFIX)
  
***************
*** 5,10 ****
--- 7,14 ----
  
  #if ExpandManNames
  InstallManPageLong(XAllDvEv,$(MANDIR),XAllowDeviceEvents)
+ InstallManPageLong(XChDCtl,$(MANDIR),XGetDeviceControl)
+ InstallManPageAliases(XGetDeviceControl,$(MANDIR),XChangeDeviceControl)
  InstallManPageLong(XChFCtl,$(MANDIR),XGetFeedbackControl)
  InstallManPageAliases(XGetFeedbackControl,$(MANDIR),XChangeFeedbackControl)
  InstallManPageLong(XChKMap,$(MANDIR),XGetDeviceKeyMapping)
***************
*** 18,23 ****
--- 22,28 ----
  InstallManPageLong(XDevBell,$(MANDIR),XDeviceBell)
  InstallManPageLong(XGetDvMo,$(MANDIR),XGetDeviceMotionEvents)
  InstallManPageAliases(XGetDeviceMotionEvents,$(MANDIR),XDeviceTimeCoord)
+ InstallManPageLong(XGetExtV,$(MANDIR),XGetExtensionVersion)
  InstallManPageLong(XGrDvBut,$(MANDIR),XGrabDeviceButton)
  InstallManPageAliases(XGrabDeviceButton,$(MANDIR),XUngrabDeviceButton)
  InstallManPageLong(XGrDvKey,$(MANDIR),XGrabDeviceKey)
***************
*** 40,45 ****
--- 45,51 ----
  InstallManPageLong(XSetMode,$(MANDIR),XSetDeviceMode)
  #else
  InstallManPage(XAllDvEv,$(MANDIR))
+ InstallManPage(XChDCtl,$(MANDIR))
  InstallManPage(XChFCtl,$(MANDIR))
  InstallManPage(XChKMap,$(MANDIR))
  InstallManPage(XChMMap,$(MANDIR))
***************
*** 48,53 ****
--- 54,60 ----
  InstallManPage(XChgPtr,$(MANDIR))
  InstallManPage(XDevBell,$(MANDIR))
  InstallManPage(XGetDvMo,$(MANDIR))
+ InstallManPage(XGetExtV,$(MANDIR))
  InstallManPage(XGrDvBut,$(MANDIR))
  InstallManPage(XGrDvKey,$(MANDIR))
  InstallManPage(XGrabDev,$(MANDIR))
diff -c xc/test/xsuite/xtest/src/libproto/Utils.c:1.1.1.1 xc/test/xsuite/xtest/src/libproto/Utils.c:3.1
*** xc/test/xsuite/xtest/src/libproto/Utils.c:1.1.1.1	Mon Jan 30 17:53:33 1995
--- xc/test/xsuite/xtest/src/libproto/Utils.c	Mon Jan 30 17:53:33 1995
***************
*** 37,42 ****
--- 37,43 ----
   * purpose.  It is provided "as is" without express or implied warranty.
   *
   * $XConsortium: Utils.c,v 1.5 94/04/17 21:01:34 rws Exp $
+  * $XFree86: xc/test/xsuite/xtest/src/libproto/Utils.c,v 3.1 1994/08/01 12:24:24 dawes Exp $
   */
  /*
   * ***************************************************************************
***************
*** 96,102 ****
  	return(buf);
  }
  
! 
  /*
   * These are routines found in BSD and not found in SYSV.
   */
--- 97,103 ----
  	return(buf);
  }
  
! #if !defined(__bsdi__) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__linux__)
  /*
   * These are routines found in BSD and not found in SYSV.
   */
***************
*** 163,165 ****
--- 164,167 ----
      }
      return i;
  }
+ #endif
