                       Release 6 Public Patch #11
                             X Consortium

This patch comes in two parts: this file and the file "XFree86-3.1.1.tar.gz".

(If you obtain this patch via the xstuff mail daemon, the second part
is made from the files "XFree.uaa" through "XFree.uaz", which you must 
concatenate together to produce XFree.uu, and then uudecode to produce 
XFree86-3.1.1.tar.gz)

To apply this patch:

cd to the top of the source tree (to the directory containing the "xc"
and "contrib" subdirectories) and do:
        patch -p -s < ThisFile
Patch will work silently unless an error occurs.  If you want to
watch patch do its thing, leave out the "-s" argument to patch.

Next, from the same top-level directory do:
        rm -rf xc/programs/Xserver/hw/xfree86

Next, from the same top-level directory do:
        gunzip -c XFree86-3.1.1.tar.gz | tar xpf -

This patch creates the following new files:
    xc/programs/Xserver/hw/xfree86/...
    xc/programs/Xserver/include/Imakefile
    xc/lib/X11/jump_funcs
    xc/lib/X11/jump_ignore
    xc/lib/X11/jump_vars
    xc/lib/Xt/jump_funcs
    xc/lib/Xt/jump_ignore
    xc/lib/Xt/jump_vars
    xc/lib/Xaw/jump_funcs
    xc/lib/Xaw/jump_ignore
    xc/lib/Xaw/jump_vars
    xc/lib/XIE/jump_funcs
    xc/lib/XIE/jump_ignore
    xc/lib/XIE/jump_vars
    xc/lib/PEX5/jump_funcs
    xc/lib/PEX5/jump_ignore
    xc/lib/PEX5/jump_vars
If you are using a symbolic link tree, you will need to create new links.

Finally, to rebuild after applying this patch, cd to the "xc" subdirectory 
and do:
        make Everything >& every.log

This patch updates the X server xfree86 ddx to version 3.1.1 and many
related fixes including:
    fonts/PEX: improved flex support.
    config: NCR alloca support
    config: consistent imake variable usage on XFree86 platforms.
    config: shared library support on Linux.
    config: internationalization (i18n) on Linux.
    imake: POSIX-2 compliant use of test.
    util: lndir ignore "CVS" directories.
    sessreg: enhancements to implementation.
    xinit: fix bugs on SVR4 and Linux.
    xterm: better Linux support.
    twm: improved flex support.
    server: getnodeadd() does not take any parameters.
    server/mi: nit in Imakefile blows up on WinNT.
    server: Xsun on NetBSD/SPARC.

Prereq: public-patch-10

*** -	Sun Jan 29 12:45:35 1995
--- xc/bug-report	Sun Jan 29 12:44:48 1995
***************
*** 3,9 ****
  
       VERSION:
  
! R6, public-patch-10
  [X Consortium public patches edit this line to indicate the patch level]
  
       CLIENT MACHINE and OPERATING SYSTEM:
--- 3,9 ----
  
       VERSION:
  
! R6, public-patch-11
  [X Consortium public patches edit this line to indicate the patch level]
  
       CLIENT MACHINE and OPERATING SYSTEM:
*** -	Sun Jan 29 07:17:03 1995
--- xc/fonts/PEX/Imakefile	Sun Jan 29 07:17:03 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.19 94/04/17 22:20:44 rws Exp $
  XCOMM 
  XCOMM
  XCOMM Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. 
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.20 94/11/21 18:41:42 kaleb Exp $
  XCOMM 
  XCOMM
  XCOMM Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. 
***************
*** 41,47 ****
       YFLAGS = -d
  
    LINTFLAGS = -u
!        LIBS = -ll MathLibrary
  
        FONTS = Roman Roman_M 
  
--- 41,47 ----
       YFLAGS = -d
  
    LINTFLAGS = -u
!        LIBS = LexLib MathLibrary
  
        FONTS = Roman Roman_M 
  
*** -	Sun Jan 29 07:17:05 1995
--- xc/fonts/PEX/to_wfont.y	Sun Jan 29 07:17:04 1995
***************
*** 1,5 ****
  %{
! /* $XConsortium: to_wfont.y,v 5.7 94/04/17 20:10:08 rws Exp $ */
  
  /*****************************************************************
  
--- 1,5 ----
  %{
! /* $XConsortium: to_wfont.y,v 5.8 94/11/21 17:11:41 kaleb Exp $ */
  
  /*****************************************************************
  
***************
*** 351,357 ****
  
  yyerror()
  {
! #ifndef __bsdi__
  	extern int      yylineno;
  #endif
  #	define ERR_SIZE (sizeof(err_string) / sizeof(char *))
--- 351,357 ----
  
  yyerror()
  {
! #if !defined(CSRG_BASED) && !defined(linux)
  	extern int      yylineno;
  #endif
  #	define ERR_SIZE (sizeof(err_string) / sizeof(char *))
***************
*** 374,383 ****
  		str = err_string[yyerrno-1];
  	else
  		str = "Syntax error";
! #ifdef __bsdi__
! 		fprintf(stderr, "%s.\n", str);
! #else
  		fprintf(stderr, "line %d: %s.\n", yylineno, str);
  #endif
  	freeall();
  	(void) unlink(fname);
--- 374,383 ----
  		str = err_string[yyerrno-1];
  	else
  		str = "Syntax error";
! #if !defined(CSRG_BASED) && !defined(linux)
  		fprintf(stderr, "line %d: %s.\n", yylineno, str);
+ #else
+ 		fprintf(stderr, "%s.\n", str);
  #endif
  	freeall();
  	(void) unlink(fname);
*** -	Sun Jan 29 07:17:06 1995
--- xc/config/cf/Imake.cf	Sun Jan 29 07:17:05 1995
***************
*** 1,15 ****
! XCOMM $XConsortium: Imake.cf,v 1.12 94/03/29 15:42:08 gildea Exp $
  /*
   * To add support for another platform:
   * 
   *     1.  Identify a machine-specific cpp symbol.  If your preprocessor 
   *         does not have any built in, you will need to add the symbol to the
!  *         cpp_argv table in config/imakemdep.h and rebuild imake with the
!  *         BOOTSTRAPCFLAGS variable set (see the macII for an example).
   *
   *     2.  Add all machine-specific cpp symbols (either defined by you or by
   *         the preprocessor or compiler) to the predefs table in 
!  *         config/imakemdep.h.
   *
   *     3.  But a new #ifdef block below that defines MacroIncludeFile and
   *         MacroFile for your new platform and then #undefs the machine-
--- 1,15 ----
! XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
  /*
   * To add support for another platform:
   * 
   *     1.  Identify a machine-specific cpp symbol.  If your preprocessor 
   *         does not have any built in, you will need to add the symbol to the
!  *         cpp_argv table in config/imake/imakemdep.h and rebuild imake with
!  *         the BOOTSTRAPCFLAGS variable set (see the macII for an example).
   *
   *     2.  Add all machine-specific cpp symbols (either defined by you or by
   *         the preprocessor or compiler) to the predefs table in 
!  *         config/imake/imakemdep.h.
   *
   *     3.  But a new #ifdef block below that defines MacroIncludeFile and
   *         MacroFile for your new platform and then #undefs the machine-
***************
*** 46,59 ****
--- 46,67 ----
  #define MacroFile bsdi.cf
  #undef bsdi
  #define BSD386Architecture
+ #define i386BsdArchitecture
+ #define i386Architecture
  #endif /* bsdi */
  
  #ifdef __NetBSD__
  #define MacroIncludeFile <NetBSD.cf>
  #define MacroFile NetBSD.cf
  #undef __NetBSD__
+ #define NetBSDArchitecture
  #ifdef __i386__
  #define i386BsdArchitecture
+ #define i386Architecture
+ #endif
+ #if defined(__sparc__) || defined(sparc)
+ #define SparcArchitecture
+ #undef sparc
  #endif
  #endif /* NetBSD */
  
***************
*** 61,69 ****
  #define MacroIncludeFile <FreeBSD.cf>
  #define MacroFile FreeBSD.cf
  #undef __FreeBSD__
- #ifdef __i386__
  #define FreeBSDArchitecture
  #define i386BsdArchitecture
  #endif
  #endif /* __FreeBSD__ */
  
--- 69,78 ----
  #define MacroIncludeFile <FreeBSD.cf>
  #define MacroFile FreeBSD.cf
  #undef __FreeBSD__
  #define FreeBSDArchitecture
+ #ifdef __i386__
  #define i386BsdArchitecture
+ #define i386Architecture
  #endif
  #endif /* __FreeBSD__ */
  
***************
*** 93,98 ****
--- 102,111 ----
  #ifdef sun
  #define MacroIncludeFile <sun.cf>
  #define MacroFile sun.cf
+ #ifdef SVR4
+ #undef SVR4
+ #define SVR4Architecture
+ #endif
  #ifdef sparc
  #undef sparc
  #define SparcArchitecture
***************
*** 120,128 ****
--- 133,152 ----
  #define MacroIncludeFile <usl.cf>
  #define MacroFile usl.cf
  #undef USL
+ #undef SVR4
  #define SVR4Architecture
+ #define i386Architecture
  #endif /* USL */
  
+ #ifdef NCR
+ #define MacroIncludeFile <ncr.cf>
+ #define MacroFile ncr.cf
+ #undef NCR
+ #undef SVR4
+ #define SVR4Architecture
+ #define i386Architecture
+ #endif /* NCR */
+ 
  #ifdef apollo
  #define MacroIncludeFile <apollo.cf>
  #define MacroFile apollo.cf
***************
*** 263,274 ****
--- 287,318 ----
  # endif
  #endif /* MOTOROLA */
  
+ #ifdef SVR4
+ # ifdef i386
+ #  define i386Architecture
+ # endif
+ # define SVR4Architecture
+ # define MacroIncludeFile <svr4.cf>
+ # define MacroFile svr4.cf
+ # undef SVR4
+ #endif /* SVR4 */
+ 
+ #ifdef SYSV
+ # ifdef i386
+ #  define MacroIncludeFile <x386.cf>
+ #  define MacroFile x386.cf
+ #  define i386SVR3Architecture
+ # endif
+ #endif /* SYSV */
+ 
  #ifdef SYSV386
  # ifdef SVR4
  #  define i386Architecture
+ #  define SVR4Architecture
  #  define i386SVR4Architecture
  #  define MacroIncludeFile <svr4.cf>
  #  define MacroFile svr4.cf
+ #  undef SVR4
  # else
  #  define MacroIncludeFile <x386.cf>
  #  define MacroFile x386.cf
***************
*** 320,337 ****
  #define Win32Architecture
  #endif /* WIN32 */
  
- #ifdef NCR
- #define MacroIncludeFile <ncr.cf>
- #define MacroFile ncr.cf
- #undef NCR
- #define SVR4Architecture
- #endif /* NCR */
- 
  #ifdef linux 
  #define MacroIncludeFile <linux.cf>
  #define MacroFile linux.cf
  #undef linux
  #define LinuxArchitecture
  #endif /* linux */
  
  #ifdef __uxp__
--- 364,375 ----
  #define Win32Architecture
  #endif /* WIN32 */
  
  #ifdef linux 
  #define MacroIncludeFile <linux.cf>
  #define MacroFile linux.cf
  #undef linux
  #define LinuxArchitecture
+ #define i386Architecture
  #endif /* linux */
  
  #ifdef __uxp__
*** -	Sun Jan 29 07:17:10 1995
--- xc/config/cf/usl.cf	Sun Jan 29 07:17:10 1995
***************
*** 1,6 ****
! XCOMM platform:  $XConsortium: usl.cf,v 1.30 94/03/29 15:42:18 gildea Exp $
  
! #define OSName			UNIX System V/386 Release 4.2 Version 1
  XCOMM operating system:  OSName
  #define OSMajorVersion		4
  #define OSMinorVersion		2
--- 1,6 ----
! XCOMM platform:  $XConsortium: usl.cf,v 1.35 95/01/12 15:37:24 kaleb Exp $
  
! #define OSName			UNIX System V/386 Release 4.2 Version 1.1.1
  XCOMM operating system:  OSName
  #define OSMajorVersion		4
  #define OSMinorVersion		2
***************
*** 8,14 ****
  
  #define BootstrapCFlags		-DUSL
  #define NeedWidePrototypes	NO	/* experimental */
! #define ServerExtraDefines	-D__USLC__
! #define ServerOSDefines		-DDDXTIME -DDDXOSINIT
! #define i386Architecture
  #include <svr4.cf>
--- 8,13 ----
  
  #define BootstrapCFlags		-DUSL
  #define NeedWidePrototypes	NO	/* experimental */
! #define ServerExtraDefines	-D__USLC__ XFree86ServerDefines
! #define ServerOSDefines		-DDDXTIME XFree86ServerOSDefines
  #include <svr4.cf>
*** -	Sun Jan 29 07:17:11 1995
--- xc/config/cf/svr4.cf	Sun Jan 29 07:17:11 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: svr4.cf,v 1.6 94/04/08 18:56:33 rws Exp $
  /*
   * A default OS name
   */
--- 1,4 ----
! XCOMM $XConsortium: svr4.cf,v 1.11 95/01/25 16:32:39 kaleb Exp $
  /*
   * A default OS name
   */
***************
*** 28,37 ****
  #define	OSTeenyVersion	0
  #endif
  #ifndef BootstrapCFlags
  #ifdef SYSV386
! #define BootstrapCFlags         -DSVR4 -DSYSV386
  #else
! #define BootstrapCFlags         -DSVR4
  #endif
  #endif
  
--- 28,41 ----
  #define	OSTeenyVersion	0
  #endif
  #ifndef BootstrapCFlags
+ #ifdef i386Architecture
+ #define BootstrapCFlags		-DSVR4 -Di386
+ #else
  #ifdef SYSV386
! #define BootstrapCFlags		-DSVR4 -Di386
  #else
! #define BootstrapCFlags		-DSVR4
! #endif
  #endif
  #endif
  
***************
*** 74,79 ****
--- 78,89 ----
  #define	YaccCmd	/usr/ccs/bin/yacc
  #endif
  
+ #if (OSMinorVersion == 0)
+ #ifndef XawI18nDefines
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING
+ #endif
+ #endif
+ 
  #ifdef i386Architecture
  #ifndef StandardDefines
  #define StandardDefines		-DSVR4 -Di386
***************
*** 95,101 ****
  #endif
  #endif
  #ifndef ServerOSDefines
! #define ServerOSDefines -DDDXTIME -DDDXOSINIT
  #endif
  #endif
  
--- 105,111 ----
  #endif
  #endif
  #ifndef ServerOSDefines
! #define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
  #endif
  #endif
  
***************
*** 120,126 ****
  #define FileManSuffix           4
  #endif
  
- #include <sv4Lib.rules>
  #ifdef i386Architecture
  #include <xfree86.cf>
  #endif
--- 130,137 ----
  #define FileManSuffix           4
  #endif
  
  #ifdef i386Architecture
  #include <xfree86.cf>
  #endif
+ 
+ #include <sv4Lib.rules>
*** -	Sun Jan 29 07:17:12 1995
--- xc/config/cf/ncr.cf	Sun Jan 29 07:17:12 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: ncr.cf,v 1.11 94/06/04 16:47:47 rws Exp $
  #define OSName			Unix System V Release 4/MP-RAS
  #define OSVendor		NCR
  XCOMM operating system:  OSName
--- 1,4 ----
! XCOMM platform:  $XConsortium: ncr.cf,v 1.19 95/01/25 16:28:38 kaleb Exp $
  #define OSName			Unix System V Release 4/MP-RAS
  #define OSVendor		NCR
  XCOMM operating system:  OSName
***************
*** 12,20 ****
  #define StandardDefines		-DSVR4 -DNCR -Di386 -DXML -DXI18N
  #define DefaultCCOptions	-Xc -Hnocopyr -W0,-asm
  #define DefaultCDebugFlags	-O3
! #define ServerExtraDefines      -DNO_SECONDARY AllocateLocalDefines
! #define ServerOSDefines         -DDDXTIME -DDDXOSINIT
! #define AllocateLocalDefines	-DNO_ALLOCA
  
  XCOMM This has not been tested, don't turn it on yet.
  XCOMM #define ExtensionOSDefines	-DXTESTEXT1
--- 12,20 ----
  #define StandardDefines		-DSVR4 -DNCR -Di386 -DXML -DXI18N
  #define DefaultCCOptions	-Xc -Hnocopyr -W0,-asm
  #define DefaultCDebugFlags	-O3
! #define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
! #define ServerExtraDefines      -DNO_SECONDARY AllocateLocalDefines XFree86ServerDefines
! #define ServerOSDefines         -DDDXTIME XFree86ServerOSDefines
  
  XCOMM This has not been tested, don't turn it on yet.
  XCOMM #define ExtensionOSDefines	-DXTESTEXT1
***************
*** 103,111 ****
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
  		$(RM) $(DESTDIR)destdir/$$i.z;\  			@@\
! 		$(LN) destdir/file.z $(DESTDIR)destdir/$$i.z;\  @@\
  		); \							@@\
  	done
  
- #define i386Architecture
  #include <svr4.cf>
--- 103,110 ----
  	for i in aliases; do \                                          @@\
  		(set -x; \						@@\
  		$(RM) $(DESTDIR)destdir/$$i.z;\  			@@\
! 		(cd $(DESTDIR)destdir; $(LN) file.z $$i.z);\		@@\
  		); \							@@\
  	done
  
  #include <svr4.cf>
*** -	Sun Jan 29 07:17:13 1995
--- xc/config/cf/sun.cf	Sun Jan 29 07:17:13 1995
***************
*** 1,6 ****
! XCOMM platform:  $XConsortium: sun.cf,v 1.134 94/08/17 18:56:43 matt Exp $
  
! #ifdef SVR4
  #ifdef i386Architecture
  #define OSName            SunOS 5.1 x86
  XCOMM operating system:  OSName
--- 1,6 ----
! 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
***************
*** 132,139 ****
--- 132,149 ----
  #endif
  #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
+ #endif
  
  #if OSMajorVersion > 4
  #define BootstrapCFlags	  -DSVR4
***************
*** 141,147 ****
  #define XawI18nDefines    -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
  #endif
  #ifdef i386Architecture
! #define StandardDefines	  -Dsun -Di386 -DSVR4
  #else
  #define StandardDefines	  -Dsun -DSVR4
  #endif
--- 151,157 ----
  #define XawI18nDefines    -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
  #endif
  #ifdef i386Architecture
! #define StandardDefines	  -Dsun -Di386 -DSVR4 -D__i386
  #else
  #define StandardDefines	  -Dsun -DSVR4
  #endif
***************
*** 174,180 ****
  #if HasSunCplusplus || HasCenterLineCplusplus
  #define PositionIndependentCplusplusFlags -pic
  #endif
- #include <svr4.cf>
  #else
  #define InstKmemFlags	  -g kmem -m 2755
  #include <sunLib.rules>
--- 184,189 ----
***************
*** 204,209 ****
--- 213,227 ----
  #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
  #if HasGcc2
  #define OptimizedCDebugFlags -O2
  #else
***************
*** 215,221 ****
  	$(CC) -c $(CFLAGS) $*.c
  
  #endif /* HasGcc2 (else) */
! #else
  
  #define AllocateLocalDefines -DINCLUDE_ALLOCA_H
  
--- 233,239 ----
  	$(CC) -c $(CFLAGS) $*.c
  
  #endif /* HasGcc2 (else) */
! #else /* not HasGcc */
  
  #define AllocateLocalDefines -DINCLUDE_ALLOCA_H
  
***************
*** 259,267 ****
  
  #define PexCCOptions DefaultCCOptions
  
! #endif
  
  #if OSMajorVersion < 5
  #define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
  #define LibraryCCOptions /* don't want special floating point */
  #endif
--- 277,289 ----
  
  #define PexCCOptions DefaultCCOptions
  
! #endif /* HasGcc (else) */
  
  #if OSMajorVersion < 5
  #define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
  #define LibraryCCOptions /* don't want special floating point */
+ #endif
+ 
+ #if OSMajorVersion > 4
+ #include <svr4.cf>
  #endif
*** -	Sun Jan 29 07:17:15 1995
--- xc/config/cf/hp.cf	Sun Jan 29 07:17:15 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: hp.cf,v 1.68 94/06/03 21:38:44 matt Exp $
  
  #define OSName                 HP-UX 9.1
  XCOMM operating system:  OSName
--- 1,4 ----
! XCOMM platform:  $XConsortium: hp.cf,v 1.70 94/10/28 20:47:55 dpw Exp $
  
  #define OSName                 HP-UX 9.1
  XCOMM operating system:  OSName
***************
*** 79,88 ****
--- 79,92 ----
  #define ExpandManNames         YES
  #define HasPutenv              YES
  #define HasNdbm		       YES
+ #define DBMLibrary	       /usr/lib/libdbm.a
  #define PrimaryScreenResolution	91
  #define ExtensionOSDefines     -DHPINPUT -DXTESTEXT1
  #define XhpServer              YES
+ #define ServerExtraSysLibs     -ldld
+ #ifndef BuildXInputExt
  #define BuildXInputExt         YES
+ #endif
  #define HPFastScrolling        YES
  #define BuildServer            __hp9000s700
  #define NeedBerklib            (BuildServer|BuildFontServer)
*** -	Sun Jan 29 07:17:16 1995
--- xc/config/cf/Amoeba.cf	Sun Jan 29 07:17:16 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: Amoeba.cf,v 1.4 94/04/04 13:20:04 dpw Exp $
  
  /*  The presence of this configuration file in the X distribution
   *  does not imply full support for the system it describes.
--- 1,4 ----
! XCOMM platform:  $XConsortium: Amoeba.cf,v 1.7 95/01/05 19:38:42 kaleb Exp $
  
  /*  The presence of this configuration file in the X distribution
   *  does not imply full support for the system it describes.
***************
*** 23,35 ****
  
  /* Configuration defaults */
  #ifndef AmoebaTop
! #define AmoebaTop		/usr/proj/amwork
  #endif
  #ifndef AmoebaBin
  #define AmoebaBin		$(ATOP)/bin.sun4
  #endif
  #ifndef AmoebaConf
! #define AmoebaConf		/usr/proj/amwork/conf/amoeba
  #endif
  
  #define HasNdbm			YES
--- 23,35 ----
  
  /* Configuration defaults */
  #ifndef AmoebaTop
! #define AmoebaTop		__AM_TOP__
  #endif
  #ifndef AmoebaBin
  #define AmoebaBin		$(ATOP)/bin.sun4
  #endif
  #ifndef AmoebaConf
! #define AmoebaConf		__AM_CONF__
  #endif
  
  #define HasNdbm			YES
***************
*** 57,71 ****
  #define LexLib			/* not needed */
  
  #define PexCCOptions		DefaultCCOptions
! #define ServerOSDefines		-DDDXOSINIT
  
! #define UsrLibDir               $(DESTDIR)/public/module/x11/lib
! #define LibDir                  $(DESTDIR)/public/module/x11/lib
! #define ManDirectoryRoot        $(DESTDIR)/public/module/x11/man
! #define BinDir                  $(DESTDIR)/public/module/x11/bin
! #define IncRoot                 $(DESTDIR)/public/module/x11/include
! #define FontDir                 $(DESTDIR)/public/module/x11/fonts/$(ARCH)
! #define DefaultRGBDatabase      $(DESTDIR)/public/module/x11/lib/rgb/$(ARCH)/rgb
  
  #define ManSuffix               1
  #define ManPath                 ManDirectoryRoot
--- 57,71 ----
  #define LexLib			/* not needed */
  
  #define PexCCOptions		DefaultCCOptions
! #define ServerOSDefines		XFree86ServerOSDefines
  
! #define UsrLibDir               $(DESTDIR)/profile/module/x11/lib
! #define LibDir                  $(DESTDIR)/profile/module/x11/lib
! #define ManDirectoryRoot        $(DESTDIR)/profile/module/x11/man
! #define BinDir                  $(DESTDIR)/profile/module/x11/bin
! #define IncRoot                 $(DESTDIR)/profile/module/x11/include
! #define FontDir                 $(DESTDIR)/profile/module/x11/fonts/$(ARCH)
! #define DefaultRGBDatabase      $(DESTDIR)/profile/module/x11/lib/rgb/$(ARCH)/rgb
  
  #define ManSuffix               1
  #define ManPath                 ManDirectoryRoot
***************
*** 85,92 ****
  #define FontDefines             -DFONT_SNF
  #define ConnectionFlags         -DAMTCPCONN -DAMRPCCONN
  #define ServerXdmcpDefines	/* no -DXDMCP */
  #define NdbmDefines		-DSDBM -DNDBM -I$(INCLUDESRC)
! #define DBMLibrary		$(LIBSRC)/sdbm/libsdbm.a
  
  #if defined(i386Architecture)
  #ifndef AckToolset
--- 85,93 ----
  #define FontDefines             -DFONT_SNF
  #define ConnectionFlags         -DAMTCPCONN -DAMRPCCONN
  #define ServerXdmcpDefines	/* no -DXDMCP */
+ #define UseRgbTxt		YES
  #define NdbmDefines		-DSDBM -DNDBM -I$(INCLUDESRC)
! #define DBMLibrary		/* $(LIBSRC)/sdbm/libsdbm.a */
  
  #if defined(i386Architecture)
  #ifndef AckToolset
***************
*** 191,196 ****
--- 192,199 ----
  ALDFLAGS        = -mam_sparc -n -Ttext 40000 -Bstatic -e start -L$(SPARCLIBDIR)
  #endif
  
+ #define BootstrapCFlags		-DAMOEBA -DCROSS_$(ARCH) -DCROSS_COMPILE
+ 
  /*
   * The rest of this files consists of rules to allow cross-compilation
   * and installation of binaries and data files from the Unix host to
***************
*** 207,221 ****
  
  /* ComplexHostProgramTarget - Compile a program such that we can run
   * it on this host, i.e., don't use the default cross compiler.
-  * Note: this has no 'clean' target because that would cause the
-  * build to remove imake as well.  That will then be rebuilt without
-  * the proper BOOTSTRAPCFLAGS.
   */
  #ifndef ComplexHostProgramTarget
  #define	ComplexHostProgramTarget(program)				@@\
                CC=cc							@@\
      STD_INCLUDES=							@@\
!           CFLAGS=$(TOP_INCLUDES) $(INCLUDES)				@@\
  EXTRA_LOAD_FLAGS=							@@\
          PROGRAM = program						@@\
  									@@\
--- 210,221 ----
  
  /* ComplexHostProgramTarget - Compile a program such that we can run
   * it on this host, i.e., don't use the default cross compiler.
   */
  #ifndef ComplexHostProgramTarget
  #define	ComplexHostProgramTarget(program)				@@\
                CC=cc							@@\
      STD_INCLUDES=							@@\
!           CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)		@@\
  EXTRA_LOAD_FLAGS=							@@\
          PROGRAM = program						@@\
  									@@\
***************
*** 226,232 ****
  	HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
  									@@\
  DependTarget()								@@\
! LintTarget()
  #endif /* ComplexHostProgramTarget */
  
  #ifndef SimpleHostProgramTarget
--- 226,236 ----
  	HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
  									@@\
  DependTarget()								@@\
! 									@@\
! LintTarget()								@@\
! 									@@\
! clean::									@@\
! 	RemoveFile(ProgramTargetName(program))
  #endif /* ComplexHostProgramTarget */
  
  #ifndef SimpleHostProgramTarget
*** -	Sun Jan 29 07:17:17 1995
--- xc/config/cf/bsd.cf	Sun Jan 29 07:17:17 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: bsd.cf,v 1.21 93/12/13 17:17:22 dpw Exp $
  
  #define OSName            4.3bsd
  XCOMM operating system:  OSName
--- 1,4 ----
! XCOMM platform:  $XConsortium: bsd.cf,v 1.22 95/01/05 19:30:02 kaleb Exp $
  
  #define OSName            4.3bsd
  XCOMM operating system:  OSName
***************
*** 6,12 ****
  #define OSMinorVersion    3
  
  #define BootstrapCFlags -DNOSTDHDRS
! #define StandardDefines -DNOSTDHDRS
  #define HasVoidSignalReturn NO
  #define HasBsearch NO
  #define DirFailPrefix -
--- 6,12 ----
  #define OSMinorVersion    3
  
  #define BootstrapCFlags -DNOSTDHDRS
! #define StandardDefines -DNOSTDHDRS -DCSRG_BASED
  #define HasVoidSignalReturn NO
  #define HasBsearch NO
  #define DirFailPrefix -
*** -	Sun Jan 29 07:17:18 1995
--- xc/config/cf/bsdi.cf	Sun Jan 29 07:17:18 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: bsdi.cf,v 1.11 94/04/07 15:42:57 rws Exp $
  
  #define OSName            BSD/386 1.1
  #define OSVendor          BSDI
--- 1,4 ----
! XCOMM platform:  $XConsortium: bsdi.cf,v 1.14 95/01/11 18:27:52 kaleb Exp $
  
  #define OSName            BSD/386 1.1
  #define OSVendor          BSDI
***************
*** 17,22 ****
--- 17,23 ----
  #define TroffCmd	groff -Tps
  #define SetTtyGroup	YES
  #define HasNdbm		YES
+ #define HasWChar32      YES
  #define DirFailPrefix -
  #define AvoidNullMakeCommand YES
  # ifndef GccUsesGas
***************
*** 29,38 ****
  # define GccGasOption /**/
  #endif
  
! #define ServerExtraDefines GccGasOption
! #define ServerOSDefines -DDDXTIME
  #define AsmDefines -DUSE_GAS
  
  #undef  InstallCmd
  #define InstallCmd /usr/bin/install
  #undef	TblCmd
--- 30,42 ----
  # define GccGasOption /**/
  #endif
  
! #define ServerExtraDefines GccGasOption XFree86ServerDefines
! #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
! #define XFree86ConsoleDefines /**/
  #define AsmDefines -DUSE_GAS
  
+ #define StandardDefines	-DCSRG_BASED
+ 
  #undef  InstallCmd
  #define InstallCmd /usr/bin/install
  #undef	TblCmd
***************
*** 98,105 ****
  /*
   * These seem redundant, but leave them in for now.
   */
- #define i386BsdArchitecture 1
  #define i386Bsd 1
  #define i386Bsdi 1
  #include <xfree86.cf>
- #define HasWChar32      YES
--- 102,107 ----
*** -	Sun Jan 29 07:17:19 1995
--- xc/config/cf/FreeBSD.cf	Sun Jan 29 07:17:19 1995
***************
*** 1,10 ****
! XCOMM platform:  $XConsortium: FreeBSD.cf,v 1.1 94/03/29 15:34:45 gildea Exp $
  
  #define OSName            FreeBSD 1.1
  #define OSVendor          /**/
  XCOMM operating system:  OSName
  #define OSMajorVersion    1
  #define OSMinorVersion    1
  
  #define HasPutenv       YES
  #define HasBSD44Sockets YES
--- 1,11 ----
! 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
***************
*** 36,54 ****
  #define CcCmd gcc
  #define DefaultCCOptions /**/
  
! #ifdef __i386__
  #define OptimizedCDebugFlags -m486 -O2
- #define ServerOSDefines	-DDDXTIME
  #else
  #define OptimizedCDebugFlags -O2
- #define ServerOSDefines /**/
  #endif
  #define ServerExtraDefines GccGasOption
  
  #define TroffCmd        groff -Tps
  #define SetTtyGroup     YES
  #define HasNdbm         YES
  #define HasShm          YES
  
  #define HasLibCrypt	YES
  
--- 37,58 ----
  #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
  
***************
*** 56,61 ****
  
  #include <bsdLib.rules>
  
! #ifdef __i386__
  #include <xfree86.cf>
  #endif
--- 60,65 ----
  
  #include <bsdLib.rules>
  
! #ifdef i386Architecture
  #include <xfree86.cf>
  #endif
*** -	Sun Jan 29 07:17:20 1995
--- xc/config/cf/NetBSD.cf	Sun Jan 29 07:17:20 1995
***************
*** 1,4 ****
! XCOMM platform:  $XConsortium: NetBSD.cf,v 1.1 94/03/29 15:34:45 gildea Exp $
  
  #define OSName		NetBSD
  #define	OSVendor	/**/
--- 1,4 ----
! XCOMM platform:  $XConsortium: NetBSD.cf,v 1.4 95/01/05 19:39:34 kaleb Exp $
  
  #define OSName		NetBSD
  #define	OSVendor	/**/
***************
*** 41,61 ****
  #endif
  
  #define CcCmd gcc
! #define DefaultCCOptions /**/
  
! #ifdef __i386__
! #define OptimizedCDebugFlags -m486 -O2
! #define ServerOSDefines	-DDDXTIME
  #else
! #define OptimizedCDebugFlags -O2
! #define ServerOSDefines /**/
  #endif
! #define ServerExtraDefines GccGasOption
  
  #define TroffCmd        groff -Tps
  #define SetTtyGroup     YES
  #define HasNdbm         YES
  #define HasShm          YES
  
  #define HasLibCrypt	YES
  
--- 41,74 ----
  #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
  
***************
*** 65,70 ****
--- 78,84 ----
  XCOMM imake rules.
  
  #define ManSuffix	1
+ #define FileManSuffix	5
  #define ManSourcePath	$(MANPATH)/cat
  
  #define InstallManPageLong(file,destdir,dest)                           @@\
***************
*** 115,120 ****
  
  #include <bsdLib.rules>
  
! #ifdef __i386__
  # include <xfree86.cf>
  #endif
--- 129,149 ----
  
  #include <bsdLib.rules>
  
! #ifdef SparcArchitecture
! #ifndef Xsun24Server
! #define Xsun24Server	NO
! #endif
! #ifndef XsunServer
! #define XsunServer	YES
! #endif
! #ifndef XsunMonoServer
! #define XsunMonoServer	YES
! #endif
! #ifndef UseRGBTxt
! #define UseRGBTxt	YES
! #endif
! #endif
! 
! #ifdef i386Architecture
  # include <xfree86.cf>
  #endif
*** -	Sun Jan 29 07:17:21 1995
--- xc/config/cf/bsdLib.tmpl	Sun Jan 29 07:17:21 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: bsdLib.tmpl,v 1.1 94/03/29 15:34:46 gildea Exp $
  
  /*
   * NetBSD/FreeBSD shared library template
--- 1,4 ----
! XCOMM $XConsortium: bsdLib.tmpl,v 1.2 95/01/23 19:07:12 kaleb Exp $
  
  /*
   * NetBSD/FreeBSD shared library template
***************
*** 11,15 ****
  #define SharedXawReqs /**/
  #endif
  #ifndef SharedXmuReqs
! #define SharedXmuReqs $(XTOOLONLYLIB) $(XONLYLIB)
  #endif
--- 11,15 ----
  #define SharedXawReqs /**/
  #endif
  #ifndef SharedXmuReqs
! #define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB)
  #endif
*** -	Sun Jan 29 07:17:22 1995
--- xc/config/cf/linux.cf	Sun Jan 29 07:17:22 1995
***************
*** 1,17 ****
! XCOMM platform:  $XConsortium: linux.cf,v 1.4 94/04/07 15:46:42 rws Exp $
  
  #define OSName			Linux
  #define OSVendor		/**/
  #define OSMajorVersion		1
  #define OSMinorVersion		0
- #define OSMinorVersion		0
  #define OSTeenyVersion		0
- #define OSDefines		-Dlinux -D__i386__ -D_POSIX_SOURCE \
- 				-D_BSD_SOURCE -D_GNU_SOURCE
  
  #define HasGcc			YES
  #define HasGcc2			YES
- #define HasCplusplus		YES
  #define HasGcc2ForCplusplus	YES
  #define GccUsesGas		YES
  #define UseGas			YES
--- 1,16 ----
! XCOMM platform:  $XConsortium: linux.cf,v 1.11 95/01/23 18:32:03 kaleb Exp $
  
  #define OSName			Linux
  #define OSVendor		/**/
  #define OSMajorVersion		1
  #define OSMinorVersion		0
  #define OSTeenyVersion		0
  
+ #ifndef UseElfFormat
+ #define UseElfFormat		NO
+ #endif
  #define HasGcc			YES
  #define HasGcc2			YES
  #define HasGcc2ForCplusplus	YES
  #define GccUsesGas		YES
  #define UseGas			YES
***************
*** 34,57 ****
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
! #define BuildXKB		YES
! 
  #define CcCmd			gcc
  #define CppCmd			/lib/cpp
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
  #define LexLib			-lfl
  #define PreProcessCmd		CcCmd -E
! #define PostIncDir		`gcc --print | sed 's/libgcc.a/include/'`
  #define LdCombineFlags		-r
  #define OptimizedCDebugFlags	-O2 -m486
! #define AsmDefines		-DUSE_GAS
! #define StandardDefines		OSDefines
  #define StandardCppDefines	-traditional StandardDefines
! #define ServerOSDefines		-DDDXTIME
  #define ExtensionOSDefines	-DXTESTEXT1
! #define ServerExtraDefines	-DGCCUSESGAS -DXDMCP
! #define ServerExtraSysLibs	$(CBRT)
  #define ConnectionFlags		-DUNIXCONN -DTCPCONN
  #define InstUidFlags		-s -m 4755
  
--- 33,66 ----
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
! #if UseElfFormat
! #define CcCmd			gcc -b i486-linuxelf
! #define AsCmd			/usr/i486-linuxelf/bin/as
! #define LdCmd			ld -m elf_i386
! #define AsmDefines		-D__ELF__
! #define CplusplusCmd		g++ -b i486-linuxelf
! #else
  #define CcCmd			gcc
+ #define AsCmd			as
+ #define LdCmd			ld
+ #define AsmDefines		-DUSE_GAS
+ #endif
  #define CppCmd			/lib/cpp
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
  #define LexLib			-lfl
  #define PreProcessCmd		CcCmd -E
! #define PostIncDir		`CcCmd --print-libgcc-file-name | sed 's/libgcc.a/include/'`
  #define LdCombineFlags		-r
  #define OptimizedCDebugFlags	-O2 -m486
! #define StandardDefines		-Dlinux -D__i386__ -D_POSIX_SOURCE \
! 				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
! #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
  
*** -	Sun Jan 29 07:17:24 1995
--- xc/config/cf/lnxLib.rules	Sun Jan 29 07:17:23 1995
***************
*** 1,7 ****
! XCOMM $XConsortium: lnxLib.rules,v 1.2 94/03/31 11:37:29 gildea Exp $
  
  /*
!  * Linux shared library rules (DLL version)
   */
  #ifndef HasSharedLibraries
  #define HasSharedLibraries YES
--- 1,7 ----
! XCOMM $XConsortium: lnxLib.rules,v 1.8 95/01/16 21:11:00 kaleb Exp $
  
  /*
!  * Linux shared library rules (DLL & ELF versions)
   */
  #ifndef HasSharedLibraries
  #define HasSharedLibraries YES
***************
*** 12,17 ****
--- 12,98 ----
  
  #define SharedOldX NO
  
+ #if UseElfFormat
+ 
+ #ifndef SharedDataSeparation
+ #define SharedDataSeparation NO
+ #endif
+ #ifndef SharedCodeDef
+ #define SharedCodeDef /**/
+ #endif
+ #ifndef SharedLibraryDef
+ #define SharedLibraryDef /**/
+ #endif
+ #ifndef ShLibIncludeFile
+ #define ShLibIncludeFile <lnxLib.tmpl>
+ #endif
+ #ifndef SharedLibraryLoadFlags
+ #define SharedLibraryLoadFlags --shared
+ #endif
+ #ifndef PositionIndependentCFlags
+ #define PositionIndependentCFlags -fPIC
+ #endif
+ #ifndef PositionIndependentCplusplusFlags
+ #define PositionIndependentCplusplusFlags -fPIC
+ #endif
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
+  * NOTE: file must be executable, hence "INSTBINFLAGS"
+  */
+ #ifndef InstallSharedLibrary
+ #define	InstallSharedLibrary(libname,rev,dest)				@@\
+ install:: Concat(lib,libname.so.rev) 					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+ 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
+ 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
+ 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
+ 	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+ #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.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  solist					@@\
+ 	$(RM) $@~							@@\
+ 	(cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \
+ 		$(LD) -o up/$@~ $(SHLIBLDFLAGS) --soname $$T solist $(REQUIREDLIBS))	@@\
+ 	$(RM) $@ 							@@\
+ 	$(MV) $@~ $@							@@\
+ 	$(RM) Concat(lib,libname.so)					@@\
+ 	$(LN) $@ Concat(lib,libname.so)					@@\
+ 	LinkBuildLibrary($@)						@@\
+ 	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+ 									@@\
+ clean::									@@\
+ 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+ 
+ #endif /* SharedLibraryTarget */
+ 
+ /*
+  * SharedLibraryDataTarget - generate rules to create shlib data file;
+  */
+ #ifndef SharedLibraryDataTarget
+ #define SharedLibraryDataTarget(libname,rev,salist)
+ #endif /* SharedLibraryTarget */
+ 
+ #else /* UseElfFormat */
+ 
  #ifndef SharedDataSeparation
  #define SharedDataSeparation NO
  #endif
***************
*** 31,38 ****
  #define PositionIndependentCFlags -B/usr/dll/jump/
  #endif
  
- DLL_BINDIR = /usr/dll/bin
- 
  /*
   * These definitions are now extended to work with the X sources and
   * external sources wishing to build shared libs.
--- 112,117 ----
***************
*** 52,66 ****
   *  JUMP_IS_HOST_Xfoo = YES
   *  JUMP_STUBLIBS_Xfoo = libXfoo.sa
   *  JUMP_DIR_Xfoo = $(JUMP_ROOT_Xfoo)/shared		<work directory>
   *  JUMP_VARS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_vars	<see DLL docs>
   *  JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs	<see DLL docs>
   *  JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore	<see DLL docs>
   *  JUMP_ADDRESS_Xfoo = 0xXXXXXXXX			<fill in with address>
   *  JUMP_JUMPTABLESIZE_Xfoo = 0x4000			<adjust if necessary>
   *  JUMP_GOTSIZE_Xfoo = 4096				<adjust if necessary>
   *  JUMP_STUBNAMES_Xfoo = libXfoo			<and others>
   *  JUMP_STUBS_IMPORT_Xfoo = /usr/lib/libc.sa		<and others>
!  *  JUMP_LDLIBS_Xfoo = `$(CC) --print` -lc		<and others>
   *
   * To create a complex "host", you need to add
   *  JUMP_SIBARS_Xt = jump/libXbar.a~			<and others>
--- 131,148 ----
   *  JUMP_IS_HOST_Xfoo = YES
   *  JUMP_STUBLIBS_Xfoo = libXfoo.sa
   *  JUMP_DIR_Xfoo = $(JUMP_ROOT_Xfoo)/shared		<work directory>
+  *  JUMP_DEFS_Xfoo = -DFOO				<defs for jump files>
   *  JUMP_VARS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_vars	<see DLL docs>
   *  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>
   *  JUMP_STUBNAMES_Xfoo = libXfoo			<and others>
   *  JUMP_STUBS_IMPORT_Xfoo = /usr/lib/libc.sa		<and others>
!  *  JUMP_LDLIBS_Xfoo = `$(CC) --print-libgcc-file-name` -lc <and others>
   *
   * To create a complex "host", you need to add
   *  JUMP_SIBARS_Xt = jump/libXbar.a~			<and others>
***************
*** 78,84 ****
  #ifndef UseInstalled
  XCOMM These are only needed to build the server
  
! JUMP_LDLIBS_libc = `$(CC) --print` -lc
  
  XCOMM libX11.so (X11, SM, ICE)
  JUMP_ROOT_X11 = $(XLIBSRC)
--- 160,166 ----
  #ifndef UseInstalled
  XCOMM These are only needed to build the server
  
! JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc
  
  XCOMM libX11.so (X11, SM, ICE)
  JUMP_ROOT_X11 = $(XLIBSRC)
***************
*** 86,94 ****
--- 168,178 ----
  JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa
  JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
  JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
+ JUMP_DEFS_X11 = $(XDMAUTHDEFS)
  JUMP_VARS_X11 = $(JUMP_ROOT_X11)/jump_vars
  JUMP_FUNCS_X11 = $(JUMP_ROOT_X11)/jump_funcs
  JUMP_IGNORE_X11 = $(JUMP_ROOT_X11)/jump_ignore
+ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars
  JUMP_ADDRESS_X11 = 0x60200000
  JUMP_JUMPTABLESIZE_X11 = 0x4000
  JUMP_GOTSIZE_X11 = 4096
***************
*** 120,126 ****
  JUMP_VARS_Xt = $(JUMP_ROOT_Xt)/jump_vars
  JUMP_FUNCS_Xt = $(JUMP_ROOT_Xt)/jump_funcs
  JUMP_IGNORE_Xt = $(JUMP_ROOT_Xt)/jump_ignore
! JUMP_IMPORT_Xt = $(JUMP_VARS_X11)
  JUMP_ADDRESS_Xt = 0x602a0000
  JUMP_JUMPTABLESIZE_Xt = 0x4000
  JUMP_GOTSIZE_Xt = 4096
--- 204,211 ----
  JUMP_VARS_Xt = $(JUMP_ROOT_Xt)/jump_vars
  JUMP_FUNCS_Xt = $(JUMP_ROOT_Xt)/jump_funcs
  JUMP_IGNORE_Xt = $(JUMP_ROOT_Xt)/jump_ignore
! JUMP_EXPORT_Xt = $(JUMP_DIR_Xt)/jump.vars
! JUMP_IMPORT_Xt = $(JUMP_EXPORT_X11)
  JUMP_ADDRESS_Xt = 0x602a0000
  JUMP_JUMPTABLESIZE_Xt = 0x4000
  JUMP_GOTSIZE_Xt = 4096
***************
*** 163,169 ****
  JUMP_VARS_Xaw = $(JUMP_ROOT_Xaw)/jump_vars
  JUMP_FUNCS_Xaw = $(JUMP_ROOT_Xaw)/jump_funcs
  JUMP_IGNORE_Xaw = $(JUMP_ROOT_Xaw)/jump_ignore
! JUMP_IMPORT_Xaw = $(JUMP_VARS_Xt) $(JUMP_VARS_X11)
  JUMP_ADDRESS_Xaw = 0x60300000
  JUMP_JUMPTABLESIZE_Xaw = 0x4000
  JUMP_GOTSIZE_Xaw = 4096
--- 248,255 ----
  JUMP_VARS_Xaw = $(JUMP_ROOT_Xaw)/jump_vars
  JUMP_FUNCS_Xaw = $(JUMP_ROOT_Xaw)/jump_funcs
  JUMP_IGNORE_Xaw = $(JUMP_ROOT_Xaw)/jump_ignore
! JUMP_EXPORT_Xaw = $(JUMP_DIR_Xaw)/jump.vars
! JUMP_IMPORT_Xaw = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
  JUMP_ADDRESS_Xaw = 0x60300000
  JUMP_JUMPTABLESIZE_Xaw = 0x4000
  JUMP_GOTSIZE_Xaw = 4096
***************
*** 182,188 ****
  JUMP_VARS_PEX5 = $(JUMP_ROOT_PEX5)/jump_vars
  JUMP_FUNCS_PEX5 = $(JUMP_ROOT_PEX5)/jump_funcs
  JUMP_IGNORE_PEX5 = $(JUMP_ROOT_PEX5)/jump_ignore
! JUMP_IMPORT_PEX5 = $(JUMP_VARS_X11)
  JUMP_ADDRESS_PEX5 = 0x60b00000
  JUMP_JUMPTABLESIZE_PEX5 = 0x4000
  JUMP_GOTSIZE_PEX5 = 4096
--- 268,275 ----
  JUMP_VARS_PEX5 = $(JUMP_ROOT_PEX5)/jump_vars
  JUMP_FUNCS_PEX5 = $(JUMP_ROOT_PEX5)/jump_funcs
  JUMP_IGNORE_PEX5 = $(JUMP_ROOT_PEX5)/jump_ignore
! JUMP_EXPORT_PEX5 = $(JUMP_DIR_PEX5)/jump.vars
! JUMP_IMPORT_PEX5 = $(JUMP_EXPORT_X11)
  JUMP_ADDRESS_PEX5 = 0x60b00000
  JUMP_JUMPTABLESIZE_PEX5 = 0x4000
  JUMP_GOTSIZE_PEX5 = 4096
***************
*** 199,205 ****
  JUMP_VARS_XIE = $(JUMP_ROOT_XIE)/jump_vars
  JUMP_FUNCS_XIE = $(JUMP_ROOT_XIE)/jump_funcs
  JUMP_IGNORE_XIE = $(JUMP_ROOT_XIE)/jump_ignore
! JUMP_IMPORT_XIE = $(JUMP_VARS_X11)
  JUMP_ADDRESS_XIE = 0x60be0000
  JUMP_JUMPTABLESIZE_XIE = 0x4000
  JUMP_GOTSIZE_XIE = 4096
--- 286,293 ----
  JUMP_VARS_XIE = $(JUMP_ROOT_XIE)/jump_vars
  JUMP_FUNCS_XIE = $(JUMP_ROOT_XIE)/jump_funcs
  JUMP_IGNORE_XIE = $(JUMP_ROOT_XIE)/jump_ignore
! JUMP_EXPORT_XIE = $(JUMP_DIR_XIE)/jump.vars
! JUMP_IMPORT_XIE = $(JUMP_EXPORT_X11)
  JUMP_ADDRESS_XIE = 0x60be0000
  JUMP_JUMPTABLESIZE_XIE = 0x4000
  JUMP_GOTSIZE_XIE = 4096
***************
*** 217,223 ****
  JUMP_VARS_Fresco = $(JUMP_ROOT_Fresco)/jump_vars
  JUMP_FUNCS_Fresco = $(JUMP_ROOT_Fresco)/jump_funcs
  JUMP_IGNORE_Fresco = $(JUMP_ROOT_Fresco)/jump_ignore
! JUMP_IMPORT_Fresco = $(JUMP_VARS_X11)
  JUMP_ADDRESS_Fresco = 0x60bc0000
  JUMP_JUMPTABLESIZE_Fresco = 0x4000
  JUMP_GOTSIZE_Fresco = 4096
--- 305,312 ----
  JUMP_VARS_Fresco = $(JUMP_ROOT_Fresco)/jump_vars
  JUMP_FUNCS_Fresco = $(JUMP_ROOT_Fresco)/jump_funcs
  JUMP_IGNORE_Fresco = $(JUMP_ROOT_Fresco)/jump_ignore
! JUMP_EXPORT_Fresco = $(JUMP_DIR_Fresco)/jump.vars
! JUMP_IMPORT_Fresco = $(JUMP_EXPORT_X11)
  JUMP_ADDRESS_Fresco = 0x60bc0000
  JUMP_JUMPTABLESIZE_Fresco = 0x4000
  JUMP_GOTSIZE_Fresco = 4096
***************
*** 257,263 ****
  JUMP_LIB=Concat(lib,libname)						@@\
  									@@\
  XCOMM  this is needed for newer gnumake versions			@@\
! 	export JUMP_DIR JUMP_LIB					@@\
  									@@\
  JUMP_IS_HOST=$(Concat(JUMP_IS_HOST_,libname))				@@\
  JUMP_AR=$(JUMP_DIR)/Concat(lib,libname.a~)				@@\
--- 346,352 ----
  JUMP_LIB=Concat(lib,libname)						@@\
  									@@\
  XCOMM  this is needed for newer gnumake versions			@@\
! export JUMP_DIR JUMP_LIB						@@\
  									@@\
  JUMP_IS_HOST=$(Concat(JUMP_IS_HOST_,libname))				@@\
  JUMP_AR=$(JUMP_DIR)/Concat(lib,libname.a~)				@@\
***************
*** 287,300 ****
  									@@\
  down/mk_JUMP_SA_1:: down/mk_JUMP_SO_2					@@\
  	$(RM) $(Concat(JUMP_STUBLIBS_,libname))				@@\
! 	$(DLL_BINDIR)/mkstubs -v rev -l $(JUMP_LIB) \
  		-a $(Concat(JUMP_ADDRESS_,libname)) \
  		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
  		-g $(Concat(JUMP_GOTSIZE_,libname)) \
  		-- $(Concat(JUMP_STUBNAMES_,libname))			@@\
! 	$(DLL_BINDIR)/verify-shlib -l $(JUMP_SO) \
! 		$(Concat(JUMP_STUBLIBS_,libname)) && \
! 		$(RM) verify.out					@@\
  	touch $@							@@\
  									@@\
  mk_JUMP_HOST:								@@\
--- 376,389 ----
  									@@\
  down/mk_JUMP_SA_1:: down/mk_JUMP_SO_2					@@\
  	$(RM) $(Concat(JUMP_STUBLIBS_,libname))				@@\
! 	mkstubs -v rev -l $(JUMP_LIB) \
  		-a $(Concat(JUMP_ADDRESS_,libname)) \
  		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
  		-g $(Concat(JUMP_GOTSIZE_,libname)) \
  		-- $(Concat(JUMP_STUBNAMES_,libname))			@@\
! 	verify-shlib -l $(JUMP_SO) \
! 		$(Concat(JUMP_STUBLIBS_,libname))			@@\
! 	$(MV) verify.out $(JUMP_DIR)					@@\
  	touch $@							@@\
  									@@\
  mk_JUMP_HOST:								@@\
***************
*** 310,316 ****
  									@@\
  down/mk_JUMP_SO_2: down/mk_JUMP_AR $(Concat(JUMP_SIBARS_,libname))	@@\
  	$(RM) $(JUMP_SO)						@@\
! 	$(DLL_BINDIR)/mkimage -f -v rev -l $(JUMP_LIB) \
  		-a $(Concat(JUMP_ADDRESS_,libname)) \
  		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
  		-g $(Concat(JUMP_GOTSIZE_,libname)) \
--- 399,405 ----
  									@@\
  down/mk_JUMP_SO_2: down/mk_JUMP_AR $(Concat(JUMP_SIBARS_,libname))	@@\
  	$(RM) $(JUMP_SO)						@@\
! 	mkimage -f -v rev -l $(JUMP_LIB) \
  		-a $(Concat(JUMP_ADDRESS_,libname)) \
  		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
  		-g $(Concat(JUMP_GOTSIZE_,libname)) \
***************
*** 352,366 ****
  									@@\
  $(JUMP_DIR)/jump.funcs: $(Concat(JUMP_FUNCS_,libname))			@@\
  	$(RM) $(JUMP_DIR)/jump.funcs					@@\
! 	cat $(Concat(JUMP_FUNCS_,libname)) > $@				@@\
  									@@\
  $(JUMP_DIR)/jump.vars: $(Concat(JUMP_VARS_,libname))			@@\
  	$(RM) $(JUMP_DIR)/jump.vars					@@\
! 	cat $(Concat(JUMP_VARS_,libname)) > $@				@@\
  									@@\
  $(JUMP_DIR)/jump.ignore: $(Concat(JUMP_IGNORE_,libname))		@@\
  	$(RM) $(JUMP_DIR)/jump.ignore					@@\
! 	cat $(Concat(JUMP_IGNORE_,libname)) > $@			@@\
  									@@\
  $(JUMP_DIR)/jump.import: $(JUMP_DIR)/stubs.import \
  		$(Concat(JUMP_IMPORT_,libname))				@@\
--- 441,458 ----
  									@@\
  $(JUMP_DIR)/jump.funcs: $(Concat(JUMP_FUNCS_,libname))			@@\
  	$(RM) $(JUMP_DIR)/jump.funcs					@@\
! 	cat $(Concat(JUMP_FUNCS_,libname)) | \
! 		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
  									@@\
  $(JUMP_DIR)/jump.vars: $(Concat(JUMP_VARS_,libname))			@@\
  	$(RM) $(JUMP_DIR)/jump.vars					@@\
! 	cat $(Concat(JUMP_VARS_,libname)) | \
! 		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
  									@@\
  $(JUMP_DIR)/jump.ignore: $(Concat(JUMP_IGNORE_,libname))		@@\
  	$(RM) $(JUMP_DIR)/jump.ignore					@@\
! 	cat $(Concat(JUMP_IGNORE_,libname)) | \
! 		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
  									@@\
  $(JUMP_DIR)/jump.import: $(JUMP_DIR)/stubs.import \
  		$(Concat(JUMP_IMPORT_,libname))				@@\
***************
*** 374,379 ****
--- 466,474 ----
  									@@\
  down/mk_JUMP_AR: solist							@@\
  	$(RM) $(JUMP_AR)						@@\
+ 	@if [ -s $(JUMP_DIR)/jump.log ]; then \
+ 		echo "Error: Leftover globals for shared lib"; \
+ 		exit 1; fi						@@\
  	(cd down; $(AR) up/$(JUMP_AR) solist) || exit 1			@@\
  	$(RANLIB) $(JUMP_AR)						@@\
  	touch $@							@@\
***************
*** 381,399 ****
  clean:: jumpclean							@@\
  									@@\
  jumpclean: jumpclean_$(JUMP_IS_HOST)					@@\
! 	$(RM) $(JUMP_SA) $(JUMP_DIR)/__jump.s $(JUMP_DIR)/__jump.o \
! 		down/mk_JUMP_AR $(JUMP_AR)				@@\
  	$(RM) -r $(JUMP_DIR)						@@\
  									@@\
  jumpclean_0:								@@\
  	$(RM) down/mk_JUMP_SA_0						@@\
  									@@\
  jumpclean_1:								@@\
! 	$(RM) $(JUMP_SO) $(JUMP_DIR)/_GCMN_*.s $(JUMP_DIR)/_GVAR_*.s \
! 		$(JUMP_DIR)/jump.vars $(JUMP_DIR)/jump.funcs \
! 		$(JUMP_DIR)/jump.ignore $(JUMP_DIR)/jump.params \
! 		$(JUMP_DIR)/jump.undefs $(JUMP_DIR)/jump.log \
! 		$(JUMP_DIR)/jump.import $(JUMP_DIR)/stubs.import \
  		down/mk_JUMP_SA_1 down/mk_JUMP_SO_1 down/mk_JUMP_SO_2
  #endif /* SharedLibraryTarget */
  
--- 476,490 ----
  clean:: jumpclean							@@\
  									@@\
  jumpclean: jumpclean_$(JUMP_IS_HOST)					@@\
! 	$(RM) $(JUMP_SA) down/mk_JUMP_AR				@@\
  	$(RM) -r $(JUMP_DIR)						@@\
  									@@\
  jumpclean_0:								@@\
  	$(RM) down/mk_JUMP_SA_0						@@\
+ 	$(RM) $(JUMP_HOST)/$(JUMP_SA)					@@\
  									@@\
  jumpclean_1:								@@\
! 	$(RM) -r $(JUMP_SO) $(Concat(JUMP_DIR_,libname)) \		@@\
  		down/mk_JUMP_SA_1 down/mk_JUMP_SO_1 down/mk_JUMP_SO_2
  #endif /* SharedLibraryTarget */
  
***************
*** 408,414 ****
  		(T=$(DESTDIR)dest/`echo $(JUMP_SO)|sed 's/\.[^\.]*$$//'`;\
  		set -x; \
  		$(INSTALL) -s -c $(INSTSOLIBFLAGS) $(JUMP_SO) $(DESTDIR)dest; \
! 		$(RM) $$T && $(LN) $(DESTDIR)dest/$(JUMP_SO) $$T); fi	@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) $(JUMP_SA) $(DESTDIR)dest
  #endif /* InstallSharedLibrary */
  
--- 499,505 ----
  		(T=$(DESTDIR)dest/`echo $(JUMP_SO)|sed 's/\.[^\.]*$$//'`;\
  		set -x; \
  		$(INSTALL) -s -c $(INSTSOLIBFLAGS) $(JUMP_SO) $(DESTDIR)dest; \
! 		$(RM) $$T && $(LN) $(JUMP_SO) $$T); fi			@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) $(JUMP_SA) $(DESTDIR)dest
  #endif /* InstallSharedLibrary */
  
***************
*** 418,420 ****
--- 509,513 ----
  #ifndef InstallSharedLibraryData
  #define	InstallSharedLibraryData(libname,rev,dest)
  #endif /* InstallSharedLibraryData */
+ 
+ #endif /* UseElfFormat */
*** -	Sun Jan 29 07:17:25 1995
--- xc/config/cf/lnxLib.tmpl	Sun Jan 29 07:17:25 1995
***************
*** 1,52 ****
! XCOMM $XConsortium: lnxLib.tmpl,v 1.1 94/03/29 15:34:47 gildea Exp $
  
  /*
   * Linux shared library template
   */
  
! 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.sa.$(SOXEXTREV)) */
!      EXTENSIONLIB = _Use(-lXext,-L$(EXTENSIONSRC)/lib -lXext)
  #endif
- #if SharedLibX11
-           DEPXLIB = $(DEPEXTENSIONLIB) /* _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11.sa.$(SOXLIBREV)) */
-              XLIB = $(EXTENSIONLIB) _Use(-lX11,-L$(XLIBSRC) -lX11)
- #endif
- #if SharedLibXmu
-         DEPXMULIB = /* _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu.sa.$(SOXMUREV)) */
-            XMULIB = _Use(-lXmu,-L$(XMUSRC) -lXmu) $(XLIB)
  #ifndef XawClientLibs
! #define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
! #endif
! #endif
! #if SharedOldX
!        DEPOLDXLIB = /* _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX.sa.$(SOOLDXREV)) */
!           OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX)
! #endif
! #if SharedLibXt
!       DEPXTOOLLIB = /* _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.sa.$(SOXTREV)) */
!          XTOOLLIB = _Use(-lXt,-L$(TOOLKITSRC) -lXt)
! #endif
! #if SharedLibXaw
!         DEPXAWLIB = /* _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw.sa.$(SOXAWREV)) */
!            XAWLIB = _Use(-lXaw,-L$(AWIDGETSRC) -lXaw)
! #endif
! #if SharedLibXinput
!         DEPXILIB = /* _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi.sa.$(SOXINPUTREV)) */
!            XILIB = _Use(-lXi,-L$(XILIBSRC) -lXi)
  #endif
! #if SharedLibXTest
!     DEPXTESTLIB = /* _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXtst.sa.$(SOXEXTREV)) */
!        XTESTLIB = _Use(-lXtst,-L$(EXTENSIONSRC)/lib/xtest -lXtst)
  #endif
- #if SharedLibPex
-         DEPPEXLIB = /* _UseCat($(USRLIBDIR),$(PEXLIBSRC),/libPEX5.sa.$(SOPEXREV)) */
-          PEXLIB = _Use(-lPEX5,-L$(PEXLIBSRC) -lPEX5)
  #endif
--- 1,22 ----
! XCOMM $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $
  
  /*
   * Linux shared library template
   */
  
! /* Linux ELF shared libraries are deficient in link semantics */
! #if UseElfFormat
! #ifndef FixupLibReferences
! #define FixupLibReferences()						@@\
! XMULIBONLY = -lXmu							@@\
! XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
  #endif
  #ifndef XawClientLibs
! #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
  #endif
! #else
! #ifndef FixupLibReferences
! #define FixupLibReferences()						@@\
! XMULIB = -lXmu $(XLIB)
  #endif
  #endif
*** -	Sun Jan 29 07:17:26 1995
--- xc/config/cf/xf86.rules	Sun Jan 29 07:17:26 1995
***************
*** 1,32 ****
! XCOMM $XConsortium: xf86.rules,v 1.1 94/03/29 15:34:48 gildea Exp $
  
  /*
   * These rules are needed to build the Xfree86 X Servers
   */
  
  #ifndef AssembleObject
! #define AssembleObject(flags) $(RM) $@                                  @@\
! 	$(CPP) AsmDefines $(INCLUDES) flags $*.s | grep -v '^\#' > $*.i @@\
! 	$(AS) -o $*.o $*.i                                              @@\
! 	$(RM) $*.i
! #endif
! 
! #define NormalAsmObjectRule()                                           @@\
! .s.o:                                                                   @@\
! 	AssembleObject($(_NOOP_))
! 
! #define ObjectFromSpecialAsmSource(dst,src,flags)                       @@\
! dst.s:  src.s                                                           @@\
! 	$(RM) $@                                                        @@\
! 	$(LN) $? $@                                                     @@\
!                                                                         @@\
! dst.o:  dst.s                                                           @@\
! 	AssembleObject(flags)                                           @@\
!                                                                         @@\
! depend:: dst.s                                                          @@\
!                                                                         @@\
! clean::                                                                 @@\
! 	$(RM) dst.s
  
  
  /*
--- 1,47 ----
! XCOMM $XConsortium: xf86.rules,v 1.7 95/01/25 16:34:39 kaleb Exp $
  
  /*
   * These rules are needed to build the Xfree86 X Servers
   */
  
+ #ifndef CPPOnlyAsm
+ #define CPPOnlyAsm(basename,options) RemoveFile(basename.i)		@@\
+ 	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.s | \	@@\
+ 		grep -v '^\#' > basename.i
+ #endif
+ 
  #ifndef AssembleObject
! #define AssembleObject(flags) CPPOnlyAsm($*,flags)			@@\
! 	$(AS) -o $*.o $*.i						@@\
! 	RemoveFile($*.i)
! #endif
! 
! #ifndef NormalAsmObjectRule
! #define NormalAsmObjectRule()						@@\
! .s.o:									@@\
! 	AssembleObject($(_NOOP_))					@@\
! 									@@\
! .s.i:									@@\
! 	CPPOnlyAsm($*,$(_NOOP_))
! #endif
! 
! #ifndef ObjectFromSpecialAsmSource
! #define ObjectFromSpecialAsmSource(dst,src,flags)			@@\
! dst.s:  src.s								@@\
! 	RemoveFile($@)							@@\
! 	$(LN) $? $@							@@\
! 									@@\
! dst.o:  dst.s								@@\
! 	AssembleObject(flags)						@@\
! 									@@\
! dst.i:  dst.s								@@\
! 	CPPOnlyAsm(dst,flags)						@@\
! 									@@\
! depend:: dst.s								@@\
! 									@@\
! clean::									@@\
! 	RemoveFile(dst.s)
! #endif
  
  
  /*
***************
*** 37,57 ****
  # define Depend depend
  #endif
   
! #define ConfigTargetLong(target,dep,script,args,extra)                  @@\
! all:: Configure                                                         @@\
!                                                                         @@\
! Configure:: target.o                                                    @@\
!                                                                         @@\
! target.c: script dep                                                    @@\
! 	$(MAKE) $(MFLAGS) Makefile                                      @@\
! 	$(MAKE) $(MFLAGS) extra Concat(Build,target)                    @@\
!                                                                         @@\
! Concat(Build,target):                                                   @@\
! 	$(RM) target.c                                                  @@\
! 	$(SHELL) script args                                            @@\
!                                                                         @@\
! clean::                                                                 @@\
  	$(RM) target.c
  
  #define ConfigTarget(target,dep,script,args) ConfigTargetLong(target,dep,script,args,Depend)
  
--- 52,74 ----
  # define Depend depend
  #endif
   
! #ifndef ConfigTargetLong
! #define ConfigTargetLong(target,dep,script,args,extra)			@@\
! all:: Configure								@@\
! 									@@\
! Configure:: target.o							@@\
! 									@@\
! target.c: script dep							@@\
! 	$(MAKE) $(MFLAGS) Makefile					@@\
! 	$(MAKE) $(MFLAGS) extra Concat(Build,target)			@@\
! 									@@\
! Concat(Build,target):							@@\
! 	$(RM) target.c							@@\
! 	$(SHELL) script args						@@\
! 									@@\
! clean::									@@\
  	$(RM) target.c
+ #endif
  
  #define ConfigTarget(target,dep,script,args) ConfigTargetLong(target,dep,script,args,Depend)
  
***************
*** 61,90 ****
   * Rules for installing LinkKit parts (target is install.linkkit)
   */
  
  #define InstallLinkKitNonExecFile(file,dest)				@@\
  install.linkkit:: file							@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTDATFLAGS) file $(DESTDIR)dest
  
  #define InstallLinkKitLibrary(libname,dest)				@@\
  install.linkkit:: Concat(lib,libname.a)					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest @@\
  	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))
  
  #define InstallLinkKitNamedNonExec(srcname,dstname,dest)		@@\
  install.linkkit:: srcname						@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTDATFLAGS) srcname $(DESTDIR)dest/dstname
  
  #define InstallLinkKitNamedProg(srcname,dstname,dest)			@@\
  install.linkkit:: srcname						@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTBINFLAGS) srcname $(DESTDIR)dest/dstname
  
  #define InstallLinkKitSubdirs(dirs) \
  NamedTargetSubdirs(install.linkkit,dirs,"installing link kit",DESTDIR='$(DESTDIR)',install.linkkit)
- 
- #ifndef LinkKitDir
- # define LinkKitDir		$(USRLIBDIR)/Server
  #endif
--- 78,123 ----
   * Rules for installing LinkKit parts (target is install.linkkit)
   */
  
+ #ifndef InstallLinkKitNonExecFile
  #define InstallLinkKitNonExecFile(file,dest)				@@\
  install.linkkit:: file							@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTDATFLAGS) file $(DESTDIR)dest
+ #endif
  
+ #ifndef InstallLinkKitLibrary
  #define InstallLinkKitLibrary(libname,dest)				@@\
  install.linkkit:: Concat(lib,libname.a)					@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest @@\
  	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))
+ #endif
+ 
+ #ifndef InstallLinkKitNamedLibrary
+ #define InstallLinkKitNamedLibrary(libname,dlibname,dest)		@@\
+ install.linkkit:: Concat(lib,libname.a)					@@\
+ 	MakeDir($(DESTDIR)dest)						@@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) \		@@\
+ 	  Concat($(DESTDIR)dest/lib,dlibname.a)				@@\
+ 	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,dlibname.a))
+ #endif
  
+ #ifndef InstallLinkKitNamedNonExec
  #define InstallLinkKitNamedNonExec(srcname,dstname,dest)		@@\
  install.linkkit:: srcname						@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTDATFLAGS) srcname $(DESTDIR)dest/dstname
+ #endif
  
+ #ifndef InstallLinkKitNamedProg
  #define InstallLinkKitNamedProg(srcname,dstname,dest)			@@\
  install.linkkit:: srcname						@@\
  	MakeDir($(DESTDIR)dest)						@@\
  	$(INSTALL) -c $(INSTBINFLAGS) srcname $(DESTDIR)dest/dstname
+ #endif
  
+ #ifndef InstallLinkKitSubdirs
  #define InstallLinkKitSubdirs(dirs) \
  NamedTargetSubdirs(install.linkkit,dirs,"installing link kit",DESTDIR='$(DESTDIR)',install.linkkit)
  #endif
+ 
*** -	Sun Jan 29 07:17:28 1995
--- xc/config/cf/xfree86.cf	Sun Jan 29 07:17:28 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: xfree86.cf,v 1.2 94/03/31 11:37:26 gildea Exp $
  /*
   * This configuration file contains all of the configuration
   * information for the XFree86 based X Servers.
--- 1,4 ----
! XCOMM $XConsortium: xfree86.cf,v 1.9 95/01/25 16:42:40 kaleb Exp $
  /*
   * This configuration file contains all of the configuration
   * information for the XFree86 based X Servers.
***************
*** 16,33 ****
  
  #ifndef XF86VGA16Server
  # define XF86VGA16Server	NO
  #endif
  
  #ifndef XF86MonoServer
  # define XF86MonoServer		NO
! #endif
! 
! #ifndef XF86HgaServer
! # define XF86HgaServer		NO
! #endif
! 
! #ifndef XF86BdmServer
! # define XF86BdmServer		NO
  #endif
  
  #ifndef XF86S3Server
--- 16,31 ----
  
  #ifndef XF86VGA16Server
  # define XF86VGA16Server	NO
+ # ifndef XF86VGA16DualServer
+ #  define XF86VGA16DualServer	NO
+ # endif
  #endif
  
  #ifndef XF86MonoServer
  # define XF86MonoServer		NO
! # ifndef XF86MonoDualServer
! #  define XF86MonoDualServer	NO
! # endif
  #endif
  
  #ifndef XF86S3Server
***************
*** 46,51 ****
--- 44,65 ----
  # define XF86Mach32Server	NO
  #endif
  
+ #ifndef XF86Mach64Server
+ # define XF86Mach64Server	NO
+ #endif
+ 
+ #ifndef XF86AGXServer
+ # define XF86AGXServer		NO
+ #endif
+ 
+ #ifndef XF86P9000Server
+ # define XF86P9000Server	NO
+ #endif
+ 
+ #ifndef XF86W32Server
+ # define XF86W32Server		NO
+ #endif
+ 
  #if XF86S3Server
  # define XF86S3Dir		s3
  #else
***************
*** 70,80 ****
  # define XF86Mach32Dir		/**/
  #endif
  
  #undef XF86AccelServerDirs
! #define XF86AccelServerDirs   XF86S3Dir XF86I8514Dir XF86Mach8Dir XF86Mach32Dir
  
  #undef XF86AccelServer
! #if XF86S3Server || XF86I8514Server || XF86Mach8Server || XF86Mach32Server
  # define XF86AccelServer	YES
  #else
  # define XF86AccelServer	NO
--- 84,118 ----
  # define XF86Mach32Dir		/**/
  #endif
  
+ #if XF86Mach64Server
+ # define XF86Mach64Dir		mach64
+ #else
+ # define XF86Mach64Dir		/**/
+ #endif
+ 
+ #if XF86P9000Server
+ # define XF86P9000Dir		p9000
+ #else
+ # define XF86P9000Dir		/**/
+ #endif
+ 
+ #if XF86AGXServer
+ # define XF86AGXDir		agx
+ #else
+ # define XF86AGXDir		/**/
+ #endif
+ 
+ #if XF86W32Server
+ # define XF86W32Dir		et4000w32
+ #else
+ # define XF86W32Dir		/**/
+ #endif
+ 
  #undef XF86AccelServerDirs
! #define XF86AccelServerDirs   XF86S3Dir XF86I8514Dir XF86Mach8Dir XF86Mach32Dir XF86Mach64Dir XF86P9000Dir XF86AGXDir XF86W32Dir
  
  #undef XF86AccelServer
! #if XF86S3Server || XF86I8514Server || XF86Mach8Server || XF86Mach32Server || XF86Mach64Server || XF86P9000Server || XF86AGXServer || XF86W32Server
  # define XF86AccelServer	YES
  #else
  # define XF86AccelServer	NO
***************
*** 83,114 ****
  /*
   * Driver list for several of the X Servers.
   */
! #ifndef XF86Vga256Drivers
! # define XF86Vga256Drivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
! 				ncr77c22 compaq oak
  #endif
  
  #ifndef XF86Vga16Drivers
! # define XF86Vga16Drivers	et4000 ncr77c22 generic tvga8900
  #endif
  
  #ifndef XF86Vga2Drivers
! # define XF86Vga2Drivers	et4000 et3000 pvga1 gvga tvga8900 ncr77c22 \
! 				compaq oak generic
  #endif
  
! #ifndef XF86Hga2Drivers
! # define XF86Hga2Drivers	hga6845
  #endif
  
! #ifndef XF86Bdm2Drivers
! # define XF86Bdm2Drivers	hgc1280 sigma
  #endif
  
  #ifndef XF86S3Drivers
  # define XF86S3Drivers		mmio_928 s3_generic
  #endif
  
  /*
   * By default, build all of the fonts.
   */
--- 121,166 ----
  /*
   * Driver list for several of the X Servers.
   */
! #ifndef XF86SvgaDrivers
! # define XF86SvgaDrivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
! 				ncr77c22 compaq oak mx al2101 ali cl64xx \
! 				video7 chips generic
  #endif
  
  #ifndef XF86Vga16Drivers
! # define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx generic
  #endif
  
  #ifndef XF86Vga2Drivers
! # define XF86Vga2Drivers	et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
! 				ncr77c22 compaq oak cl64xx generic
  #endif
  
! #ifndef XF86Vga2Banked
! # define XF86Vga2Banked		YES
  #endif
  
! #ifndef XF86MonoDrivers
! # define XF86MonoDrivers	hgc1280 sigma apollo hercules
  #endif
  
+ /* This doesn't do anything (yet) */
  #ifndef XF86S3Drivers
  # define XF86S3Drivers		mmio_928 s3_generic
  #endif
  
+ #ifndef XF86W32Drivers
+ # define XF86W32Drivers		et4000w32
+ #endif
+ 
+ #ifndef BuildPexExt
+ #define BuildPexExt		XF86AccelServer || XF86SVGAServer
+ #endif
+ 
+ #ifndef BuildXIE
+ #define BuildXIE		XF86AccelServer || XF86SVGAServer
+ #endif
+ 
  /*
   * By default, build all of the fonts.
   */
***************
*** 125,145 ****
  #define BuildType1	YES
  #endif
  
  /*
   * Some commonly refered to directories are defined here.
   */
  
         XF86SRC = $(SERVERSRC)/hw/xfree86
    XF86ACCELSRC = $(XF86SRC)/accel
      XF86COMSRC = $(XF86SRC)/common
       XF86HWSRC = $(XF86SRC)/common_hw
       XF86OSSRC = $(XF86SRC)/os-support
    VGADRIVERSRC = $(XF86SRC)/vga256/drivers
  VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers
   VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
!  HGA2DRIVERSRC = $(XF86SRC)/hga2/drivers
!  BDM2DRIVERSRC = $(XF86SRC)/bdm2/drivers
     S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
  
  /*
   * These libraries are needed by all X Servers
--- 177,280 ----
  #define BuildType1	YES
  #endif
  
+ #ifndef CompressAllFonts
+ #define CompressAllFonts	YES
+ #endif
+ 
+ #ifndef InstallXcmsTxt
+ #define InstallXcmsTxt		YES
+ #endif
+ 
+ #ifndef HasLinuxDoc
+ #define HasLinuxDoc		NO
+ #endif
+ 
+ #ifndef InstallJapaneseDocs
+ #define InstallJapaneseDocs	NO
+ #endif
+ 
+ /* Server defines required for all OSs */
+ #ifndef XFree86ServerDefines
+ #define XFree86ServerDefines	-DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV LinkKitDefines
+ #endif
+ 
+ #ifndef XFree86ServerOSDefines
+ #define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK
+ #endif
+ 
+ #ifndef XFree86ConsoleDefines
+ #ifdef i386BsdArchitecture
+ #define XFree86ConsoleDefines	-DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
+ #else
+ #define XFree86ConsoleDefines	/**/
+ #endif
+ #endif
+ 
+ #ifndef UseServerLock
+ #define UseServerLock	YES
+ #endif
+ 
+ #ifndef XF86LinkKit
+ #define XF86LinkKit	NO
+ #endif
+ 
+ #ifndef LinkKitDefines
+ #if XF86LinkKit
+ #define LinkKitDefines	-DLINKKIT
+ #else
+ #define LinkKitDefines	/**/
+ #endif
+ #endif
+ 
+ #ifndef ServerExtraDefines
+ #define ServerExtraDefines	XFree86ServerDefines
+ #endif
+ 
+ #ifndef ServerOSDefines
+ #define ServerOSDefines		XFree86ServerOSDefines
+ #endif
+ 
+ #ifndef LinkKitDir
+ #define LinkKitDir	$(USRLIBDIR)/Server
+ #endif
+ 
+ LINKKITDIR = LinkKitDir
+ 
  /*
   * Some commonly refered to directories are defined here.
   */
  
+ #if XF86LinkKit
+        XF86SRC = $(TOP)
+   XF86ACCELSRC = $(XF86SRC)/lib
+     XF86COMSRC = $(XF86SRC)/lib
+  XF86CONFIGSRC = $(XF86SRC)
+      XF86HWSRC = $(XF86SRC)/lib
+      XF86OSSRC = $(XF86SRC)/lib
+      DRIVERSRC = $(XF86SRC)/drivers
+   VGADRIVERSRC = $(XF86SRC)/drivers/vga256
+ VGA16DRIVERSRC = $(XF86SRC)/drivers/vga16
+  VGA2DRIVERSRC = $(XF86SRC)/drivers/vga2
+  MONODRIVERSRC = $(XF86SRC)/drivers/mono
+    S3DRIVERSRC = $(XF86SRC)/drivers/s3
+ 
+ #ifdef SiteIConfigFiles
+ #undef SiteIConfigFiles
+ #endif
+ #define SiteIConfigFiles $(TOP)/site.def $(TOP)/Imakefile
+ #else
         XF86SRC = $(SERVERSRC)/hw/xfree86
    XF86ACCELSRC = $(XF86SRC)/accel
      XF86COMSRC = $(XF86SRC)/common
+  XF86CONFIGSRC = $(XF86COMSRC)
       XF86HWSRC = $(XF86SRC)/common_hw
       XF86OSSRC = $(XF86SRC)/os-support
    VGADRIVERSRC = $(XF86SRC)/vga256/drivers
  VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers
   VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
!  MONODRIVERSRC = $(XF86SRC)/mono/drivers
     S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
+ #endif
  
  /*
   * These libraries are needed by all X Servers
***************
*** 147,159 ****
  
  XF86INIT   = $(XF86COMSRC)/xf86Init.o
  XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o
! XF86CONFIG = $(XF86COMSRC)/xf86_Option.o
  XF86COMLIB = $(XF86COMSRC)/libxf86.a
  XF86OSLIB  = $(XF86OSSRC)/libxf86_os.a
  XF86HWLIB  = $(XF86HWSRC)/libxf86_hw.a
  XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  
  /*
   * Other stuff used in the X Server source.
   */
--- 282,299 ----
  
  XF86INIT   = $(XF86COMSRC)/xf86Init.o
  XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o
! XF86CONFIG = $(XF86CONFIGSRC)/xf86_Option.o
  XF86COMLIB = $(XF86COMSRC)/libxf86.a
  XF86OSLIB  = $(XF86OSSRC)/libxf86_os.a
  XF86HWLIB  = $(XF86HWSRC)/libxf86_hw.a
  XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB)
  
+         XFREE86DOCDIR = $(LIBDIR)/doc
+       XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
+     XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
+ XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese
+ 
  /*
   * Other stuff used in the X Server source.
   */
***************
*** 163,181 ****
  #endif
  
  #ifndef XFree86Version
! #define XFree86Version	3000
  #endif
  
  #ifndef UseRgbTxt
  #define UseRgbTxt	YES
  #endif
  
  /*
   * GNU Compiler stuff
   */
  #ifndef HasGcc
  #define HasGcc HasGcc2
  #endif
  
  #if HasGcc
  #ifndef DefaultCCOptions
--- 303,336 ----
  #endif
  
  #ifndef XFree86Version
! #define XFree86Version	3110
! #endif
! 
! #ifndef XVendorString
! #define XVendorString	"The XFree86 Project, Inc"
! #endif
! 
! #ifndef XVendorRelease
! #define XVendorRelease	XFree86Version
  #endif
  
  #ifndef UseRgbTxt
  #define UseRgbTxt	YES
  #endif
  
+ 
  /*
   * GNU Compiler stuff
   */
+ #ifndef HasGcc2
+ #define HasGcc2 NO
+ #endif
  #ifndef HasGcc
  #define HasGcc HasGcc2
  #endif
+ #ifndef HasGcc2ForCplusplus
+ #define HasGcc2ForCplusplus HasGcc2
+ #endif
  
  #if HasGcc
  #ifndef DefaultCCOptions
***************
*** 184,189 ****
--- 339,358 ----
  #else
  #define DefaultCCOptions -ansi  -DNO_ASM
  #endif
+ #endif
+ #endif
+ 
+ #ifndef BuildLBXCompatible
+ #define BuildLBXCompatible NO
+ #endif
+ 
+ #ifndef BuildLBX
+ #define BuildLBX NO
+ #endif
+ 
+ #if BuildLBXCompatible
+ #if !BuildLBX
+ #define LbxDefines -DLBX_COMPAT
  #endif
  #endif
  
*** -	Sun Jan 29 07:17:30 1995
--- xc/config/cf/site.sample	Sun Jan 29 07:17:30 1995
***************
*** 1,4 ****
! XCOMM site:  $XConsortium: site.sample,v 1.11 94/06/03 19:50:12 matt Exp $
  
  /*****************************************************************************
   *                                                                           *
--- 1,4 ----
! XCOMM site:  $XConsortium: site.sample,v 1.11.1.1 94/12/07 10:24:08 kaleb Exp $
  
  /*****************************************************************************
   *                                                                           *
***************
*** 64,70 ****
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4
  #define HasTestCenter	YES
  #endif
  #endif
--- 64,70 ----
  /*
  #if defined(SunArchitecture) && defined(SparcArchitecture)
  #define HasCodeCenter	YES
! #ifndef SVR4Architecture
  #define HasTestCenter	YES
  #endif
  #endif
***************
*** 77,83 ****
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4)
  #define HasPurify	YES
  #endif
  */
--- 77,83 ----
  */
  
  /*
! #if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture)
  #define HasPurify	YES
  #endif
  */
*** -	Sun Jan 29 07:17:31 1995
--- xc/config/imake/imake.c	Sun Jan 29 07:17:31 1995
***************
*** 1,4 ****
! /* $XConsortium: imake.c,v 1.89 94/08/12 00:45:51 gildea Exp $ */
  
  /***************************************************************************
   *                                                                         *
--- 1,4 ----
! /* $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $ */
  
  /***************************************************************************
   *                                                                         *
***************
*** 117,124 ****
--- 117,126 ----
  #include "Xw32defs.h"
  #endif
  #ifndef X_NOT_POSIX
+ #ifndef _POSIX_SOURCE
  #define _POSIX_SOURCE
  #endif
+ #endif
  #include <sys/types.h>
  #include <fcntl.h>
  #ifdef X_NOT_POSIX
***************
*** 872,883 ****
  #if defined(SYSV) || defined(WIN32)
  		freopen(tmpfname, "w+", tmpfd);
  #else	/* !SYSV */
! 		ftruncate(fileno(tmpfd), 0);
  #endif	/* !SYSV */
  		initialized = TRUE;
  	    fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
  	    fprintf (tmpfd, "# %s\n",
! 		"$XConsortium: imake.c,v 1.89 94/08/12 00:45:51 gildea Exp $");
  	}
  
  	for (p1 = pline; p1 < end; p1++) {
--- 874,885 ----
  #if defined(SYSV) || defined(WIN32)
  		freopen(tmpfname, "w+", tmpfd);
  #else	/* !SYSV */
! 		ftruncate(fileno(tmpfd), (off_t) 0);
  #endif	/* !SYSV */
  		initialized = TRUE;
  	    fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
  	    fprintf (tmpfd, "# %s\n",
! 		"$XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $");
  	}
  
  	for (p1 = pline; p1 < end; p1++) {
*** -	Sun Jan 29 07:17:33 1995
--- xc/config/imake/imakemdep.h	Sun Jan 29 07:17:33 1995
***************
*** 1,4 ****
! /* $XConsortium: imakemdep.h,v 1.76 94/04/17 20:10:31 gildea Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
--- 1,4 ----
! /* $XConsortium: imakemdep.h,v 1.82 95/01/12 16:27:01 kaleb Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 103,108 ****
--- 103,120 ----
  # endif
  #endif
  
+ #ifdef SVR4
+ # ifdef i386
+ #  define imake_ccflags "-Xc -DSVR4"
+ # endif
+ #endif
+ 
+ #ifdef SYSV
+ # ifdef i386
+ #  define imake_ccflags "-DSYSV"
+ # endif
+ #endif
+ 
  #ifdef __convex__
  #define imake_ccflags "-fn -tm c1"
  #endif
***************
*** 313,338 ****
  	"-DSVR4",
  # endif
  #endif /* MOTOROLA */
! #ifdef SYSV386           /* System V/386 folks */
! 	"-DSYSV386",
  # ifdef SVR4
  	"-DSVR4",
  # endif
! # ifdef ISC
! 	"-DISC",         /* ISC 2.2.1 */
! # endif
! # ifdef SCO
  	"-DSCO",
! # endif
! # ifdef ESIX
  	"-DESIX",
! # endif
! # ifdef ATT
  	"-DATT",
! # endif
! # ifdef DELL
  	"-DDELL",
  #endif
  #endif
  #ifdef __osf__
  	"-D__osf__",
--- 325,409 ----
  	"-DSVR4",
  # endif
  #endif /* MOTOROLA */
! #ifdef i386
! 	"-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 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__
  	"-D__osf__",
***************
*** 381,388 ****
  #endif
  #ifdef AMOEBA
  	"-DAMOEBA",
! # ifdef CROSSCOMPILE
  	"-DCROSS_COMPILE",
  # else
  #  ifdef i80386
  	"-Di80386",
--- 452,468 ----
  #endif
  #ifdef AMOEBA
  	"-DAMOEBA",
! # 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
  	"-Di80386",
*** -	Sun Jan 29 07:17:34 1995
--- xc/config/util/mdepend.cpp	Sun Jan 29 07:17:34 1995
***************
*** 1,6 ****
  XCOMM!/bin/sh
  XCOMM
! XCOMM $XConsortium: mdepend.cpp,v 1.10 94/03/24 18:22:49 gildea Exp $
  XCOMM
  XCOMM	Do the equivalent of the 'makedepend' program, but do it right.
  XCOMM
--- 1,6 ----
  XCOMM!/bin/sh
  XCOMM
! XCOMM $XConsortium: mdepend.cpp,v 1.12 94/12/09 22:50:34 gildea Exp $
  XCOMM
  XCOMM	Do the equivalent of the 'makedepend' program, but do it right.
  XCOMM
***************
*** 59,65 ****
  
  while [ $# != 0 ]
  do
!     if [ "$endmarker"x != x -a "$endmarker" = "$1" ]; then
  	endmarker=""
      else
  	case "$1" in
--- 59,65 ----
  
  while [ $# != 0 ]
  do
!     if [ "$endmarker"x != x ] && [ "$endmarker" = "$1" ]; then
  	endmarker=""
      else
  	case "$1" in
***************
*** 126,132 ****
  done
  echo ' $*' >> $ARGS
  
! echo "exec $CC `cat $ARGS`" > $CPPCMD
  chmod +x $CPPCMD
  rm $ARGS
  
--- 126,133 ----
  done
  echo ' $*' >> $ARGS
  
! echo "#!/bin/sh" > $CPPCMD
! echo "exec $CC `cat $ARGS`" >> $CPPCMD
  chmod +x $CPPCMD
  rm $ARGS
  
*** -	Sun Jan 29 07:17:35 1995
--- xc/config/util/lndir.c	Sun Jan 29 07:17:35 1995
***************
*** 1,4 ****
! /* $XConsortium: lndir.c,v 1.13 94/04/17 20:10:42 rws Exp $ */
  /* Create shadow link tree (after X11R4 script of the same name)
     Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
  
--- 1,4 ----
! /* $XConsortium: lndir.c,v 1.14 95/01/09 20:08:20 kaleb Exp $ */
  /* Create shadow link tree (after X11R4 script of the same name)
     Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
  
***************
*** 228,233 ****
--- 228,235 ----
  		if (!strcmp (dp->d_name, "RCS"))
  		    continue;
  		if (!strcmp (dp->d_name, "SCCS"))
+ 		    continue;
+ 		if (!strcmp (dp->d_name, "CVS"))
  		    continue;
  		if (!strcmp (dp->d_name, "CVS.adm"))
  		    continue;
*** -	Sun Jan 29 07:17:36 1995
--- xc/config/makedepend/main.c	Sun Jan 29 07:17:36 1995
***************
*** 1,4 ****
! /* $XConsortium: main.c,v 1.83 94/04/17 20:10:36 gildea Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
--- 1,4 ----
! /* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 108,114 ****
  	fatalerr ("got signal %d\n", sig);
  }
  
! #if defined(USG) || (defined(SYSV386) && defined(SYSV)) || defined(WIN32)
  #define USGISH
  #endif
  
--- 108,114 ----
  	fatalerr ("got signal %d\n", sig);
  }
  
! #if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32)
  #define USGISH
  #endif
  
*** -	Sun Jan 29 07:17:38 1995
--- xc/fonts/PEX/lex.l	Sun Jan 29 07:17:38 1995
***************
*** 1,5 ****
  %{
! /* $XConsortium: lex.l,v 5.7 94/06/04 17:03:52 rws Exp $ */
  
  /*****************************************************************
  
--- 1,5 ----
  %{
! /* $XConsortium: lex.l,v 5.9 95/01/05 19:18:40 kaleb Exp $ */
  
  /*****************************************************************
  
***************
*** 57,63 ****
  #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
  #else
! #if defined(ISC) && defined(SYSV) && defined(SYSV386) && __STDC__
  extern double atof(char *);
  #endif
  #endif
--- 57,63 ----
  #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
  #else
! #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern double atof(char *);
  #endif
  #endif
***************
*** 143,151 ****
  		str++;
  		n -= 2;	/* one for EOL, one for end quote */
  	}
! 	if ((yylval.cval = (char *)malloc(n)) != NULL)
  	{
  		strncpy(yylval.cval, str, n);
  		return STRING;
  	}
  	else
--- 143,152 ----
  		str++;
  		n -= 2;	/* one for EOL, one for end quote */
  	}
! 	if ((yylval.cval = (char *)malloc(n + 1)) != NULL)
  	{
  		strncpy(yylval.cval, str, n);
+ 		yylval.cval[n] = '\0';
  		return STRING;
  	}
  	else
*** -	Sun Jan 29 07:17:39 1995
--- xc/include/Imakefile	Sun Jan 29 07:17:39 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.85 94/03/29 15:54:38 gildea Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags /**/
  
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.86 94/11/21 18:19:48 kaleb Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags /**/
  
***************
*** 28,33 ****
--- 28,39 ----
  
  InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS))
  MakeSubdirs($(SUBDIRS))
+ 
+ InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(Xos.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(Xproto.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(Xprotostr.h,$(LINKKITDIR)/include)
  
  depend::
  
*** -	Sun Jan 29 07:17:40 1995
--- xc/include/fonts/Imakefile	Sun Jan 29 07:17:40 1995
***************
*** 1,8 ****
! XCOMM $XConsortium: Imakefile,v 1.3 94/03/29 15:54:34 gildea Exp $
  
!     HEADERS = FS.h FSproto.h
  
  all::
      
  BuildIncludes($(HEADERS),fonts,..)
  InstallMultipleFlags($(HEADERS),$(INCDIR)/fonts,$(INSTINCFLAGS))
--- 1,13 ----
! XCOMM $XConsortium: Imakefile,v 1.5 95/01/23 15:46:52 kaleb Exp $
  
!     HEADERS = FS.h FSproto.h fsmasks.h
  
  all::
      
  BuildIncludes($(HEADERS),fonts,..)
  InstallMultipleFlags($(HEADERS),$(INCDIR)/fonts,$(INSTINCFLAGS))
+ 
+ InstallLinkKitNonExecFile(fontstruct.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(font.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(fsmasks.h,$(LINKKITDIR)/include)
+ 
*** -	Sun Jan 29 07:17:41 1995
--- xc/include/Xfuncs.h	Sun Jan 29 07:17:41 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: Xfuncs.h,v 1.15 94/04/17 20:10:50 rws Exp $
   * 
   * 
  Copyright (c) 1990  X Consortium
--- 1,5 ----
  /*
!  * $XConsortium: Xfuncs.h,v 1.16 94/12/01 16:25:53 kaleb Exp $
   * 
   * 
  Copyright (c) 1990  X Consortium
***************
*** 77,82 ****
--- 77,83 ----
  #include <memory.h>
  #define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
  #if defined(SYSV) && defined(_XBCOPYFUNC)
+ #undef memmove
  #define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
  #define _XNEEDBCOPYFUNC
  #endif
*** -	Sun Jan 29 07:17:42 1995
--- xc/include/Xosdefs.h	Sun Jan 29 07:17:42 1995
***************
*** 1,7 ****
  /*
   * O/S-dependent (mis)feature macro definitions
   *
!  * $XConsortium: Xosdefs.h,v 1.13 94/04/17 20:10:51 rws Exp $
   *
  Copyright (c) 1991  X Consortium
  
--- 1,7 ----
  /*
   * O/S-dependent (mis)feature macro definitions
   *
!  * $XConsortium: Xosdefs.h,v 1.14 94/11/30 20:48:05 kaleb Exp $
   *
  Copyright (c) 1991  X Consortium
  
***************
*** 79,85 ****
  #endif
  #endif
  
! #ifdef SYSV386
  #ifdef SYSV
  #define X_NOT_POSIX
  #define X_NOT_STDC_ENV
--- 79,85 ----
  #endif
  #endif
  
! #ifdef i386
  #ifdef SYSV
  #define X_NOT_POSIX
  #define X_NOT_STDC_ENV
*** -	Sun Jan 29 07:17:43 1995
--- xc/include/Xos.h	Sun Jan 29 07:17:43 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: Xos.h,v 1.66 94/04/17 20:10:51 rws Exp $
   * 
   * 
  Copyright (c) 1987  X Consortium
--- 1,5 ----
  /*
!  * $XConsortium: Xos.h,v 1.67 94/11/30 20:48:05 kaleb Exp $
   * 
   * 
  Copyright (c) 1987  X Consortium
***************
*** 108,114 ****
   */
  #ifdef X_NOT_POSIX
  #include <fcntl.h>
! #if defined(USL) || defined(CRAY) || defined(MOTOROLA) || defined(SYSV386) || defined(__sxg__)
  #include <unistd.h>
  #endif
  #ifdef WIN32
--- 108,114 ----
   */
  #ifdef X_NOT_POSIX
  #include <fcntl.h>
! #if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
  #include <unistd.h>
  #endif
  #ifdef WIN32
*** -	Sun Jan 29 07:17:44 1995
--- xc/lib/Xaw/Panner.c	Sun Jan 29 07:17:44 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: Panner.c,v 1.49 94/04/17 20:12:31 kaleb Exp $
   *
  Copyright (c) 1989, 1994  X Consortium
  
--- 1,5 ----
  /*
!  * $XConsortium: Panner.c,v 1.52 95/01/10 14:31:26 kaleb Exp $
   *
  Copyright (c) 1989, 1994  X Consortium
  
***************
*** 40,46 ****
  
  extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
  
! #if defined(ISC) && defined(SYSV) && defined(SYSV386) && __STDC__
  extern double atof(char *);
  #endif
  
--- 40,46 ----
  
  extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
  
! #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern double atof(char *);
  #endif
  
*** -	Sun Jan 29 07:17:46 1995
--- xc/lib/Xaw/XawIm.c	Sun Jan 29 07:17:45 1995
***************
*** 1,4 ****
! /* $XConsortium: XawIm.c,v 1.5 94/04/17 20:13:30 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
--- 1,4 ----
! /* $XConsortium: XawIm.c,v 1.6 95/01/20 16:17:21 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
***************
*** 57,63 ****
  #include <X11/IntrinsicP.h>
  #include <X11/StringDefs.h>
  #include <X11/Xos.h>
- #include <X11/Xlocale.h>
  #include <X11/Xfuncs.h>
  #include <X11/ShellP.h>
  #include <X11/Xaw/TextP.h>
--- 57,62 ----
***************
*** 447,453 ****
  
      if (ve->im.open_im == False) return;
      ve->im.xim = NULL;
-     if (!strcmp(setlocale(LC_ALL, NULL), "C")) return;
      if (ve->im.im_list_num <= 0) {
  	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
  	    xim = XOpenIM(XtDisplay(ve->parent), NULL, NULL, NULL);
--- 446,451 ----
*** -	Sun Jan 29 07:17:47 1995
--- xc/lib/Xaw/MultiSink.c	Sun Jan 29 07:17:47 1995
***************
*** 1,4 ****
! /* $XConsortium: MultiSink.c,v 1.5 94/04/17 20:12:22 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
--- 1,4 ----
! /* $XConsortium: MultiSink.c,v 1.6 95/01/23 18:34:46 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
***************
*** 320,326 ****
                  x += width;
                  j = -1;
              }
!             else if (XwcTextEscapement (sink->multi_sink.fontset, &buf[j], 1 == 0)) {
                  if (sink->multi_sink.display_nonprinting)
                      buf[j] = _Xaw_atowc('@');
                  else
--- 320,326 ----
                  x += width;
                  j = -1;
              }
!             else if (XwcTextEscapement (sink->multi_sink.fontset, &buf[j], 1) == 0) {
                  if (sink->multi_sink.display_nonprinting)
                      buf[j] = _Xaw_atowc('@');
                  else
*** -	Sun Jan 29 07:17:48 1995
--- xc/lib/Xaw/MultiSrc.c	Sun Jan 29 07:17:48 1995
***************
*** 1,4 ****
! /* $XConsortium: MultiSrc.c,v 1.6 94/04/17 20:12:25 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
--- 1,4 ----
! /* $XConsortium: MultiSrc.c,v 1.8 95/01/24 22:29:08 kaleb Exp $ */
  
  /*
   * Copyright 1991 by OMRON Corporation
***************
*** 62,70 ****
  
  #include <X11/IntrinsicP.h>
  #include <X11/StringDefs.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
  #include <X11/Xfuncs.h>
  #include <X11/Xaw/XawInit.h>
  #include <X11/Xaw/MultiSrcP.h>
--- 62,67 ----
***************
*** 73,78 ****
--- 70,78 ----
  #include <X11/Xmu/CharSet.h>
  #include "XawI18n.h"
  #include <X11/Xos.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
  
  /****************************************************************
   *
***************
*** 126,135 ****
  #ifdef X_NOT_STDC_ENV
  extern int errno; 
  #endif
- #if !defined(WIN32) && (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)))
- extern int sys_nerr;
- extern char* sys_errlist[];
- #endif
  
  #ifdef X_NOT_POSIX
  #define Off_t long
--- 126,131 ----
***************
*** 1170,1188 ****
  	} else {
  	    String params[2];
  	    Cardinal num_params = 2;
- 	    char msg[11];
  	    
  	    params[0] = src->multi_src.string;
! #if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
! 	    if (errno <= sys_nerr)
! 		params[1] = sys_errlist[errno];
! 	    else {
! 		sprintf(msg, "errno=%.4d", errno);
! 		params[1] = msg;
! 	    }
! #else
! 	    params[1] = msg;
! #endif
  	    XtAppWarningMsg(XtWidgetToApplicationContext((Widget)src),
  			    "openError", "multiSourceCreate", "XawWarning",
  			    "Cannot open file %s; %s", params, &num_params);
--- 1166,1174 ----
  	} else {
  	    String params[2];
  	    Cardinal num_params = 2;
  	    
  	    params[0] = src->multi_src.string;
! 	    params[1] = strerror(errno);
  	    XtAppWarningMsg(XtWidgetToApplicationContext((Widget)src),
  			    "openError", "multiSourceCreate", "XawWarning",
  			    "Cannot open file %s; %s", params, &num_params);
*** -	Sun Jan 29 07:17:49 1995
--- xc/lib/Xaw/XawI18n.h	Sun Jan 29 07:17:49 1995
***************
*** 1,4 ****
! /* $XConsortium: XawI18n.h,v 1.11 94/07/05 11:13:10 kaleb Exp $ */
  
  /************************************************************
  
--- 1,4 ----
! /* $XConsortium: XawI18n.h,v 1.12 95/01/25 00:48:44 kaleb Exp $ */
  
  /************************************************************
  
***************
*** 73,78 ****
  #ifndef HAS_ISW_FUNCS
  #include <ctype.h>
  #ifndef iswspace
! #define iswspace(c) (isascii(c) && isspace(c))
  #endif
  #endif
--- 73,78 ----
  #ifndef HAS_ISW_FUNCS
  #include <ctype.h>
  #ifndef iswspace
! #define iswspace(c) (isascii(c) && isspace(toascii(c)))
  #endif
  #endif
*** /dev/null	Sun Jan 29 07:17:50 1995
--- xc/lib/Xaw/jump_funcs	Sun Jan 29 07:17:50 1995
***************
*** 0 ****
--- 1,113 ----
+ # $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
+ 00000000 T _XawAsciiSaveAsFile  libXaw         AsciiSrc
+ 00000000 T _XawAsciiSourceChanged libXaw         AsciiSrc
+ 00000000 T _XawDialogAddButton  libXaw         Dialog
+ 00000000 T _XawDialogGetValueString libXaw         Dialog
+ 00000000 T _XawFormDoLayout     libXaw         Form
+ 00000000 T _XawListChange       libXaw         List
+ 00000000 T _XawListUnhighlight  libXaw         List
+ 00000000 T _XawListHighlight    libXaw         List
+ 00000000 T _XawListShowCurrent  libXaw         List
+ 00000000 T _XawPanedSetMinMax   libXaw         Paned
+ 00000000 T _XawPanedGetMinMax   libXaw         Paned
+ 00000000 T _XawPanedSetRefigureMode libXaw         Paned
+ 00000000 T _XawPanedGetNumSub   libXaw         Paned
+ 00000000 T _XawPanedAllowResize libXaw         Paned
+ 00000000 T _XawScrollbarSetThumb libXaw         Scrollbar
+ 00000000 T _XawSimpleMenuAddGlobalActions libXaw         SimpleMenu
+ 00000000 T _XawSimpleMenuGetActiveEntry libXaw         SimpleMenu
+ 00000000 T _XawSimpleMenuClearActiveEntry libXaw         SimpleMenu
+ 00000000 T __XawTextNeedsUpdating libXaw         Text
+ 00000000 T __XawTextGetText     libXaw         Text
+ 00000000 T __XawTextGetSTRING   libXaw         Text
+ 00000000 T __XawTextBuildLineTable libXaw         Text
+ 00000000 T __XawTextSetScrollBars libXaw         Text
+ 00000000 T __XawTextVScroll     libXaw         Text
+ 00000000 T __XawTextSaltAwaySelection libXaw         Text
+ 00000000 T __XawTextReplace     libXaw         Text
+ 00000000 T __XawTextClearAndCenterDisplay libXaw         Text
+ 00000000 T __XawTextCheckResize libXaw         Text
+ 00000000 T __XawTextSelectionList libXaw         Text
+ 00000000 T __XawTextSetSelection libXaw         Text
+ 00000000 T __XawTextAlterSelection libXaw         Text
+ 00000000 T __XawTextPrepareToUpdate libXaw         Text
+ 00000000 T __XawTextShowPosition libXaw         Text
+ 00000000 T __XawTextExecuteUpdate libXaw         Text
+ 00000000 T _XawTextDisplay      libXaw         Text
+ 00000000 T _XawTextSetSelectionArray libXaw         Text
+ 00000000 T _XawTextGetSelectionPos libXaw         Text
+ 00000000 T _XawTextSetSource    libXaw         Text
+ 00000000 T _XawTextReplace      libXaw         Text
+ 00000000 T _XawTextTopPosition  libXaw         Text
+ 00000000 T _XawTextSetInsertionPoint libXaw         Text
+ 00000000 T _XawTextGetInsertionPoint libXaw         Text
+ 00000000 T _XawTextUnsetSelection libXaw         Text
+ 00000000 T _XawTextSetSelection libXaw         Text
+ 00000000 T _XawTextInvalidate   libXaw         Text
+ 00000000 T _XawTextDisableRedisplay libXaw         Text
+ 00000000 T _XawTextEnableRedisplay libXaw         Text
+ 00000000 T _XawTextGetSource    libXaw         Text
+ 00000000 T _XawTextDisplayCaret libXaw         Text
+ 00000000 T _XawTextSearch       libXaw         Text
+ 00000000 T _XawTextSinkDisplayText libXaw         TextSink
+ 00000000 T _XawTextSinkInsertCursor libXaw         TextSink
+ 00000000 T _XawTextSinkClearToBackground libXaw         TextSink
+ 00000000 T _XawTextSinkFindPosition libXaw         TextSink
+ 00000000 T _XawTextSinkFindDistance libXaw         TextSink
+ 00000000 T _XawTextSinkResolve  libXaw         TextSink
+ 00000000 T _XawTextSinkMaxLines libXaw         TextSink
+ 00000000 T _XawTextSinkMaxHeight libXaw         TextSink
+ 00000000 T _XawTextSinkSetTabs  libXaw         TextSink
+ 00000000 T _XawTextSinkGetCursorBounds libXaw         TextSink
+ 00000000 T _XawTextSourceRead   libXaw         TextSrc
+ 00000000 T _XawTextSourceReplace libXaw         TextSrc
+ 00000000 T _XawTextSourceScan   libXaw         TextSrc
+ 00000000 T _XawTextSourceSearch libXaw         TextSrc
+ 00000000 T _XawTextSourceConvertSelection libXaw         TextSrc
+ 00000000 T _XawTextSourceSetSelection libXaw         TextSrc
+ 00000000 T __XawTextZapSelection libXaw         TextAction
+ 00000000 T __XawTextInsertFileAction libXaw         TextPop
+ 00000000 T __XawTextInsertFile  libXaw         TextPop
+ 00000000 T __XawTextDoSearchAction libXaw         TextPop
+ 00000000 T __XawTextPopdownSearchAction libXaw         TextPop
+ 00000000 T __XawTextSearch      libXaw         TextPop
+ 00000000 T __XawTextDoReplaceAction libXaw         TextPop
+ 00000000 T __XawTextSetField    libXaw         TextPop
+ 00000000 T _XawToggleChangeRadioGroup libXaw         Toggle
+ 00000000 T _XawToggleGetCurrent libXaw         Toggle
+ 00000000 T _XawToggleSetCurrent libXaw         Toggle
+ 00000000 T _XawToggleUnsetCurrent libXaw         Toggle
+ 00000000 T _XawTreeForceLayout  libXaw         Tree
+ 00000000 T _XawViewportSetLocation libXaw         Viewport
+ 00000000 T _XawViewportSetCoordinates libXaw         Viewport
+ 00000000 T _XawInitializeWidgetSet libXaw         XawInit
+ 00000000 T __XawMultiSourceFreeString libXaw         MultiSrc
+ 00000000 T __XawMultiSave       libXaw         MultiSrc
+ 00000000 T __XawMultiSaveAsFile libXaw         MultiSrc
+ 00000000 T __XawMultiSinkPosToXY libXaw         MultiSink
+ 00000000 T __XawTextPosToXY     libXaw         Text
+ 00000000 T __XawTextFormat      libXaw         TextSrc
+ 00000000 T __XawTextWCToMB      libXaw         TextSrc
+ 00000000 T __XawTextMBToWC      libXaw         TextSrc
+ 00000000 T _XawVendorShellExtResize libXaw         Vendor
+ 00000000 T __XawImResizeVendorShell libXaw         XawIm
+ 00000000 T __XawImGetShellHeight libXaw         XawIm
+ 00000000 T __XawImRealize       libXaw         XawIm
+ 00000000 T __XawImInitialize    libXaw         XawIm
+ 00000000 T __XawImReconnect     libXaw         XawIm
+ 00000000 T __XawImRegister      libXaw         XawIm
+ 00000000 T __XawImUnregister    libXaw         XawIm
+ 00000000 T __XawImSetValues     libXaw         XawIm
+ 00000000 T __XawImVASetValues   libXaw         XawIm
+ 00000000 T __XawImSetFocusValues libXaw         XawIm
+ 00000000 T __XawImVASetFocusValues libXaw         XawIm
+ 00000000 T __XawImUnsetFocus    libXaw         XawIm
+ 00000000 T __XawImWcLookupString libXaw         XawIm
+ 00000000 T __XawImGetImAreaHeight libXaw         XawIm
+ 00000000 T __XawImCallVendorShellExtResize libXaw         XawIm
+ 00000000 T __XawImDestroy       libXaw         XawIm
+ 00000000 T __Xaw_atowc          libXaw         XawI18n
*** /dev/null	Sun Jan 29 07:17:51 1995
--- xc/lib/Xaw/jump_ignore	Sun Jan 29 07:17:51 1995
***************
*** 0 ****
--- 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
*** /dev/null	Sun Jan 29 07:17:52 1995
--- xc/lib/Xaw/jump_vars	Sun Jan 29 07:17:52 1995
***************
*** 0 ****
--- 1,79 ----
+ # $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
+ 00000140 D _asciiSinkClassRec   libXaw         AsciiSink
+ 00000004 D _asciiSinkObjectClass libXaw         AsciiSink
+ 00000120 D _asciiSrcClassRec    libXaw         AsciiSrc
+ 00000004 D _asciiSrcObjectClass libXaw         AsciiSrc
+ 00000100 D _asciiTextClassRec   libXaw         AsciiText
+ 00000004 D _asciiTextWidgetClass libXaw         AsciiText
+ 00000100 D _boxClassRec         libXaw         Box
+ 00000004 D _boxWidgetClass      libXaw         Box
+ 00000100 D _commandClassRec     libXaw         Command
+ 00000004 D _commandWidgetClass  libXaw         Command
+ 00000140 D _dialogClassRec      libXaw         Dialog
+ 00000004 D _dialogWidgetClass   libXaw         Dialog
+ 00000140 D _formClassRec        libXaw         Form
+ 00000004 D _formWidgetClass     libXaw         Form
+ 00000100 D _gripClassRec        libXaw         Grip
+ 00000004 D _gripWidgetClass     libXaw         Grip
+ 00000100 D _labelClassRec       libXaw         Label
+ 00000004 D _labelWidgetClass    libXaw         Label
+ 00000100 D _listClassRec        libXaw         List
+ 00000004 D _listWidgetClass     libXaw         List
+ 00000100 D _menuButtonClassRec  libXaw         MenuButton
+ 00000004 D _menuButtonWidgetClass libXaw         MenuButton
+ 00000140 D _panedClassRec       libXaw         Paned
+ 00000004 D _panedWidgetClass    libXaw         Paned
+ 00000004 D _vPanedWidgetClass   libXaw         Paned
+ 00000100 D _pannerClassRec      libXaw         Panner
+ 00000004 D _pannerWidgetClass   libXaw         Panner
+ 00000100 D _portholeClassRec    libXaw         Porthole
+ 00000004 D _portholeWidgetClass libXaw         Porthole
+ 00000100 D _repeaterClassRec    libXaw         Repeater
+ 00000004 D _repeaterWidgetClass libXaw         Repeater
+ 00000100 D _scrollbarClassRec   libXaw         Scrollbar
+ 00000004 D _scrollbarWidgetClass libXaw         Scrollbar
+ 00000100 D _simpleClassRec      libXaw         Simple
+ 00000004 D _simpleWidgetClass   libXaw         Simple
+ 00000100 D _simpleMenuClassRec  libXaw         SimpleMenu
+ 00000004 D _simpleMenuWidgetClass libXaw         SimpleMenu
+ 00000100 D _smeClassRec         libXaw         Sme
+ 00000004 D _smeObjectClass      libXaw         Sme
+ 00000100 D _smeBSBClassRec      libXaw         SmeBSB
+ 00000004 D _smeBSBObjectClass   libXaw         SmeBSB
+ 00000100 D _smeLineClassRec     libXaw         SmeLine
+ 00000004 D _smeLineObjectClass  libXaw         SmeLine
+ 00000100 D _stripChartClassRec  libXaw         StripChart
+ 00000004 D _stripChartWidgetClass libXaw         StripChart
+ 00000004 D _FMT8BIT             libXaw         Text
+ 00000100 D _textClassRec        libXaw         Text
+ 00000004 D _textWidgetClass     libXaw         Text
+ 00000100 D _textSinkClassRec    libXaw         TextSink
+ 00000004 D _textSinkObjectClass libXaw         TextSink
+ 00000100 D _textSrcClassRec     libXaw         TextSrc
+ 00000004 D _textSrcObjectClass  libXaw         TextSrc
+ 00000300 D __XawTextActionsTable libXaw         TextAction
+ 00000004 D __XawTextActionsTableCount libXaw         TextAction
+ 00000004 D __XawDefaultTextTranslations1 libXaw         TextTr
+ 00000004 D __XawDefaultTextTranslations2 libXaw         TextTr
+ 00000004 D __XawDefaultTextTranslations3 libXaw         TextTr
+ 00000100 D _toggleClassRec      libXaw         Toggle
+ 00000004 D _toggleWidgetClass   libXaw         Toggle
+ 00000140 D _treeClassRec        libXaw         Tree
+ 00000004 D _treeWidgetClass     libXaw         Tree
+ 00000100 D _vendorShellClassRec libXaw         Vendor
+ 00000004 D _vendorShellWidgetClass libXaw         Vendor
+ 00000140 D _viewportClassRec    libXaw         Viewport
+ 00000004 D _viewportWidgetClass libXaw         Viewport
+ 00000140 D _multiSrcClassRec    libXaw         MultiSrc
+ 00000004 D _multiSrcObjectClass libXaw         MultiSrc
+ 00000140 D _multiSinkClassRec   libXaw         MultiSink
+ 00000004 D _multiSinkObjectClass libXaw         MultiSink
+ 00000004 D __XawDefaultTextTranslations4 libXaw         TextTr
+ 00000140 D _xawvendorShellExtClassRec libXaw         Vendor
+ 00000004 D _xawvendorShellExtWidgetClass libXaw         Vendor
+ 00000004 D _XawFmt8Bit          libXaw         Text
+ 00000004 D _XawFmtWide          libXaw         Text
*** -	Sun Jan 29 07:17:53 1995
--- xc/lib/Xt/Intrinsic.c	Sun Jan 29 07:17:53 1995
***************
*** 1,4 ****
! /* $XConsortium: Intrinsic.c,v 1.194 94/04/17 20:14:16 kaleb Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
--- 1,4 ----
! /* $XConsortium: Intrinsic.c,v 1.196 94/11/21 18:20:56 kaleb Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
***************
*** 789,796 ****
  }
  
  /*
- 
- /*
   * Internal routine; must be called only after XtIsWidget returns false
   */
  Widget _XtWindowedAncestor(object)
--- 789,794 ----
***************
*** 1056,1062 ****
      String	lang;
  {
  
! #if defined(hpux) || defined(__bsdi__) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
--- 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 ':'
*** -	Sun Jan 29 07:17:54 1995
--- xc/lib/Xt/Initialize.c	Sun Jan 29 07:17:54 1995
***************
*** 1,4 ****
! /* $XConsortium: Initialize.c,v 1.220 94/04/17 20:14:13 converse Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
--- 1,4 ----
! /* $XConsortium: Initialize.c,v 1.222 94/12/12 18:59:11 kaleb Exp $ */
  
  /***********************************************************
  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
***************
*** 229,236 ****
  #else
      int uid;
      extern int getuid();
! #ifndef SYSV386
      extern struct passwd *getpwuid(), *getpwnam();
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
--- 229,238 ----
  #else
      int uid;
      extern int getuid();
! #ifndef i386
! # ifndef SYSV
      extern struct passwd *getpwuid(), *getpwnam();
+ # endif
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
***************
*** 276,283 ****
  #else
       int uid;
       extern int getuid();
! #ifndef SYSV386
       extern struct passwd *getpwuid(), *getpwnam();
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
--- 278,287 ----
  #else
       int uid;
       extern int getuid();
! #ifndef i386
! # ifndef SYSV
       extern struct passwd *getpwuid(), *getpwnam();
+ # endif
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
*** -	Sun Jan 29 07:17:55 1995
--- xc/lib/Xt/Xtos.h	Sun Jan 29 07:17:55 1995
***************
*** 1,5 ****
  /*
! * $XConsortium: Xtos.h,v 1.15 94/04/17 20:15:05 rws Exp $
  */
  
  /***********************************************************
--- 1,5 ----
  /*
! * $XConsortium: Xtos.h,v 1.17 94/09/16 19:00:07 kaleb Exp $
  */
  
  /***********************************************************
***************
*** 74,91 ****
   */
  #if defined(__HIGHC__)
  
  extern char *alloca();
  
  #if HCVERSION < 21003
  #define ALLOCATE_LOCAL(size)	alloca((int)(size))
- #if defined(NCR)
- #pragma on(alloca);
- #else
  pragma on(alloca);
- #endif
  #else /* HCVERSION >= 21003 */
  #define	ALLOCATE_LOCAL(size)	_Alloca((int)(size))
  #endif /* HCVERSION < 21003 */
  
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  
--- 74,91 ----
   */
  #if defined(__HIGHC__)
  
+ #ifndef NCR
  extern char *alloca();
  
  #if HCVERSION < 21003
  #define ALLOCATE_LOCAL(size)	alloca((int)(size))
  pragma on(alloca);
  #else /* HCVERSION >= 21003 */
  #define	ALLOCATE_LOCAL(size)	_Alloca((int)(size))
  #endif /* HCVERSION < 21003 */
+ #else
+ #define ALLOCATE_LOCAL(size)	alloca(size)
+ #endif
  
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  
***************
*** 99,108 ****
  #define ALLOCATE_LOCAL(size) alloca((int)(size))
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  #else /* ! __GNUC__ */
  /*
!  * warning: mips alloca is unsuitable, do not use.
   */
! #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar)
  /*
   * Some System V boxes extract alloca.o from /lib/libPW.a; if you
   * decide that you don't want to use alloca, you might want to fix it here.
--- 99,112 ----
  #define ALLOCATE_LOCAL(size) alloca((int)(size))
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  #else /* ! __GNUC__ */
+ 
  /*
!  * warning: old mips alloca (pre 2.10) is unusable, new one is built in
!  * Test is easy, the new is is named __builtin_alloca and comes
!  * from alloca.h which #defines alloca.
   */
! #ifndef NCR
! #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
  /*
   * Some System V boxes extract alloca.o from /lib/libPW.a; if you
   * decide that you don't want to use alloca, you might want to fix it here.
***************
*** 113,118 ****
--- 117,123 ----
  #define ALLOCATE_LOCAL(size) alloca((int)(size))
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  #endif /* who does alloca */
+ #endif /* NCR */
  #endif /* __GNUC__ */
  
  #endif /* NO_ALLOCA */
*** /dev/null	Sun Jan 29 07:17:56 1995
--- xc/lib/Xt/jump_funcs	Sun Jan 29 07:17:56 1995
***************
*** 0 ****
--- 1,673 ----
+ # $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
+ 00000000 T __XtAllocError       libXt          Alloc
+ 00000000 T __XtHeapInit         libXt          Alloc
+ 00000000 T _XtMalloc            libXt          Alloc
+ 00000000 T _XtRealloc           libXt          Alloc
+ 00000000 T _XtCalloc            libXt          Alloc
+ 00000000 T _XtFree              libXt          Alloc
+ 00000000 T __XtHeapAlloc        libXt          Alloc
+ 00000000 T __XtHeapFree         libXt          Alloc
+ 00000000 T _XtMergeArgLists     libXt          ArgList
+ 00000000 T __XtAddCallback      libXt          Callback
+ 00000000 T __XtAddCallbackOnce  libXt          Callback
+ 00000000 T _XtAddCallback       libXt          Callback
+ 00000000 T _XtAddCallbacks      libXt          Callback
+ 00000000 T __XtRemoveCallback   libXt          Callback
+ 00000000 T _XtRemoveCallback    libXt          Callback
+ 00000000 T _XtRemoveCallbacks   libXt          Callback
+ 00000000 T __XtRemoveAllCallbacks libXt          Callback
+ 00000000 T _XtRemoveAllCallbacks libXt          Callback
+ 00000000 T __XtCompileCallbackList libXt          Callback
+ 00000000 T __XtGetCallbackList  libXt          Callback
+ 00000000 T _XtCallCallbacks     libXt          Callback
+ 00000000 T _XtHasCallbacks      libXt          Callback
+ 00000000 T _XtCallCallbackList  libXt          Callback
+ 00000000 T __XtCallConditionalCallbackList libXt          Callback
+ 00000000 T _XtSetMultiClickTime libXt          ClickTime
+ 00000000 T _XtGetMultiClickTime libXt          ClickTime
+ 00000000 T __XtSetDefaultConverterTable libXt          Convert
+ 00000000 T __XtFreeConverterTable libXt          Convert
+ 00000000 T __XtTableAddConverter libXt          Convert
+ 00000000 T _XtSetTypeConverter  libXt          Convert
+ 00000000 T _XtAppSetTypeConverter libXt          Convert
+ 00000000 T _XtAddConverter      libXt          Convert
+ 00000000 T _XtAppAddConverter   libXt          Convert
+ 00000000 T __XtCacheFlushTag    libXt          Convert
+ 00000000 T _XtDirectConvert     libXt          Convert
+ 00000000 T _XtCallConverter     libXt          Convert
+ 00000000 T __XtConvert          libXt          Convert
+ 00000000 T _XtConvert           libXt          Convert
+ 00000000 T _XtConvertAndStore   libXt          Convert
+ 00000000 T _XtAppReleaseCacheRefs libXt          Convert
+ 00000000 T _XtCallbackReleaseCacheRefList libXt          Convert
+ 00000000 T _XtCallbackReleaseCacheRef libXt          Convert
+ 00000000 T __XtConvertInitialize libXt          Converters
+ 00000000 T _XtDisplayStringConversionWarning libXt          Converters
+ 00000000 T _XtStringConversionWarning libXt          Converters
+ 00000000 T _XtCvtIntToBoolean   libXt          Converters
+ 00000000 T _XtCvtIntToShort     libXt          Converters
+ 00000000 T _XtCvtStringToBoolean libXt          Converters
+ 00000000 T _XtCvtIntToBool      libXt          Converters
+ 00000000 T _XtCvtStringToBool   libXt          Converters
+ 00000000 T _XtCvtIntToColor     libXt          Converters
+ 00000000 T _XtCvtStringToPixel  libXt          Converters
+ 00000000 T _XtCvtStringToCursor libXt          Converters
+ 00000000 T _XtCvtStringToDisplay libXt          Converters
+ 00000000 T _XtCvtStringToFile   libXt          Converters
+ 00000000 T _XtCvtIntToFloat     libXt          Converters
+ 00000000 T _XtCvtStringToFloat  libXt          Converters
+ 00000000 T _XtCvtStringToFont   libXt          Converters
+ 00000000 T _XtCvtIntToFont      libXt          Converters
+ 00000000 T _XtCvtStringToFontSet libXt          Converters
+ 00000000 T _XtCvtStringToFontStruct libXt          Converters
+ 00000000 T _XtCvtStringToInt    libXt          Converters
+ 00000000 T _XtCvtStringToShort  libXt          Converters
+ 00000000 T _XtCvtStringToDimension libXt          Converters
+ 00000000 T _XtCvtIntToUnsignedChar libXt          Converters
+ 00000000 T _XtCvtStringToUnsignedChar libXt          Converters
+ 00000000 T _XtCvtColorToPixel   libXt          Converters
+ 00000000 T _XtCvtIntToPixel     libXt          Converters
+ 00000000 T _XtCvtIntToPixmap    libXt          Converters
+ 00000000 T _XtCvtStringToInitialState libXt          Converters
+ 00000000 T _XtCvtStringToVisual libXt          Converters
+ 00000000 T _XtCvtStringToAtom   libXt          Converters
+ 00000000 T __XtAddDefaultConverters libXt          Converters
+ 00000000 T _XtCvtStringToDirectoryString libXt          Converters
+ 00000000 T _XtCvtStringToCommandArgArray libXt          Converters
+ 00000000 T _XtInitializeWidgetClass libXt          Create
+ 00000000 T __XtCreateWidget     libXt          Create
+ 00000000 T _XtCreateWidget      libXt          Create
+ 00000000 T _XtCreateManagedWidget libXt          Create
+ 00000000 T __XtCreatePopupShell libXt          Create
+ 00000000 T _XtCreatePopupShell  libXt          Create
+ 00000000 T __XtAppCreateShell   libXt          Create
+ 00000000 T _XtAppCreateShell    libXt          Create
+ 00000000 T _XtCreateApplicationShell libXt          Create
+ 00000000 T __XtDoPhase2Destroy  libXt          Destroy
+ 00000000 T _XtDestroyWidget     libXt          Destroy
+ 00000000 T __XtGetProcessContext libXt          Display
+ 00000000 T __XtDefaultAppContext libXt          Display
+ 00000000 T _XtOpenDisplay       libXt          Display
+ 00000000 T __XtAppInit          libXt          Display
+ 00000000 T _XtDisplayInitialize libXt          Display
+ 00000000 T _XtCreateApplicationContext libXt          Display
+ 00000000 T _XtDestroyApplicationContext libXt          Display
+ 00000000 T __XtDestroyAppContexts libXt          Display
+ 00000000 T _XtDatabase          libXt          Display
+ 00000000 T __XtSortPerDisplayList libXt          Display
+ 00000000 T _XtDisplayToApplicationContext libXt          Display
+ 00000000 T _XtCloseDisplay      libXt          Display
+ 00000000 T __XtCloseDisplays    libXt          Display
+ 00000000 T _XtWidgetToApplicationContext libXt          Display
+ 00000000 T _XtGetApplicationNameAndClass libXt          Display
+ 00000000 T _XtGetErrorDatabase  libXt          Error
+ 00000000 T _XtAppGetErrorDatabase libXt          Error
+ 00000000 T _XtGetErrorDatabaseText libXt          Error
+ 00000000 T _XtAppGetErrorDatabaseText libXt          Error
+ 00000000 T __XtDefaultErrorMsg  libXt          Error
+ 00000000 T __XtDefaultWarningMsg libXt          Error
+ 00000000 T _XtErrorMsg          libXt          Error
+ 00000000 T _XtAppErrorMsg       libXt          Error
+ 00000000 T _XtWarningMsg        libXt          Error
+ 00000000 T _XtAppWarningMsg     libXt          Error
+ 00000000 T _XtSetErrorMsgHandler libXt          Error
+ 00000000 T _XtAppSetErrorMsgHandler libXt          Error
+ 00000000 T _XtSetWarningMsgHandler libXt          Error
+ 00000000 T _XtAppSetWarningMsgHandler libXt          Error
+ 00000000 T __XtDefaultError     libXt          Error
+ 00000000 T __XtDefaultWarning   libXt          Error
+ 00000000 T _XtError             libXt          Error
+ 00000000 T _XtAppError          libXt          Error
+ 00000000 T _XtWarning           libXt          Error
+ 00000000 T _XtAppWarning        libXt          Error
+ 00000000 T _XtSetErrorHandler   libXt          Error
+ 00000000 T _XtAppSetErrorHandler libXt          Error
+ 00000000 T _XtSetWarningHandler libXt          Error
+ 00000000 T _XtAppSetWarningHandler libXt          Error
+ 00000000 T __XtSetDefaultErrorHandlers libXt          Error
+ 00000000 T _XtBuildEventMask    libXt          Event
+ 00000000 T _XtRemoveEventHandler libXt          Event
+ 00000000 T _XtAddEventHandler   libXt          Event
+ 00000000 T _XtInsertEventHandler libXt          Event
+ 00000000 T _XtRemoveRawEventHandler libXt          Event
+ 00000000 T _XtInsertRawEventHandler libXt          Event
+ 00000000 T _XtAddRawEventHandler libXt          Event
+ 00000000 T _XtWindowToWidget    libXt          Event
+ 00000000 T __XtAllocWWTable     libXt          Event
+ 00000000 T __XtFreeWWTable      libXt          Event
+ 00000000 T __XtConvertTypeToMask libXt          Event
+ 00000000 T __XtOnGrabList       libXt          Event
+ 00000000 T _XtDispatchEvent     libXt          Event
+ 00000000 T _XtAddGrab           libXt          Event
+ 00000000 T _XtRemoveGrab        libXt          Event
+ 00000000 T _XtMainLoop          libXt          Event
+ 00000000 T _XtAppMainLoop       libXt          Event
+ 00000000 T __XtEventInitialize  libXt          Event
+ 00000000 T _XtAddExposureToRegion libXt          Event
+ 00000000 T __XtFreeEventTable   libXt          Event
+ 00000000 T _XtLastTimestampProcessed libXt          Event
+ 00000000 T __XtSendFocusEvent   libXt          Event
+ 00000000 T __XtFreePerWidgetInput libXt          EventUtil
+ 00000000 T __XtGetPerWidgetInput libXt          EventUtil
+ 00000000 T __XtFillAncestorList libXt          EventUtil
+ 00000000 T __XtFindRemapWidget  libXt          EventUtil
+ 00000000 T __XtUngrabBadGrabs   libXt          EventUtil
+ 00000000 T _XtIsRectObj         libXt          Functions
+ 00000000 T _XtIsWidget          libXt          Functions
+ 00000000 T _XtIsComposite       libXt          Functions
+ 00000000 T _XtIsConstraint      libXt          Functions
+ 00000000 T _XtIsShell           libXt          Functions
+ 00000000 T _XtIsOverrideShell   libXt          Functions
+ 00000000 T _XtIsWMShell         libXt          Functions
+ 00000000 T _XtIsVendorShell     libXt          Functions
+ 00000000 T _XtIsTransientShell  libXt          Functions
+ 00000000 T _XtIsTopLevelShell   libXt          Functions
+ 00000000 T _XtIsApplicationShell libXt          Functions
+ 00000000 T _XtMapWidget         libXt          Functions
+ 00000000 T _XtUnmapWidget       libXt          Functions
+ 00000000 T _XtNewString         libXt          Functions
+ 00000000 T _XtIsSessionShell    libXt          Functions
+ 00000000 T __XtGClistFree       libXt          GCManager
+ 00000000 T _XtAllocateGC        libXt          GCManager
+ 00000000 T _XtGetGC             libXt          GCManager
+ 00000000 T _XtReleaseGC         libXt          GCManager
+ 00000000 T _XtDestroyGC         libXt          GCManager
+ 00000000 T __XtMakeGeometryRequest libXt          Geometry
+ 00000000 T _XtMakeGeometryRequest libXt          Geometry
+ 00000000 T _XtMakeResizeRequest libXt          Geometry
+ 00000000 T _XtResizeWindow      libXt          Geometry
+ 00000000 T _XtResizeWidget      libXt          Geometry
+ 00000000 T _XtConfigureWidget   libXt          Geometry
+ 00000000 T _XtMoveWidget        libXt          Geometry
+ 00000000 T _XtTranslateCoords   libXt          Geometry
+ 00000000 T _XtQueryGeometry     libXt          Geometry
+ 00000000 T _XtGetActionKeysym   libXt          GetActKey
+ 00000000 T _XtGetResourceList   libXt          GetResList
+ 00000000 T _XtGetConstraintResourceList libXt          GetResList
+ 00000000 T _XtGetValues         libXt          GetValues
+ 00000000 T _XtGetSubvalues      libXt          GetValues
+ 00000000 T __XtInherit          libXt          Initialize
+ 00000000 T _XtToolkitInitialize libXt          Initialize
+ 00000000 T _XtSetLanguageProc   libXt          Initialize
+ 00000000 T _XtScreenDatabase    libXt          Initialize
+ 00000000 T __XtPreparseCommandLine libXt          Initialize
+ 00000000 T __XtDisplayInitialize libXt          Initialize
+ 00000000 T _XtAppSetFallbackResources libXt          Initialize
+ 00000000 T _XtAppInitialize     libXt          Initialize
+ 00000000 T _XtInitialize        libXt          Initialize
+ 00000000 T _XtOpenApplication   libXt          Initialize
+ 00000000 T _XtIsSubclass        libXt          Intrinsic
+ 00000000 T __XtCheckSubclassFlag libXt          Intrinsic
+ 00000000 T __XtIsSubclassOf     libXt          Intrinsic
+ 00000000 T _XtRealizeWidget     libXt          Intrinsic
+ 00000000 T _XtUnrealizeWidget   libXt          Intrinsic
+ 00000000 T _XtCreateWindow      libXt          Intrinsic
+ 00000000 T _XtNameToWidget      libXt          Intrinsic
+ 00000000 T _XtDisplayOfObject   libXt          Intrinsic
+ 00000000 T _XtDisplay           libXt          Intrinsic
+ 00000000 T _XtScreenOfObject    libXt          Intrinsic
+ 00000000 T _XtScreen            libXt          Intrinsic
+ 00000000 T _XtWindowOfObject    libXt          Intrinsic
+ 00000000 T _XtWindow            libXt          Intrinsic
+ 00000000 T _XtSuperclass        libXt          Intrinsic
+ 00000000 T _XtClass             libXt          Intrinsic
+ 00000000 T _XtIsManaged         libXt          Intrinsic
+ 00000000 T _XtIsRealized        libXt          Intrinsic
+ 00000000 T _XtIsSensitive       libXt          Intrinsic
+ 00000000 T __XtWindowedAncestor libXt          Intrinsic
+ 00000000 T _XtParent            libXt          Intrinsic
+ 00000000 T _XtName              libXt          Intrinsic
+ 00000000 T _XtIsObject          libXt          Intrinsic
+ 00000000 T _XtFindFile          libXt          Intrinsic
+ 00000000 T _XtResolvePathname   libXt          Intrinsic
+ 00000000 T _XtCallAcceptFocus   libXt          Intrinsic
+ 00000000 T __XtProcessKeyboardEvent libXt          Keyboard
+ 00000000 T __XtHandleFocus      libXt          Keyboard
+ 00000000 T _XtSetKeyboardFocus  libXt          Keyboard
+ 00000000 T _XtUnmanageChildren  libXt          Manage
+ 00000000 T _XtUnmanageChild     libXt          Manage
+ 00000000 T _XtManageChildren    libXt          Manage
+ 00000000 T _XtManageChild       libXt          Manage
+ 00000000 T _XtSetMappedWhenManaged libXt          Manage
+ 00000000 T _XtAddTimeOut        libXt          NextEvent
+ 00000000 T _XtAppAddTimeOut     libXt          NextEvent
+ 00000000 T _XtRemoveTimeOut     libXt          NextEvent
+ 00000000 T _XtAddWorkProc       libXt          NextEvent
+ 00000000 T _XtAppAddWorkProc    libXt          NextEvent
+ 00000000 T _XtRemoveWorkProc    libXt          NextEvent
+ 00000000 T _XtAddInput          libXt          NextEvent
+ 00000000 T _XtAppAddInput       libXt          NextEvent
+ 00000000 T _XtRemoveInput       libXt          NextEvent
+ 00000000 T __XtRemoveAllInputs  libXt          NextEvent
+ 00000000 T _XtNextEvent         libXt          NextEvent
+ 00000000 T __XtRefreshMapping   libXt          NextEvent
+ 00000000 T _XtAppNextEvent      libXt          NextEvent
+ 00000000 T _XtProcessEvent      libXt          NextEvent
+ 00000000 T _XtAppProcessEvent   libXt          NextEvent
+ 00000000 T _XtPending           libXt          NextEvent
+ 00000000 T _XtAppPending        libXt          NextEvent
+ 00000000 T _XtPeekEvent         libXt          NextEvent
+ 00000000 T _XtAppPeekEvent      libXt          NextEvent
+ 00000000 T __XtDestroyServerGrabs libXt          PassivGrab
+ 00000000 T __XtCheckServerGrabsOnWidget libXt          PassivGrab
+ 00000000 T _XtGrabKey           libXt          PassivGrab
+ 00000000 T _XtGrabButton        libXt          PassivGrab
+ 00000000 T _XtUngrabKey         libXt          PassivGrab
+ 00000000 T _XtUngrabButton      libXt          PassivGrab
+ 00000000 T _XtGrabKeyboard      libXt          PassivGrab
+ 00000000 T _XtUngrabKeyboard    libXt          PassivGrab
+ 00000000 T _XtGrabPointer       libXt          PassivGrab
+ 00000000 T _XtUngrabPointer     libXt          PassivGrab
+ 00000000 T __XtProcessPointerEvent libXt          Pointer
+ 00000000 T __XtPopup            libXt          Popup
+ 00000000 T _XtPopup             libXt          Popup
+ 00000000 T _XtPopupSpringLoaded libXt          Popup
+ 00000000 T _XtPopdown           libXt          Popup
+ 00000000 T _XtCallbackPopdown   libXt          Popup
+ 00000000 T _XtCallbackNone      libXt          PopupCB
+ 00000000 T _XtCallbackNonexclusive libXt          PopupCB
+ 00000000 T _XtCallbackExclusive libXt          PopupCB
+ 00000000 T __XtCopyFromParent   libXt          Resources
+ 00000000 T __XtCopyFromArg      libXt          Resources
+ 00000000 T __XtCopyToArg        libXt          Resources
+ 00000000 T __XtCompileResourceList libXt          Resources
+ 00000000 T __XtDependencies     libXt          Resources
+ 00000000 T __XtResourceDependencies libXt          Resources
+ 00000000 T __XtConstraintResDependencies libXt          Resources
+ 00000000 T __XtCreateIndirectionTable libXt          Resources
+ 00000000 T __XtGetResources     libXt          Resources
+ 00000000 T _XtGetSubresources   libXt          Resources
+ 00000000 T _XtGetApplicationResources libXt          Resources
+ 00000000 T __XtResourceListInitialize libXt          Resources
+ 00000000 T __XtSetDefaultSelectionTimeout libXt          Selection
+ 00000000 T _XtSetSelectionTimeout libXt          Selection
+ 00000000 T _XtAppSetSelectionTimeout libXt          Selection
+ 00000000 T _XtGetSelectionTimeout libXt          Selection
+ 00000000 T _XtAppGetSelectionTimeout libXt          Selection
+ 00000000 T _XtOwnSelection      libXt          Selection
+ 00000000 T _XtOwnSelectionIncremental libXt          Selection
+ 00000000 T _XtDisownSelection   libXt          Selection
+ 00000000 T _XtGetSelectionValue libXt          Selection
+ 00000000 T _XtGetSelectionValueIncremental libXt          Selection
+ 00000000 T _XtGetSelectionValues libXt          Selection
+ 00000000 T _XtGetSelectionValuesIncremental libXt          Selection
+ 00000000 T _XtGetSelectionRequest libXt          Selection
+ 00000000 T _XtSetSensitive      libXt          SetSens
+ 00000000 T _XtSetSubvalues      libXt          SetValues
+ 00000000 T _XtSetValues         libXt          SetValues
+ 00000000 T _XtSetWMColormapWindows libXt          SetWMCW
+ 00000000 T __XtShellGetCoordinates libXt          Shell
+ 00000000 T __XtInitializeActionData libXt          TMaction
+ 00000000 T __XtBindActions      libXt          TMaction
+ 00000000 T __XtUnbindActions    libXt          TMaction
+ 00000000 T __XtFreeActions      libXt          TMaction
+ 00000000 T _XtAddActions        libXt          TMaction
+ 00000000 T _XtAppAddActions     libXt          TMaction
+ 00000000 T _XtGetActionList     libXt          TMaction
+ 00000000 T _XtMenuPopupAction   libXt          TMaction
+ 00000000 T _XtCallActionProc    libXt          TMaction
+ 00000000 T __XtRegisterGrabs    libXt          TMgrab
+ 00000000 T _XtRegisterGrabAction libXt          TMgrab
+ 00000000 T __XtGrabInitialize   libXt          TMgrab
+ 00000000 T __XtComputeLateBindings libXt          TMkey
+ 00000000 T __XtAllocTMContext   libXt          TMkey
+ 00000000 T __XtMatchUsingDontCareMods libXt          TMkey
+ 00000000 T _XtConvertCase       libXt          TMkey
+ 00000000 T __XtMatchUsingStandardMods libXt          TMkey
+ 00000000 T __XtBuildKeysymTables libXt          TMkey
+ 00000000 T _XtTranslateKeycode  libXt          TMkey
+ 00000000 T _XtTranslateKey      libXt          TMkey
+ 00000000 T _XtSetKeyTranslator  libXt          TMkey
+ 00000000 T _XtRegisterCaseConverter libXt          TMkey
+ 00000000 T _XtGetKeysymTable    libXt          TMkey
+ 00000000 T _XtKeysymToKeycodeList libXt          TMkey
+ 00000000 T _XtCvtStringToAcceleratorTable libXt          TMparse
+ 00000000 T _XtCvtStringToTranslationTable libXt          TMparse
+ 00000000 T _XtParseAcceleratorTable libXt          TMparse
+ 00000000 T _XtParseTranslationTable libXt          TMparse
+ 00000000 T __XtTranslateInitialize libXt          TMparse
+ 00000000 T __XtAddTMConverters  libXt          TMparse
+ 00000000 T __XtPrintXlations    libXt          TMprint
+ 00000000 T __XtDisplayTranslations libXt          TMprint
+ 00000000 T __XtDisplayAccelerators libXt          TMprint
+ 00000000 T __XtDisplayInstalledAccelerators libXt          TMprint
+ 00000000 T __XtPrintActions     libXt          TMprint
+ 00000000 T __XtPrintState       libXt          TMprint
+ 00000000 T __XtPrintEventSeq    libXt          TMprint
+ 00000000 T __XtGetQuarkIndex    libXt          TMstate
+ 00000000 T __XtGetTypeIndex     libXt          TMstate
+ 00000000 T __XtGetModifierIndex libXt          TMstate
+ 00000000 T __XtRegularMatch     libXt          TMstate
+ 00000000 T __XtMatchAtom        libXt          TMstate
+ 00000000 T __XtTranslateEvent   libXt          TMstate
+ 00000000 T __XtTraverseStateTree libXt          TMstate
+ 00000000 T __XtInstallTranslations libXt          TMstate
+ 00000000 T __XtRemoveTranslations libXt          TMstate
+ 00000000 T __XtDestroyTMData    libXt          TMstate
+ 00000000 T _XtUninstallTranslations libXt          TMstate
+ 00000000 T __XtCreateXlations   libXt          TMstate
+ 00000000 T __XtParseTreeToStateTree libXt          TMstate
+ 00000000 T __XtAddEventSeqToStateTree libXt          TMstate
+ 00000000 T __XtCvtMergeTranslations libXt          TMstate
+ 00000000 T __XtGetTranslationValue libXt          TMstate
+ 00000000 T __XtRemoveStateTreeByIndex libXt          TMstate
+ 00000000 T __XtFreeTranslations libXt          TMstate
+ 00000000 T _XtInstallAccelerators libXt          TMstate
+ 00000000 T _XtInstallAllAccelerators libXt          TMstate
+ 00000000 T _XtAugmentTranslations libXt          TMstate
+ 00000000 T _XtOverrideTranslations libXt          TMstate
+ 00000000 T __XtMergeTranslations libXt          TMstate
+ 00000000 T __XtUnmergeTranslations libXt          TMstate
+ 00000000 T __XtPopupInitialize  libXt          TMstate
+ 00000000 T _XtVaCreateWidget    libXt          VarCreate
+ 00000000 T _XtVaCreateManagedWidget libXt          VarCreate
+ 00000000 T _XtVaAppCreateShell  libXt          VarCreate
+ 00000000 T _XtVaCreatePopupShell libXt          VarCreate
+ 00000000 T _XtVaSetValues       libXt          VarCreate
+ 00000000 T _XtVaSetSubvalues    libXt          VarCreate
+ 00000000 T __XtVaAppInitialize  libXt          VarCreate
+ 00000000 T _XtVaAppInitialize   libXt          VarCreate
+ 00000000 T __XtVaOpenApplication libXt          VarCreate
+ 00000000 T _XtVaOpenApplication libXt          VarCreate
+ 00000000 T _XtVaGetSubresources libXt          VarGet
+ 00000000 T _XtVaGetApplicationResources libXt          VarGet
+ 00000000 T _XtVaGetValues       libXt          VarGet
+ 00000000 T _XtVaGetSubvalues    libXt          VarGet
+ 00000000 T __XtCountVaList      libXt          Varargs
+ 00000000 T _XtVaCreateArgsList  libXt          Varargs
+ 00000000 T __XtVaCreateTypedArgList libXt          Varargs
+ 00000000 T __XtVaToArgList      libXt          Varargs
+ 00000000 T __XtVaToTypedArgList libXt          Varargs
+ 00000000 T _XmuAllStandardColormaps libXmu         AllCmap
+ 00000000 T _XmuMakeAtom         libXmu         Atoms
+ 00000000 T _XmuNameOfAtom       libXmu         Atoms
+ 00000000 T _XmuInternAtom       libXmu         Atoms
+ 00000000 T _XmuGetAtomName      libXmu         Atoms
+ 00000000 T _XmuInternStrings    libXmu         Atoms
+ 00000000 T _XmuClientWindow     libXmu         ClientWin
+ 00000000 T _XmuAddCloseDisplayHook libXmu         CloseHook
+ 00000000 T _XmuRemoveCloseDisplayHook libXmu         CloseHook
+ 00000000 T _XmuLookupCloseDisplayHook libXmu         CloseHook
+ 00000000 T _XmuGetColormapAllocation libXmu         CmapAlloc
+ 00000000 T _XmuCreateColormap   libXmu         CrCmap
+ 00000000 T _XmuCreatePixmapFromBitmap libXmu         CrPixFBit
+ 00000000 T _XmuCursorNameToIndex libXmu         CursorName
+ 00000000 T __XmuCCLookupDisplay libXmu         CvtCache
+ 00000000 T _XmuConvertStandardSelection libXmu         CvtStdSel
+ 00000000 T _XmuPrintDefaultErrorMessage libXmu         DefErrMsg
+ 00000000 T _XmuSimpleErrorHandler libXmu         DefErrMsg
+ 00000000 T _XmuDeleteStandardColormap libXmu         DelCmap
+ 00000000 T _XmuDQCreate         libXmu         DisplayQue
+ 00000000 T _XmuDQDestroy        libXmu         DisplayQue
+ 00000000 T _XmuDQLookupDisplay  libXmu         DisplayQue
+ 00000000 T _XmuDQAddDisplay     libXmu         DisplayQue
+ 00000000 T _XmuDQRemoveDisplay  libXmu         DisplayQue
+ 00000000 T _XmuDistinguishableColors libXmu         Distinct
+ 00000000 T _XmuDistinguishablePixels libXmu         Distinct
+ 00000000 T _XmuDrawLogo         libXmu         DrawLogo
+ 00000000 T _XmuDrawRoundedRectangle libXmu         DrRndRect
+ 00000000 T _XmuFillRoundedRectangle libXmu         DrRndRect
+ 00000000 T __XEditResCheckMessages libXmu         EditresCom
+ 00000000 T __XEditResPutString8 libXmu         EditresCom
+ 00000000 T __XEditResPut8       libXmu         EditresCom
+ 00000000 T __XEditResPut16      libXmu         EditresCom
+ 00000000 T __XEditResPut32      libXmu         EditresCom
+ 00000000 T __XEditResPutWidgetInfo libXmu         EditresCom
+ 00000000 T __XEditResResetStream libXmu         EditresCom
+ 00000000 T __XEditResGet8       libXmu         EditresCom
+ 00000000 T __XEditResGet16      libXmu         EditresCom
+ 00000000 T __XEditResGetSigned16 libXmu         EditresCom
+ 00000000 T __XEditResGet32      libXmu         EditresCom
+ 00000000 T __XEditResGetString8 libXmu         EditresCom
+ 00000000 T __XEditResGetWidgetInfo libXmu         EditresCom
+ 00000000 T _XmuRegisterExternalAgent libXmu         ExtAgent
+ 00000000 T _XmuCvtFunctionToCallback libXmu         FToCback
+ 00000000 T _XmuGetHostname      libXmu         GetHost
+ 00000000 T _XmuCreateStippledPixmap libXmu         GrayPixmap
+ 00000000 T _XmuReleaseStippledPixmap libXmu         GrayPixmap
+ 00000000 T _XmuAddInitializer   libXmu         Initer
+ 00000000 T _XmuCallInitializers libXmu         Initer
+ 00000000 T _XmuLocateBitmapFile libXmu         LocBitmap
+ 00000000 T _XmuLocatePixmapFile libXmu         LocBitmap
+ 00000000 T __XmuStringToBitmapInitCache libXmu         LocBitmap
+ 00000000 T __XmuStringToBitmapFreeCache libXmu         LocBitmap
+ 00000000 T _XmuLookupString     libXmu         Lookup
+ 00000000 T _XmuLookupLatin1     libXmu         Lookup
+ 00000000 T _XmuLookupLatin2     libXmu         Lookup
+ 00000000 T _XmuLookupLatin3     libXmu         Lookup
+ 00000000 T _XmuLookupLatin4     libXmu         Lookup
+ 00000000 T _XmuLookupKana       libXmu         Lookup
+ 00000000 T _XmuLookupJISX0201   libXmu         Lookup
+ 00000000 T _XmuLookupArabic     libXmu         Lookup
+ 00000000 T _XmuLookupCyrillic   libXmu         Lookup
+ 00000000 T _XmuLookupGreek      libXmu         Lookup
+ 00000000 T _XmuLookupAPL        libXmu         Lookup
+ 00000000 T _XmuLookupHebrew     libXmu         Lookup
+ 00000000 T _XmuLookupStandardColormap libXmu         LookupCmap
+ 00000000 T _XmuCopyISOLatin1Lowered libXmu         Lower
+ 00000000 T _XmuCopyISOLatin1Uppered libXmu         Lower
+ 00000000 T _XmuCompareISOLatin1 libXmu         Lower
+ 00000000 T _XmuReadBitmapData   libXmu         RdBitF
+ 00000000 T _XmuReadBitmapDataFromFile libXmu         RdBitF
+ 00000000 T _XmuScreenOfWindow   libXmu         ScrOfWin
+ 00000000 T _XmuReshapeWidget    libXmu         ShapeWidg
+ 00000000 T _XmuStandardColormap libXmu         StdCmap
+ 00000000 T _XmuCvtStringToBackingStore libXmu         StrToBS
+ 00000000 T _XmuCvtStringToBitmap libXmu         StrToBmap
+ 00000000 T _XmuCvtStringToCursor libXmu         StrToCurs
+ 00000000 T _XmuCvtStringToColorCursor libXmu         StrToCurs
+ 00000000 T _XmuCvtStringToGravity libXmu         StrToGrav
+ 00000000 T _XmuCvtStringToJustify libXmu         StrToJust
+ 00000000 T _XmuCvtStringToLong  libXmu         StrToLong
+ 00000000 T _XmuCvtStringToOrientation libXmu         StrToOrnt
+ 00000000 T _XmuCvtStringToShapeStyle libXmu         StrToShap
+ 00000000 T _XmuCvtStringToWidget libXmu         StrToWidg
+ 00000000 T _XmuNewCvtStringToWidget libXmu         StrToWidg
+ 00000000 T _XmuUpdateMapHints   libXmu         UpdMapHint
+ 00000000 T _XmuVisualStandardColormaps libXmu         VisCmap
+ 00000000 T _XmuWnInitializeNodes libXmu         WidgetNode
+ 00000000 T _XmuWnFetchResources libXmu         WidgetNode
+ 00000000 T _XmuWnCountOwnedResources libXmu         WidgetNode
+ 00000000 T _XmuWnNameToNode     libXmu         WidgetNode
+ 00000000 T _XctCreate           libXmu         Xct
+ 00000000 T _XctReset            libXmu         Xct
+ 00000000 T _XctNextItem         libXmu         Xct
+ 00000000 T _XctFree             libXmu         Xct
+ 00000000 T _XextCreateExtension libXext        extutil
+ 00000000 T _XextDestroyExtension libXext        extutil
+ 00000000 T _XextAddDisplay      libXext        extutil
+ 00000000 T _XextRemoveDisplay   libXext        extutil
+ 00000000 T _XextFindDisplay     libXext        extutil
+ 00000000 T _XSetExtensionErrorHandler libXext        extutil
+ 00000000 T _XMissingExtension   libXext        extutil
+ 00000000 T _XmbufQueryExtension libXext        XMultibuf
+ 00000000 T _XmbufGetVersion     libXext        XMultibuf
+ 00000000 T _XmbufCreateBuffers  libXext        XMultibuf
+ 00000000 T _XmbufDestroyBuffers libXext        XMultibuf
+ 00000000 T _XmbufDisplayBuffers libXext        XMultibuf
+ 00000000 T _XmbufGetWindowAttributes libXext        XMultibuf
+ 00000000 T _XmbufChangeWindowAttributes libXext        XMultibuf
+ 00000000 T _XmbufGetBufferAttributes libXext        XMultibuf
+ 00000000 T _XmbufChangeBufferAttributes libXext        XMultibuf
+ 00000000 T _XmbufGetScreenInfo  libXext        XMultibuf
+ 00000000 T _XmbufCreateStereoWindow libXext        XMultibuf
+ 00000000 T _XShapeQueryExtension libXext        XShape
+ 00000000 T _XShapeQueryVersion  libXext        XShape
+ 00000000 T _XShapeCombineRegion libXext        XShape
+ 00000000 T _XShapeCombineRectangles libXext        XShape
+ 00000000 T _XShapeCombineMask   libXext        XShape
+ 00000000 T _XShapeCombineShape  libXext        XShape
+ 00000000 T _XShapeOffsetShape   libXext        XShape
+ 00000000 T _XShapeQueryExtents  libXext        XShape
+ 00000000 T _XShapeSelectInput   libXext        XShape
+ 00000000 T _XShapeInputSelected libXext        XShape
+ 00000000 T _XShapeGetRectangles libXext        XShape
+ 00000000 T _XMITMiscQueryExtension libXext        MITMisc
+ 00000000 T _XMITMiscSetBugMode  libXext        MITMisc
+ 00000000 T _XMITMiscGetBugMode  libXext        MITMisc
+ 00000000 T _XTestFakeInput      libXext        XTestExt1
+ 00000000 T _XTestGetInput       libXext        XTestExt1
+ 00000000 T _XTestStopInput      libXext        XTestExt1
+ 00000000 T _XTestReset          libXext        XTestExt1
+ 00000000 T _XTestQueryInputSize libXext        XTestExt1
+ 00000000 T _XTestPressKey       libXext        XTestExt1
+ 00000000 T _XTestPressButton    libXext        XTestExt1
+ 00000000 T _XTestMovePointer    libXext        XTestExt1
+ 00000000 T _XTestFlush          libXext        XTestExt1
+ 00000000 T _XAllowDeviceEvents  libXi          XAllowDv
+ 00000000 T _XChangeDeviceControl libXi          XChgDCtl
+ 00000000 T _XChangeFeedbackControl libXi          XChgFCtl
+ 00000000 T _XChangeKeyboardDevice libXi          XChgKbd
+ 00000000 T _XChangeDeviceKeyMapping libXi          XChgKMap
+ 00000000 T _XChangePointerDevice libXi          XChgPnt
+ 00000000 T _XChangeDeviceDontPropagateList libXi          XChgProp
+ 00000000 T _XCloseDevice        libXi          XCloseDev
+ 00000000 T _XDeviceBell         libXi          XDevBell
+ 00000000 T _XGetDeviceButtonMapping libXi          XGetBMap
+ 00000000 T _XGetDeviceControl   libXi          XGetDCtl
+ 00000000 T _XFreeDeviceControl  libXi          XGetDCtl
+ 00000000 T _XGetFeedbackControl libXi          XGetFCtl
+ 00000000 T _XFreeFeedbackList   libXi          XGetFCtl
+ 00000000 T _XGetDeviceKeyMapping libXi          XGetKMap
+ 00000000 T _XGetDeviceModifierMapping libXi          XGetMMap
+ 00000000 T _XGetDeviceDontPropagateList libXi          XGetProp
+ 00000000 T _XGetExtensionVersion libXi          XGetVers
+ 00000000 T _XGetDeviceMotionEvents libXi          XGMotion
+ 00000000 T _XFreeDeviceMotionEvents libXi          XGMotion
+ 00000000 T _XGrabDevice         libXi          XGrabDev
+ 00000000 T _XGrabDeviceButton   libXi          XGrDvBut
+ 00000000 T _XGrabDeviceKey      libXi          XGrDvKey
+ 00000000 T _XGetDeviceFocus     libXi          XGtFocus
+ 00000000 T _XGetSelectedExtensionEvents libXi          XGtSelect
+ 00000000 T _XListInputDevices   libXi          XListDev
+ 00000000 T _XFreeDeviceList     libXi          XListDev
+ 00000000 T _XOpenDevice         libXi          XOpenDev
+ 00000000 T _XQueryDeviceState   libXi          XQueryDv
+ 00000000 T _XFreeDeviceState    libXi          XQueryDv
+ 00000000 T _XSelectExtensionEvent libXi          XSelect
+ 00000000 T _XSetDeviceButtonMapping libXi          XSetBMap
+ 00000000 T _XSetDeviceValuators libXi          XSetDVal
+ 00000000 T _XSetDeviceModifierMapping libXi          XSetMMap
+ 00000000 T _XSetDeviceMode      libXi          XSetMode
+ 00000000 T _XSendExtensionEvent libXi          XSndExEv
+ 00000000 T _XSetDeviceFocus     libXi          XStFocus
+ 00000000 T _XUngrabDevice       libXi          XUngrDev
+ 00000000 T _XUngrabDeviceButton libXi          XUngrDvB
+ 00000000 T _XUngrabDeviceKey    libXi          XUngrDvK
+ 00000000 T _XInput_find_display libXi          XExtInt
+ 00000000 T __xibaddevice        libXi          XExtInt
+ 00000000 T __xibadclass         libXi          XExtInt
+ 00000000 T __xibadevent         libXi          XExtInt
+ 00000000 T __xibadmode          libXi          XExtInt
+ 00000000 T __xidevicebusy       libXi          XExtInt
+ 00000000 T _XTestQueryExtension libXtst        XTest
+ 00000000 T _XTestCompareCursorWithWindow libXtst        XTest
+ 00000000 T _XTestCompareCurrentCursorWithWindow libXtst        XTest
+ 00000000 T _XTestFakeKeyEvent   libXtst        XTest
+ 00000000 T _XTestFakeButtonEvent libXtst        XTest
+ 00000000 T _XTestFakeMotionEvent libXtst        XTest
+ 00000000 T _XTestFakeRelativeMotionEvent libXtst        XTest
+ 00000000 T _XTestSetGContextOfGC libXtst        XTest
+ 00000000 T _XTestSetVisualIDOfVisual libXtst        XTest
+ 00000000 T _XTestDiscard        libXtst        XTest
+ 00000000 T _XShmQueryExtension  libXext        XShm
+ 00000000 T _XShmGetEventBase    libXext        XShm
+ 00000000 T _XShmQueryVersion    libXext        XShm
+ 00000000 T _XShmPixmapFormat    libXext        XShm
+ 00000000 T _XShmAttach          libXext        XShm
+ 00000000 T _XShmDetach          libXext        XShm
+ 00000000 T _XShmCreateImage     libXext        XShm
+ 00000000 T _XShmPutImage        libXext        XShm
+ 00000000 T _XShmGetImage        libXext        XShm
+ 00000000 T _XShmCreatePixmap    libXext        XShm
+ 00000000 T __XtPeekCallback     libXt          Callback
+ 00000000 T _XtCvtStringToRestartStyle libXt          Converters
+ 00000000 T _XtCvtStringToGravity libXt          Converters
+ 00000000 T __XtCreateHookObj    libXt          Create
+ 00000000 T _XtAppSetExitFlag    libXt          Display
+ 00000000 T _XtAppGetExitFlag    libXt          Display
+ 00000000 T __XtGetPerDisplay    libXt          Display
+ 00000000 T __XtGetPerDisplayInput libXt          Display
+ 00000000 T _XtGetDisplays       libXt          Display
+ 00000000 T _XtRemoveEventTypeHandler libXt          Event
+ 00000000 T _XtInsertEventTypeHandler libXt          Event
+ 00000000 T _XtRegisterDrawable  libXt          Event
+ 00000000 T _XtUnregisterDrawable libXt          Event
+ 00000000 T _XtDispatchEventToWidget libXt          Event
+ 00000000 T _XtLastEventProcessed libXt          Event
+ 00000000 T _XtSetEventDispatcher libXt          Event
+ 00000000 T _XtRegisterExtensionSelector libXt          Event
+ 00000000 T __XtExtensionSelect  libXt          Event
+ 00000000 T _XtAppAddBlockHook   libXt          Hooks
+ 00000000 T _XtRemoveBlockHook   libXt          Hooks
+ 00000000 T __XtAddShellToHookObj libXt          Hooks
+ 00000000 T __XtIsHookObject     libXt          Hooks
+ 00000000 T _XtHooksOfDisplay    libXt          Hooks
+ 00000000 T __XtGetUserName      libXt          Initialize
+ 00000000 T _XtGetClassExtension libXt          Intrinsic
+ 00000000 T _XtGetKeyboardFocusWidget libXt          Keyboard
+ 00000000 T _XtChangeManagedSet  libXt          Manage
+ 00000000 T __XtWaitForSomething libXt          NextEvent
+ 00000000 T _XtAddSignal         libXt          NextEvent
+ 00000000 T _XtAppAddSignal      libXt          NextEvent
+ 00000000 T _XtRemoveSignal      libXt          NextEvent
+ 00000000 T _XtNoticeSignal      libXt          NextEvent
+ 00000000 T _XtReservePropertyAtom libXt          Selection
+ 00000000 T _XtReleasePropertyAtom libXt          Selection
+ 00000000 T _XtCreateSelectionRequest libXt          Selection
+ 00000000 T _XtSendSelectionRequest libXt          Selection
+ 00000000 T _XtCancelSelectionRequest libXt          Selection
+ 00000000 T _XtSetSelectionParameters libXt          Selection
+ 00000000 T _XtGetSelectionParameters libXt          Selection
+ 00000000 T _XtSessionGetToken   libXt          Shell
+ 00000000 T _XtSessionReturnToken libXt          Shell
+ 00000000 T _XtAppLock           libXt          Threads
+ 00000000 T _XtAppUnlock         libXt          Threads
+ 00000000 T _XtProcessLock       libXt          Threads
+ 00000000 T _XtProcessUnlock     libXt          Threads
+ 00000000 T _XtToolkitThreadInitialize libXt          Threads
+ 00000000 T __XtDoFreeBindings   libXt          TMaction
+ 00000000 T _XmbufClearBufferArea libXext        XMultibuf
+ 00000000 T _XSyncQueryExtension libXext        XSync
+ 00000000 T _XSyncInitialize     libXext        XSync
+ 00000000 T _XSyncListSystemCounters libXext        XSync
+ 00000000 T _XSyncFreeSystemCounterList libXext        XSync
+ 00000000 T _XSyncCreateCounter  libXext        XSync
+ 00000000 T _XSyncSetCounter     libXext        XSync
+ 00000000 T _XSyncChangeCounter  libXext        XSync
+ 00000000 T _XSyncDestroyCounter libXext        XSync
+ 00000000 T _XSyncQueryCounter   libXext        XSync
+ 00000000 T _XSyncAwait          libXext        XSync
+ 00000000 T _XSyncCreateAlarm    libXext        XSync
+ 00000000 T _XSyncDestroyAlarm   libXext        XSync
+ 00000000 T _XSyncQueryAlarm     libXext        XSync
+ 00000000 T _XSyncChangeAlarm    libXext        XSync
+ 00000000 T _XSyncSetPriority    libXext        XSync
+ 00000000 T _XSyncGetPriority    libXext        XSync
+ 00000000 T _XSyncIntToValue     libXext        XSync
+ 00000000 T _XSyncIntsToValue    libXext        XSync
+ 00000000 T _XSyncValueGreaterThan libXext        XSync
+ 00000000 T _XSyncValueLessThan  libXext        XSync
+ 00000000 T _XSyncValueGreaterOrEqual libXext        XSync
+ 00000000 T _XSyncValueLessOrEqual libXext        XSync
+ 00000000 T _XSyncValueEqual     libXext        XSync
+ 00000000 T _XSyncValueIsNegative libXext        XSync
+ 00000000 T _XSyncValueIsZero    libXext        XSync
+ 00000000 T _XSyncValueIsPositive libXext        XSync
+ 00000000 T _XSyncValueLow32     libXext        XSync
+ 00000000 T _XSyncValueHigh32    libXext        XSync
+ 00000000 T _XSyncValueAdd       libXext        XSync
+ 00000000 T _XSyncValueSubtract  libXext        XSync
+ 00000000 T _XSyncMaxValue       libXext        XSync
+ 00000000 T _XSyncMinValue       libXext        XSync
+ 00000000 T __XiEventToWire      libXi          XExtToWire
+ 00000000 T __XiCheckExtInit     libXi          XExtInt
+ 00000000 T _XTestFakeDeviceKeyEvent libXtst        XTest
+ 00000000 T _XTestFakeDeviceButtonEvent libXtst        XTest
+ 00000000 T _XTestFakeProximityEvent libXtst        XTest
+ 00000000 T _XTestFakeDeviceMotionEvent libXtst        XTest
+ 00000000 T _XTestGrabControl    libXtst        XTest
*** /dev/null	Sun Jan 29 07:17:58 1995
--- xc/lib/Xt/jump_ignore	Sun Jan 29 07:17:58 1995
***************
*** 0 ****
--- 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
*** /dev/null	Sun Jan 29 07:17:59 1995
--- xc/lib/Xt/jump_vars	Sun Jan 29 07:17:58 1995
***************
*** 0 ****
--- 1,67 ----
+ # $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
+ 00000140 D _constraintClassRec  libXt          Constraint
+ 00000004 D _constraintWidgetClass libXt          Constraint
+ 00000040 D _colorConvertArgs    libXt          Converters
+ 00000020 D _screenConvertArg    libXt          Converters
+ 00000004 D __XtQString          libXt          Converters
+ 00000004 D __XtInheritTranslations libXt          Core
+ 00000100 D _widgetClassRec      libXt          Core
+ 00000004 D _widgetClass         libXt          Core
+ 00000004 D _coreWidgetClass     libXt          Core
+ 00000004 D __XtAppDestroyCount  libXt          Display
+ 00000004 D __XtperDisplayList   libXt          Display
+ 00000004 D _XtCXtToolkitError   libXt          Intrinsic
+ 00000100 D _objectClassRec      libXt          Object
+ 00000004 D _objectClass         libXt          Object
+ 00000100 D _rectObjClassRec     libXt          RectObj
+ 00000004 D _rectObjClass        libXt          RectObj
+ 00000100 D _shellClassRec       libXt          Shell
+ 00000004 D _shellWidgetClass    libXt          Shell
+ 00000100 D _overrideShellClassRec libXt          Shell
+ 00000004 D _overrideShellWidgetClass libXt          Shell
+ 00000100 D _wmShellClassRec     libXt          Shell
+ 00000004 D _wmShellWidgetClass  libXt          Shell
+ 00000100 D _transientShellClassRec libXt          Shell
+ 00000004 D _transientShellWidgetClass libXt          Shell
+ 00000100 D _topLevelShellClassRec libXt          Shell
+ 00000004 D _topLevelShellWidgetClass libXt          Shell
+ 00000100 D _applicationShellClassRec libXt          Shell
+ 00000004 D _applicationShellWidgetClass libXt          Shell
+ 00000100 D _sessionShellClassRec libXt          Shell
+ 00000004 D _sessionShellWidgetClass libXt          Shell
+ 00001000 D _XtStrings           libXt          StringDefs
+ 00000800 D _XtShellStrings      libXt          StringDefs
+ 00000040 D __XtGlobalTM         libXt          TMstate
+ 00000100 D _vendorShellClassRec libXt          Vendor
+ 00000004 D _vendorShellWidgetClass libXt          Vendor
+ 00000004 D __XA_ATOM_PAIR       libXmu         Atoms
+ 00000004 D __XA_CHARACTER_POSITION libXmu         Atoms
+ 00000004 D __XA_CLASS           libXmu         Atoms
+ 00000004 D __XA_CLIENT_WINDOW   libXmu         Atoms
+ 00000004 D __XA_CLIPBOARD       libXmu         Atoms
+ 00000004 D __XA_COMPOUND_TEXT   libXmu         Atoms
+ 00000004 D __XA_DECNET_ADDRESS  libXmu         Atoms
+ 00000004 D __XA_DELETE          libXmu         Atoms
+ 00000004 D __XA_FILENAME        libXmu         Atoms
+ 00000004 D __XA_HOSTNAME        libXmu         Atoms
+ 00000004 D __XA_IP_ADDRESS      libXmu         Atoms
+ 00000004 D __XA_LENGTH          libXmu         Atoms
+ 00000004 D __XA_LIST_LENGTH     libXmu         Atoms
+ 00000004 D __XA_NAME            libXmu         Atoms
+ 00000004 D __XA_NET_ADDRESS     libXmu         Atoms
+ 00000004 D __XA_NULL            libXmu         Atoms
+ 00000004 D __XA_OWNER_OS        libXmu         Atoms
+ 00000004 D __XA_SPAN            libXmu         Atoms
+ 00000004 D __XA_TARGETS         libXmu         Atoms
+ 00000004 D __XA_TEXT            libXmu         Atoms
+ 00000004 D __XA_TIMESTAMP       libXmu         Atoms
+ 00000004 D __XA_USER            libXmu         Atoms
+ 00000004 D __XExtensionErrorFunction libXext        globals
+ 00000004 D _XTestInputActionType libXext        XTestExt1
+ 00000004 D _XTestFakeAckType    libXext        XTestExt1
+ 00000100 D _hookObjClassRec     libXt          HookObj
+ 00000004 D _hookObjectClass     libXt          HookObj
*** -	Sun Jan 29 07:18:00 1995
--- xc/lib/Xau/Imakefile	Sun Jan 29 07:17:59 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.24 94/03/29 15:54:23 gildea Exp $
  #define DoNormalLib NormalLibXau
  #define DoSharedLib SharedLibXau
  #define DoDebugLib DebugLibXau
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.25 94/11/21 18:21:36 kaleb Exp $
  #define DoNormalLib NormalLibXau
  #define DoSharedLib SharedLibXau
  #define DoDebugLib DebugLibXau
***************
*** 28,32 ****
--- 28,34 ----
  	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
  
  #include <Library.tmpl>
+ 
+ InstallLinkKitLibrary(Xau,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:00 1995
--- xc/lib/Xdmcp/Imakefile	Sun Jan 29 07:18:00 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.22 94/03/29 15:54:21 gildea Exp $
  #define DoNormalLib NormalLibXdmcp
  #define DoSharedLib SharedLibXdmcp
  #define DoDebugLib DebugLibXdmcp
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.23 94/11/21 18:22:20 kaleb Exp $
  #define DoNormalLib NormalLibXdmcp
  #define DoSharedLib SharedLibXdmcp
  #define DoDebugLib DebugLibXdmcp
***************
*** 102,106 ****
--- 102,108 ----
  
  SpecialCLibObjectRule(Fill,$(ICONFIGFILES),ConnectionFlags)
  SpecialCLibObjectRule(Flush,$(ICONFIGFILES),ConnectionFlags)
+ 
+ InstallLinkKitLibrary(Xdmcp,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:01 1995
--- xc/lib/font/Imakefile	Sun Jan 29 07:18:01 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.8 93/09/06 13:41:47 rws Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.10 94/11/28 11:50:26 kaleb Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
***************
*** 11,16 ****
--- 11,18 ----
  #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
  
  NormalDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(OBJS))
+ 
+ InstallLinkKitLibrary(font,$(LINKKITDIR)/lib)
  
  ForceSubdirs($(SUBDIRS))
  
*** /dev/null	Sun Jan 29 07:18:03 1995
--- xc/lib/XIE/jump_funcs	Sun Jan 29 07:18:03 1995
***************
*** 0 ****
--- 1,197 ----
+ # $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
+ 00000000 T _XieGetClientData    libXIE         clientdata
+ 00000000 T _XieCreateColorList  libXIE         colorlist
+ 00000000 T _XieDestroyColorList libXIE         colorlist
+ 00000000 T _XiePurgeColorList   libXIE         colorlist
+ 00000000 T _XieQueryColorList   libXIE         colorlist
+ 00000000 T _XieFloImportClientLUT libXIE         conven
+ 00000000 T _XieFloImportClientPhoto libXIE         conven
+ 00000000 T _XieFloImportClientROI libXIE         conven
+ 00000000 T _XieFloImportDrawable libXIE         conven
+ 00000000 T _XieFloImportDrawablePlane libXIE         conven
+ 00000000 T _XieFloImportLUT     libXIE         conven
+ 00000000 T _XieFloImportPhotomap libXIE         conven
+ 00000000 T _XieFloImportROI     libXIE         conven
+ 00000000 T _XieFloArithmetic    libXIE         conven
+ 00000000 T _XieFloBandCombine   libXIE         conven
+ 00000000 T _XieFloBandExtract   libXIE         conven
+ 00000000 T _XieFloBandSelect    libXIE         conven
+ 00000000 T _XieFloBlend         libXIE         conven
+ 00000000 T _XieFloCompare       libXIE         conven
+ 00000000 T _XieFloConstrain     libXIE         conven
+ 00000000 T _XieFloConvertFromIndex libXIE         conven
+ 00000000 T _XieFloConvertFromRGB libXIE         conven
+ 00000000 T _XieFloConvertToIndex libXIE         conven
+ 00000000 T _XieFloConvertToRGB  libXIE         conven
+ 00000000 T _XieFloConvolve      libXIE         conven
+ 00000000 T _XieFloDither        libXIE         conven
+ 00000000 T _XieFloGeometry      libXIE         conven
+ 00000000 T _XieFloLogical       libXIE         conven
+ 00000000 T _XieFloMatchHistogram libXIE         conven
+ 00000000 T _XieFloMath          libXIE         conven
+ 00000000 T _XieFloPasteUp       libXIE         conven
+ 00000000 T _XieFloPoint         libXIE         conven
+ 00000000 T _XieFloUnconstrain   libXIE         conven
+ 00000000 T _XieFloExportClientHistogram libXIE         conven
+ 00000000 T _XieFloExportClientLUT libXIE         conven
+ 00000000 T _XieFloExportClientPhoto libXIE         conven
+ 00000000 T _XieFloExportClientROI libXIE         conven
+ 00000000 T _XieFloExportDrawable libXIE         conven
+ 00000000 T _XieFloExportDrawablePlane libXIE         conven
+ 00000000 T _XieFloExportLUT     libXIE         conven
+ 00000000 T _XieFloExportPhotomap libXIE         conven
+ 00000000 T _XieFloExportROI     libXIE         conven
+ 00000000 T _XieTecColorAllocAll libXIE         conven
+ 00000000 T _XieTecColorAllocMatch libXIE         conven
+ 00000000 T _XieTecColorAllocRequantize libXIE         conven
+ 00000000 T _XieTecRGBToCIELab   libXIE         conven
+ 00000000 T _XieTecRGBToCIEXYZ   libXIE         conven
+ 00000000 T _XieTecRGBToYCbCr    libXIE         conven
+ 00000000 T _XieTecRGBToYCC      libXIE         conven
+ 00000000 T _XieTecCIELabToRGB   libXIE         conven
+ 00000000 T _XieTecCIEXYZToRGB   libXIE         conven
+ 00000000 T _XieTecYCbCrToRGB    libXIE         conven
+ 00000000 T _XieTecYCCToRGB      libXIE         conven
+ 00000000 T _XieTecClipScale     libXIE         conven
+ 00000000 T _XieTecConvolveConstant libXIE         conven
+ 00000000 T _XieTecDecodeUncompressedSingle libXIE         conven
+ 00000000 T _XieTecDecodeUncompressedTriple libXIE         conven
+ 00000000 T _XieTecDecodeG31D    libXIE         conven
+ 00000000 T _XieTecDecodeG32D    libXIE         conven
+ 00000000 T _XieTecDecodeG42D    libXIE         conven
+ 00000000 T _XieTecDecodeTIFF2   libXIE         conven
+ 00000000 T _XieTecDecodeTIFFPackBits libXIE         conven
+ 00000000 T _XieTecDecodeJPEGBaseline libXIE         conven
+ 00000000 T _XieTecDecodeJPEGLossless libXIE         conven
+ 00000000 T _XieTecDitherOrderedParam libXIE         conven
+ 00000000 T _XieTecEncodeUncompressedSingle libXIE         conven
+ 00000000 T _XieTecEncodeUncompressedTriple libXIE         conven
+ 00000000 T _XieTecEncodeG31D    libXIE         conven
+ 00000000 T _XieTecEncodeG32D    libXIE         conven
+ 00000000 T _XieTecEncodeG42D    libXIE         conven
+ 00000000 T _XieTecEncodeJPEGBaseline libXIE         conven
+ 00000000 T _XieTecEncodeJPEGLossless libXIE         conven
+ 00000000 T _XieTecEncodeTIFF2   libXIE         conven
+ 00000000 T _XieTecEncodeTIFFPackBits libXIE         conven
+ 00000000 T _XieTecEncodeServerChoice libXIE         conven
+ 00000000 T _XieTecGeomAntialiasByArea libXIE         conven
+ 00000000 T _XieTecGeomAntialiasByLowpass libXIE         conven
+ 00000000 T _XieTecGeomGaussian  libXIE         conven
+ 00000000 T _XieTecGeomNearestNeighbor libXIE         conven
+ 00000000 T _XieTecHistogramGaussian libXIE         conven
+ 00000000 T _XieTecHistogramHyperbolic libXIE         conven
+ 00000000 T _XieTecWhiteAdjustCIELabShift libXIE         conven
+ 00000000 T __XiePhotofloSize    libXIE         elements
+ 00000000 T __XieElemImportClientLUT libXIE         elements
+ 00000000 T __XieElemImportClientPhoto libXIE         elements
+ 00000000 T __XieElemImportClientROI libXIE         elements
+ 00000000 T __XieElemImportDrawable libXIE         elements
+ 00000000 T __XieElemImportDrawablePlane libXIE         elements
+ 00000000 T __XieElemImportLUT   libXIE         elements
+ 00000000 T __XieElemImportPhotomap libXIE         elements
+ 00000000 T __XieElemImportROI   libXIE         elements
+ 00000000 T __XieElemArithmetic  libXIE         elements
+ 00000000 T __XieElemBandCombine libXIE         elements
+ 00000000 T __XieElemBandExtract libXIE         elements
+ 00000000 T __XieElemBandSelect  libXIE         elements
+ 00000000 T __XieElemBlend       libXIE         elements
+ 00000000 T __XieElemCompare     libXIE         elements
+ 00000000 T __XieElemConstrain   libXIE         elements
+ 00000000 T __XieElemConvertFromIndex libXIE         elements
+ 00000000 T __XieElemConvertFromRGB libXIE         elements
+ 00000000 T __XieElemConvertToIndex libXIE         elements
+ 00000000 T __XieElemConvertToRGB libXIE         elements
+ 00000000 T __XieElemConvolve    libXIE         elements
+ 00000000 T __XieElemDither      libXIE         elements
+ 00000000 T __XieElemGeometry    libXIE         elements
+ 00000000 T __XieElemLogical     libXIE         elements
+ 00000000 T __XieElemMatchHistogram libXIE         elements
+ 00000000 T __XieElemMath        libXIE         elements
+ 00000000 T __XieElemPasteUp     libXIE         elements
+ 00000000 T __XieElemPoint       libXIE         elements
+ 00000000 T __XieElemUnconstrain libXIE         elements
+ 00000000 T __XieElemExportClientHistogram libXIE         elements
+ 00000000 T __XieElemExportClientLUT libXIE         elements
+ 00000000 T __XieElemExportClientPhoto libXIE         elements
+ 00000000 T __XieElemExportClientROI libXIE         elements
+ 00000000 T __XieElemExportDrawable libXIE         elements
+ 00000000 T __XieElemExportDrawablePlane libXIE         elements
+ 00000000 T __XieElemExportLUT   libXIE         elements
+ 00000000 T __XieElemExportPhotomap libXIE         elements
+ 00000000 T __XieElemExportROI   libXIE         elements
+ 00000000 T __XieFloError        libXIE         errors
+ 00000000 T __XieColorAllocEvent libXIE         events
+ 00000000 T __XieDecodeNotifyEvent libXIE         events
+ 00000000 T __XieExportAvailableEvent libXIE         events
+ 00000000 T __XieImportObscuredEvent libXIE         events
+ 00000000 T __XiePhotofloDoneEvent libXIE         events
+ 00000000 T _XieFreeTechniques   libXIE         free
+ 00000000 T _XieFreePhotofloGraph libXIE         free
+ 00000000 T _XieFreeEncodeJPEGBaseline libXIE         free
+ 00000000 T _XieFreeEncodeJPEGLossless libXIE         free
+ 00000000 T _XieFreePasteUpTiles libXIE         free
+ 00000000 T __XieConvertToIEEE   libXIE         ieee
+ 00000000 T _XieInitialize       libXIE         init
+ 00000000 T _XieQueryTechniques  libXIE         init
+ 00000000 T __XieCloseDisplay    libXIE         init
+ 00000000 T __XiePrintError      libXIE         init
+ 00000000 T _XieCreateLUT        libXIE         lut
+ 00000000 T _XieDestroyLUT       libXIE         lut
+ 00000000 T _XieAllocatePhotofloGraph libXIE         photoflo
+ 00000000 T _XieCreatePhotoflo   libXIE         photoflo
+ 00000000 T _XieDestroyPhotoflo  libXIE         photoflo
+ 00000000 T _XieExecutePhotoflo  libXIE         photoflo
+ 00000000 T _XieModifyPhotoflo   libXIE         photoflo
+ 00000000 T _XieRedefinePhotoflo libXIE         photoflo
+ 00000000 T _XieQueryPhotoflo    libXIE         photoflo
+ 00000000 T _XieCreatePhotomap   libXIE         photomap
+ 00000000 T _XieDestroyPhotomap  libXIE         photomap
+ 00000000 T _XieQueryPhotomap    libXIE         photomap
+ 00000000 T _XieCreatePhotospace libXIE         photospace
+ 00000000 T _XieDestroyPhotospace libXIE         photospace
+ 00000000 T _XieExecuteImmediate libXIE         photospace
+ 00000000 T _XieCreateROI        libXIE         roi
+ 00000000 T _XieDestroyROI       libXIE         roi
+ 00000000 T __XieTechniqueLength libXIE         technique
+ 00000000 T __XieEncodeTechnique libXIE         technique
+ 00000000 T __XieColorAllocAllParam libXIE         technique
+ 00000000 T __XieColorAllocMatchParam libXIE         technique
+ 00000000 T __XieColorAllocRequantizeParam libXIE         technique
+ 00000000 T __XieRGBToCIELabParam libXIE         technique
+ 00000000 T __XieRGBToYCbCrParam libXIE         technique
+ 00000000 T __XieRGBToYCCParam   libXIE         technique
+ 00000000 T __XieYCbCrToRGBParam libXIE         technique
+ 00000000 T __XieYCCToRGBParam   libXIE         technique
+ 00000000 T __XieCIELabToRGBParam libXIE         technique
+ 00000000 T __XieConvolveConstantParam libXIE         technique
+ 00000000 T __XieClipScaleParam  libXIE         technique
+ 00000000 T __XieDecodeUncompressedSingleParam libXIE         technique
+ 00000000 T __XieDecodeUncompressedTripleParam libXIE         technique
+ 00000000 T __XieDecodeG31DParam libXIE         technique
+ 00000000 T __XieDecodeTIFFPackBitsParam libXIE         technique
+ 00000000 T __XieDecodeJPEGBaselineParam libXIE         technique
+ 00000000 T __XieDitherOrderedParam libXIE         technique
+ 00000000 T __XieEncodeUncompressedSingleParam libXIE         technique
+ 00000000 T __XieEncodeUncompressedTripleParam libXIE         technique
+ 00000000 T __XieEncodeG31DParam libXIE         technique
+ 00000000 T __XieEncodeTIFFPackBitsParam libXIE         technique
+ 00000000 T __XieEncodeServerChoiceParam libXIE         technique
+ 00000000 T __XieEncodeG32DParam libXIE         technique
+ 00000000 T __XieEncodeG42DParam libXIE         technique
+ 00000000 T __XieEncodeJPEGBaselineParam libXIE         technique
+ 00000000 T __XieEncodeJPEGLosslessParam libXIE         technique
+ 00000000 T __XieEncodeTIFF2Param libXIE         technique
+ 00000000 T __XieGeomAntialiasByAreaParam libXIE         technique
+ 00000000 T __XieGeomAntialiasByLowpassParam libXIE         technique
+ 00000000 T __XieGeomGaussianParam libXIE         technique
+ 00000000 T __XieGeomNearestNeighborParam libXIE         technique
+ 00000000 T __XieHistogramGaussianParam libXIE         technique
+ 00000000 T __XieHistogramHyperbolicParam libXIE         technique
+ 00000000 T __XieWhiteAdjustCIELabShiftParam libXIE         technique
+ 00000000 T __XieInitTechFuncTable libXIE         technique
+ 00000000 T __XieRegisterTechFunc libXIE         utils
+ 00000000 T __XieLookupTechFunc  libXIE         utils
*** /dev/null	Sun Jan 29 07:18:04 1995
--- xc/lib/XIE/jump_ignore	Sun Jan 29 07:18:04 1995
***************
*** 0 ****
--- 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
*** /dev/null	Sun Jan 29 07:18:05 1995
--- xc/lib/XIE/jump_vars	Sun Jan 29 07:18:04 1995
***************
*** 0 ****
--- 1,6 ----
+ # $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
+ 00000080 C __XieTechFuncs       libXIE         init
*** -	Sun Jan 29 07:18:06 1995
--- xc/lib/X11/GetDflt.c	Sun Jan 29 07:18:05 1995
***************
*** 1,4 ****
! /* $XConsortium: GetDflt.c,v 1.33 94/04/17 20:19:31 kaleb Exp $ */
  
  /***********************************************************
  
--- 1,4 ----
! /* $XConsortium: GetDflt.c,v 1.34 94/11/30 16:19:43 kaleb Exp $ */
  
  /***********************************************************
  
***************
*** 84,91 ****
  #else
  	int uid;
  	extern int getuid();
! #ifndef SYSV386
  	extern struct passwd *getpwuid(), *getpwnam();
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
--- 84,93 ----
  #else
  	int uid;
  	extern int getuid();
! #ifndef i386
! # ifndef SYSV
  	extern struct passwd *getpwuid(), *getpwnam();
+ # endif
  #endif
  #endif
  #if defined(sun) && defined(SVR4) && defined(XTHREADS)
*** -	Sun Jan 29 07:18:07 1995
--- xc/lib/X11/SetLocale.c	Sun Jan 29 07:18:06 1995
***************
*** 1,4 ****
! /* $XConsortium: SetLocale.c,v 1.39 94/04/17 20:20:59 rws Exp $ */
  
  /*
   * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
--- 1,4 ----
! /* $XConsortium: SetLocale.c,v 1.40 94/11/21 18:23:20 kaleb Exp $ */
  
  /*
   * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
***************
*** 138,144 ****
      char *osname;
      char *siname;
  {
! #if defined(hpux) || defined(__bsdi__) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
  #ifdef hpux
  #define SKIPCOUNT 2
  #define STARTCHAR ':'
--- 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 ':'
*** -	Sun Jan 29 07:18:08 1995
--- xc/lib/X11/lcGenConv.c	Sun Jan 29 07:18:08 1995
***************
*** 1,4 ****
! /* $XConsortium: lcGenConv.c,v 1.5 94/04/02 22:36:59 rws Exp $ */
  /*
   * Copyright 1992, 1993 by TOSHIBA Corp.
   *
--- 1,4 ----
! /* $XConsortium: lcGenConv.c,v 1.6 94/11/21 18:23:20 kaleb Exp $ */
  /*
   * Copyright 1992, 1993 by TOSHIBA Corp.
   *
***************
*** 771,777 ****
  }
  
  #define DefineLocalBuf		char local_buf[BUFSIZ]
! #define AllocLocalBuf(length)	(length > BUFSIZ ? Xmalloc(length) : local_buf)
  #define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
  
  static int
--- 771,777 ----
  }
  
  #define DefineLocalBuf		char local_buf[BUFSIZ]
! #define AllocLocalBuf(length)	(length > BUFSIZ ? (char*) Xmalloc(length) : local_buf)
  #define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
  
  static int
*** /dev/null	Sun Jan 29 07:18:09 1995
--- xc/lib/X11/jump_funcs	Sun Jan 29 07:18:09 1995
***************
*** 0 ****
--- 1,1121 ----
+ # $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
+ 00000000 T _XDeleteContext      libX11         Context
+ 00000000 T _XListDepths         libX11         Depths
+ 00000000 T _XrmParseCommand     libX11         ParseCmd
+ 00000000 T _Xpermalloc          libX11         Quarks
+ 00000000 T __XrmInternalStringToQuark libX11         Quarks
+ 00000000 T _XrmStringToQuark    libX11         Quarks
+ 00000000 T _XrmPermStringToQuark libX11         Quarks
+ 00000000 T _XrmUniqueQuark      libX11         Quarks
+ 00000000 T _XrmQuarkToString    libX11         Quarks
+ 00000000 T _XAllocColorCells    libX11         XAllCells
+ 00000000 T _XAllocColorPlanes   libX11         XAllPlanes
+ 00000000 T _XAllowEvents        libX11         XAllowEv
+ 00000000 T _XAutoRepeatOn       libX11         XAutoRep
+ 00000000 T _XAutoRepeatOff      libX11         XAutoRep
+ 00000000 T _XSetWindowBackground libX11         XBackgnd
+ 00000000 T _XSetWindowBorderWidth libX11         XBdrWidth
+ 00000000 T _XBell               libX11         XBell
+ 00000000 T _XSetWindowBorder    libX11         XBorder
+ 00000000 T _XEnableAccessControl libX11         XChAccCon
+ 00000000 T _XDisableAccessControl libX11         XChAccCon
+ 00000000 T _XSetAccessControl   libX11         XChAccCon
+ 00000000 T _XSetCloseDownMode   libX11         XChClMode
+ 00000000 T _XChangeActivePointerGrab libX11         XChActPGb
+ 00000000 T _XSetWindowColormap  libX11         XChCmap
+ 00000000 T _XChangeGC           libX11         XChGC
+ 00000000 T _XChangeKeyboardControl libX11         XChKeyCon
+ 00000000 T _XChangePointerControl libX11         XChPntCon
+ 00000000 T _XChangeProperty     libX11         XChProp
+ 00000000 T _XChangeSaveSet      libX11         XChSaveSet
+ 00000000 T _XAddToSaveSet       libX11         XChSaveSet
+ 00000000 T _XRemoveFromSaveSet  libX11         XChSaveSet
+ 00000000 T _XChangeWindowAttributes libX11         XChWAttrs
+ 00000000 T _XResizeWindow       libX11         XChWindow
+ 00000000 T _XCheckIfEvent       libX11         XChkIfEv
+ 00000000 T _XCheckMaskEvent     libX11         XChkMaskEv
+ 00000000 T _XCheckWindowEvent   libX11         XChkWinEv
+ 00000000 T _XCheckTypedEvent    libX11         XChkTypEv
+ 00000000 T _XCheckTypedWindowEvent libX11         XChkTypWEv
+ 00000000 T _XCirculateSubwindows libX11         XCirWin
+ 00000000 T _XCirculateSubwindowsDown libX11         XCirWinDn
+ 00000000 T _XCirculateSubwindowsUp libX11         XCirWinUp
+ 00000000 T _XCloseDisplay       libX11         XClDisplay
+ 00000000 T _XClearWindow        libX11         XClear
+ 00000000 T _XClearArea          libX11         XClearArea
+ 00000000 T _XMoveResizeWindow   libX11         XConfWind
+ 00000000 T __XConnectDisplay    libX11         XConnDis
+ 00000000 T __XDisconnectDisplay libX11         XConnDis
+ 00000000 T __XSendClientPrefix  libX11         XConnDis
+ 00000000 T _XSetAuthorization   libX11         XConnDis
+ 00000000 T _XConvertSelection   libX11         XConvSel
+ 00000000 T _XCopyArea           libX11         XCopyArea
+ 00000000 T _XCopyColormapAndFree libX11         XCopyCmap
+ 00000000 T _XCopyGC             libX11         XCopyGC
+ 00000000 T _XCopyPlane          libX11         XCopyPlane
+ 00000000 T _XCreateBitmapFromData libX11         XCrBFData
+ 00000000 T _XCreateColormap     libX11         XCrCmap
+ 00000000 T _XCreatePixmapCursor libX11         XCrCursor
+ 00000000 T _XCreateGC           libX11         XCrGC
+ 00000000 T __XUpdateGCCache     libX11         XCrGC
+ 00000000 T __XFlushGCCache      libX11         XCrGC
+ 00000000 T _XFlushGC            libX11         XCrGC
+ 00000000 T _XGContextFromGC     libX11         XCrGC
+ 00000000 T _XCreateGlyphCursor  libX11         XCrGlCur
+ 00000000 T _XCreatePixmapFromBitmapData libX11         XCrPFBData
+ 00000000 T _XCreatePixmap       libX11         XCrPixmap
+ 00000000 T _XCreateSimpleWindow libX11         XCrWindow
+ 00000000 T _XCreateFontCursor   libX11         XCursor
+ 00000000 T _XDefineCursor       libX11         XDefCursor
+ 00000000 T _XDeleteProperty     libX11         XDelProp
+ 00000000 T _XDestroySubwindows  libX11         XDestSubs
+ 00000000 T _XDestroyWindow      libX11         XDestWind
+ 00000000 T _XDisplayName        libX11         XDisName
+ 00000000 T _XDrawArc            libX11         XDrArc
+ 00000000 T _XDrawArcs           libX11         XDrArcs
+ 00000000 T _XDrawLine           libX11         XDrLine
+ 00000000 T _XDrawLines          libX11         XDrLines
+ 00000000 T _XDrawPoint          libX11         XDrPoint
+ 00000000 T _XDrawPoints         libX11         XDrPoints
+ 00000000 T _XDrawRectangle      libX11         XDrRect
+ 00000000 T _XDrawRectangles     libX11         XDrRects
+ 00000000 T _XDrawSegments       libX11         XDrSegs
+ 00000000 T _XGetErrorText       libX11         XErrDes
+ 00000000 T _XGetErrorDatabaseText libX11         XErrDes
+ 00000000 T _XSetErrorHandler    libX11         XErrHndlr
+ 00000000 T _XSetIOErrorHandler  libX11         XErrHndlr
+ 00000000 T __XEventToWire       libX11         XEvToWire
+ 00000000 T _XFetchName          libX11         XFetchName
+ 00000000 T _XGetIconName        libX11         XFetchName
+ 00000000 T _XFillArc            libX11         XFillArc
+ 00000000 T _XFillArcs           libX11         XFillArcs
+ 00000000 T _XFillPolygon        libX11         XFillPoly
+ 00000000 T _XFillRectangle      libX11         XFillRect
+ 00000000 T _XFillRectangles     libX11         XFillRects
+ 00000000 T _XFlush              libX11         XFlush
+ 00000000 T _XLoadQueryFont      libX11         XFont
+ 00000000 T _XFreeFont           libX11         XFont
+ 00000000 T _XQueryFont          libX11         XFont
+ 00000000 T _XListFonts          libX11         XFontNames
+ 00000000 T _XFreeFontNames      libX11         XFontNames
+ 00000000 T _XListFontsWithInfo  libX11         XFontInfo
+ 00000000 T _XFreeFontInfo       libX11         XFontInfo
+ 00000000 T _XFreeColormap       libX11         XFreeCmap
+ 00000000 T _XFreeColors         libX11         XFreeCols
+ 00000000 T _XFreeCursor         libX11         XFreeCurs
+ 00000000 T __XFreeExtData       libX11         XFreeEData
+ 00000000 T _XFreeGC             libX11         XFreeGC
+ 00000000 T _XFreePixmap         libX11         XFreePix
+ 00000000 T _XActivateScreenSaver libX11         XFSSaver
+ 00000000 T _XResetScreenSaver   libX11         XFSSaver
+ 00000000 T _XForceScreenSaver   libX11         XFSSaver
+ 00000000 T _XSetArcMode         libX11         XGCMisc
+ 00000000 T _XSetFillRule        libX11         XGCMisc
+ 00000000 T _XSetFillStyle       libX11         XGCMisc
+ 00000000 T _XSetGraphicsExposures libX11         XGCMisc
+ 00000000 T _XSetSubwindowMode   libX11         XGCMisc
+ 00000000 T _XGeometry           libX11         XGeom
+ 00000000 T _XGetAtomName        libX11         XGetAtomNm
+ 00000000 T _XAllocNamedColor    libX11         XGetColor
+ 00000000 T _XGetDefault         libX11         XGetDflt
+ 00000000 T _XGetFontPath        libX11         XGetFPath
+ 00000000 T _XFreeFontPath       libX11         XGetFPath
+ 00000000 T _XGetFontProperty    libX11         XGetFProp
+ 00000000 T _XGetGeometry        libX11         XGetGeom
+ 00000000 T _XAllocColor         libX11         XGetHColor
+ 00000000 T _XGetSizeHints       libX11         XGetHints
+ 00000000 T _XGetWMHints         libX11         XGetHints
+ 00000000 T _XGetZoomHints       libX11         XGetHints
+ 00000000 T _XGetNormalHints     libX11         XGetHints
+ 00000000 T _XGetIconSizes       libX11         XGetHints
+ 00000000 T _XGetCommand         libX11         XGetHints
+ 00000000 T _XGetTransientForHint libX11         XGetHints
+ 00000000 T _XGetClassHint       libX11         XGetHints
+ 00000000 T _XGetInputFocus      libX11         XGetIFocus
+ 00000000 T _XGetImage           libX11         XGetImage
+ 00000000 T _XGetSubImage        libX11         XGetImage
+ 00000000 T _XGetKeyboardControl libX11         XGetKCnt
+ 00000000 T _XGetMotionEvents    libX11         XGetMoEv
+ 00000000 T _XGetPointerControl  libX11         XGetPCnt
+ 00000000 T _XGetPointerMapping  libX11         XGetPntMap
+ 00000000 T _XGetKeyboardMapping libX11         XGetPntMap
+ 00000000 T _XGetWindowProperty  libX11         XGetProp
+ 00000000 T _XGetSelectionOwner  libX11         XGetSOwner
+ 00000000 T _XGetScreenSaver     libX11         XGetSSaver
+ 00000000 T _XGetStandardColormap libX11         XGetStCmap
+ 00000000 T _XGetWindowAttributes libX11         XGetWAttrs
+ 00000000 T _XGrabButton         libX11         XGrButton
+ 00000000 T _XGrabKey            libX11         XGrKey
+ 00000000 T _XGrabKeyboard       libX11         XGrKeybd
+ 00000000 T _XGrabPointer        libX11         XGrPointer
+ 00000000 T _XGrabServer         libX11         XGrServer
+ 00000000 T _XAddHost            libX11         XHost
+ 00000000 T _XRemoveHost         libX11         XHost
+ 00000000 T _XAddHosts           libX11         XHost
+ 00000000 T _XRemoveHosts        libX11         XHost
+ 00000000 T _XIfEvent            libX11         XIfEvent
+ 00000000 T __XGetScanlinePad    libX11         XImUtil
+ 00000000 T __XGetBitsPerPixel   libX11         XImUtil
+ 00000000 T _XCreateImage        libX11         XImUtil
+ 00000000 T __XSetImage          libX11         XImUtil
+ 00000000 T __XInitImageFuncPtrs libX11         XImUtil
+ 00000000 T _XDrawImageString    libX11         XImText
+ 00000000 T _XDrawImageString16  libX11         XImText16
+ 00000000 T _XInitExtension      libX11         XInitExt
+ 00000000 T _XAddExtension       libX11         XInitExt
+ 00000000 T _XEHeadOfExtensionList libX11         XInitExt
+ 00000000 T _XAddToExtensionList libX11         XInitExt
+ 00000000 T _XFindOnExtensionList libX11         XInitExt
+ 00000000 T _XESetCreateGC       libX11         XInitExt
+ 00000000 T _XESetCopyGC         libX11         XInitExt
+ 00000000 T _XESetFlushGC        libX11         XInitExt
+ 00000000 T _XESetFreeGC         libX11         XInitExt
+ 00000000 T _XESetCreateFont     libX11         XInitExt
+ 00000000 T _XESetFreeFont       libX11         XInitExt
+ 00000000 T _XESetCloseDisplay   libX11         XInitExt
+ 00000000 T _XESetWireToEvent    libX11         XInitExt
+ 00000000 T _XESetEventToWire    libX11         XInitExt
+ 00000000 T _XESetWireToError    libX11         XInitExt
+ 00000000 T _XESetError          libX11         XInitExt
+ 00000000 T _XESetErrorString    libX11         XInitExt
+ 00000000 T _XESetPrintErrorValues libX11         XInitExt
+ 00000000 T _XInstallColormap    libX11         XInsCmap
+ 00000000 T _XInternAtom         libX11         XIntAtom
+ 00000000 T _XKeycodeToKeysym    libX11         XKeyBind
+ 00000000 T _XKeysymToKeycode    libX11         XKeyBind
+ 00000000 T _XLookupKeysym       libX11         XKeyBind
+ 00000000 T _XRefreshKeyboardMapping libX11         XKeyBind
+ 00000000 T _XLookupString       libX11         XKeyBind
+ 00000000 T _XRebindKeysym       libX11         XKeyBind
+ 00000000 T _XKeysymToString     libX11         XKeysymStr
+ 00000000 T _XKillClient         libX11         XKillCl
+ 00000000 T _XListHosts          libX11         XLiHosts
+ 00000000 T _XListInstalledColormaps libX11         XLiICmaps
+ 00000000 T _XListProperties     libX11         XLiProps
+ 00000000 T _XListExtensions     libX11         XListExt
+ 00000000 T _XFreeExtensionList  libX11         XListExt
+ 00000000 T _XLoadFont           libX11         XLoadFont
+ 00000000 T _XLookupColor        libX11         XLookupCol
+ 00000000 T _XLowerWindow        libX11         XLowerWin
+ 00000000 T _XConnectionNumber   libX11         XMacros
+ 00000000 T _XRootWindow         libX11         XMacros
+ 00000000 T _XDefaultScreen      libX11         XMacros
+ 00000000 T _XDefaultRootWindow  libX11         XMacros
+ 00000000 T _XDefaultVisual      libX11         XMacros
+ 00000000 T _XDefaultGC          libX11         XMacros
+ 00000000 T _XBlackPixel         libX11         XMacros
+ 00000000 T _XWhitePixel         libX11         XMacros
+ 00000000 T _XAllPlanes          libX11         XMacros
+ 00000000 T _XQLength            libX11         XMacros
+ 00000000 T _XDisplayWidth       libX11         XMacros
+ 00000000 T _XDisplayHeight      libX11         XMacros
+ 00000000 T _XDisplayWidthMM     libX11         XMacros
+ 00000000 T _XDisplayHeightMM    libX11         XMacros
+ 00000000 T _XDisplayPlanes      libX11         XMacros
+ 00000000 T _XDisplayCells       libX11         XMacros
+ 00000000 T _XScreenCount        libX11         XMacros
+ 00000000 T _XServerVendor       libX11         XMacros
+ 00000000 T _XProtocolVersion    libX11         XMacros
+ 00000000 T _XProtocolRevision   libX11         XMacros
+ 00000000 T _XVendorRelease      libX11         XMacros
+ 00000000 T _XDisplayString      libX11         XMacros
+ 00000000 T _XDefaultDepth       libX11         XMacros
+ 00000000 T _XDefaultColormap    libX11         XMacros
+ 00000000 T _XBitmapUnit         libX11         XMacros
+ 00000000 T _XBitmapBitOrder     libX11         XMacros
+ 00000000 T _XBitmapPad          libX11         XMacros
+ 00000000 T _XImageByteOrder     libX11         XMacros
+ 00000000 T _XNextRequest        libX11         XMacros
+ 00000000 T _XLastKnownRequestProcessed libX11         XMacros
+ 00000000 T _XScreenOfDisplay    libX11         XMacros
+ 00000000 T _XDefaultScreenOfDisplay libX11         XMacros
+ 00000000 T _XDisplayOfScreen    libX11         XMacros
+ 00000000 T _XRootWindowOfScreen libX11         XMacros
+ 00000000 T _XBlackPixelOfScreen libX11         XMacros
+ 00000000 T _XWhitePixelOfScreen libX11         XMacros
+ 00000000 T _XDefaultColormapOfScreen libX11         XMacros
+ 00000000 T _XDefaultDepthOfScreen libX11         XMacros
+ 00000000 T _XDefaultGCOfScreen  libX11         XMacros
+ 00000000 T _XDefaultVisualOfScreen libX11         XMacros
+ 00000000 T _XWidthOfScreen      libX11         XMacros
+ 00000000 T _XHeightOfScreen     libX11         XMacros
+ 00000000 T _XWidthMMOfScreen    libX11         XMacros
+ 00000000 T _XHeightMMOfScreen   libX11         XMacros
+ 00000000 T _XPlanesOfScreen     libX11         XMacros
+ 00000000 T _XCellsOfScreen      libX11         XMacros
+ 00000000 T _XMinCmapsOfScreen   libX11         XMacros
+ 00000000 T _XMaxCmapsOfScreen   libX11         XMacros
+ 00000000 T _XDoesSaveUnders     libX11         XMacros
+ 00000000 T _XDoesBackingStore   libX11         XMacros
+ 00000000 T _XEventMaskOfScreen  libX11         XMacros
+ 00000000 T _XScreenNumberOfScreen libX11         XMacros
+ 00000000 T _XDestroyImage       libX11         XMacros
+ 00000000 T _XGetPixel           libX11         XMacros
+ 00000000 T _XPutPixel           libX11         XMacros
+ 00000000 T _XSubImage           libX11         XMacros
+ 00000000 T _XAddPixel           libX11         XMacros
+ 00000000 T _XNoOp               libX11         XMacros
+ 00000000 T _XMapRaised          libX11         XMapRaised
+ 00000000 T _XMapSubwindows      libX11         XMapSubs
+ 00000000 T _XMapWindow          libX11         XMapWindow
+ 00000000 T _XMaskEvent          libX11         XMaskEvent
+ 00000000 T _XMaxRequestSize     libX11         XMisc
+ 00000000 T _XResourceManagerString libX11         XMisc
+ 00000000 T _XDisplayMotionBufferSize libX11         XMisc
+ 00000000 T _XDisplayKeycodes    libX11         XMisc
+ 00000000 T _XVisualIDFromVisual libX11         XMisc
+ 00000000 T _XGetModifierMapping libX11         XModMap
+ 00000000 T _XSetModifierMapping libX11         XModMap
+ 00000000 T _XNewModifiermap     libX11         XModMap
+ 00000000 T _XFreeModifiermap    libX11         XModMap
+ 00000000 T _XInsertModifiermapEntry libX11         XModMap
+ 00000000 T _XDeleteModifiermapEntry libX11         XModMap
+ 00000000 T _XMoveWindow         libX11         XMoveWin
+ 00000000 T _XNextEvent          libX11         XNextEvent
+ 00000000 T _XOpenDisplay        libX11         XOpenDis
+ 00000000 T __XFreeDisplayStructure libX11         XOpenDis
+ 00000000 T _XParseColor         libX11         XParseCol
+ 00000000 T _XParseGeometry      libX11         XParseGeom
+ 00000000 T _XPeekEvent          libX11         XPeekEvent
+ 00000000 T _XPeekIfEvent        libX11         XPeekIfEv
+ 00000000 T _XEventsQueued       libX11         XPending
+ 00000000 T _XPending            libX11         XPending
+ 00000000 T _XSetWindowBackgroundPixmap libX11         XPmapBgnd
+ 00000000 T _XSetWindowBorderPixmap libX11         XPmapBord
+ 00000000 T _XPolygonRegion      libX11         XPolyReg
+ 00000000 T _XDrawText           libX11         XPolyTxt
+ 00000000 T _XDrawText16         libX11         XPolyTxt16
+ 00000000 T _XPutBackEvent       libX11         XPutBEvent
+ 00000000 T __XReverse_Bytes     libX11         XPutImage
+ 00000000 T _XPutImage           libX11         XPutImage
+ 00000000 T _XQueryBestSize      libX11         XQuBest
+ 00000000 T _XQueryColor         libX11         XQuColor
+ 00000000 T _XQueryColors        libX11         XQuColors
+ 00000000 T _XQueryBestCursor    libX11         XQuCurShp
+ 00000000 T _XQueryExtension     libX11         XQuExt
+ 00000000 T _XQueryKeymap        libX11         XQuKeybd
+ 00000000 T _XQueryPointer       libX11         XQuPntr
+ 00000000 T _XQueryBestStipple   libX11         XQuStipShp
+ 00000000 T _XQueryTextExtents16 libX11         XQuTextE16
+ 00000000 T _XQueryTextExtents   libX11         XQuTextExt
+ 00000000 T _XQueryBestTile      libX11         XQuTileShp
+ 00000000 T _XQueryTree          libX11         XQuTree
+ 00000000 T _XRaiseWindow        libX11         XRaiseWin
+ 00000000 T _XReadBitmapFile     libX11         XRdBitF
+ 00000000 T _XRecolorCursor      libX11         XRecolorC
+ 00000000 T _XConfigureWindow    libX11         XReconfWin
+ 00000000 T _XCreateRegion       libX11         XRegion
+ 00000000 T _XClipBox            libX11         XRegion
+ 00000000 T _XUnionRectWithRegion libX11         XRegion
+ 00000000 T _XSetRegion          libX11         XRegion
+ 00000000 T _XDestroyRegion      libX11         XRegion
+ 00000000 T _XOffsetRegion       libX11         XRegion
+ 00000000 T _XShrinkRegion       libX11         XRegion
+ 00000000 T _XIntersectRegion    libX11         XRegion
+ 00000000 T _XUnionRegion        libX11         XRegion
+ 00000000 T _XSubtractRegion     libX11         XRegion
+ 00000000 T _XXorRegion          libX11         XRegion
+ 00000000 T _XEmptyRegion        libX11         XRegion
+ 00000000 T _XEqualRegion        libX11         XRegion
+ 00000000 T _XPointInRegion      libX11         XRegion
+ 00000000 T _XRectInRegion       libX11         XRegion
+ 00000000 T _XReparentWindow     libX11         XRepWindow
+ 00000000 T _XRestackWindows     libX11         XRestackWs
+ 00000000 T _XRotateWindowProperties libX11         XRotProp
+ 00000000 T _XScreenResourceString libX11         XScrResStr
+ 00000000 T _XSelectInput        libX11         XSelInput
+ 00000000 T _XSendEvent          libX11         XSendEvent
+ 00000000 T _XSetBackground      libX11         XSetBack
+ 00000000 T _XSetClipRectangles  libX11         XSetCRects
+ 00000000 T __XSetClipRectangles libX11         XSetCRects
+ 00000000 T _XSetClipMask        libX11         XSetClMask
+ 00000000 T _XSetClipOrigin      libX11         XSetClOrig
+ 00000000 T _XSetDashes          libX11         XSetDashes
+ 00000000 T _XSetFontPath        libX11         XSetFPath
+ 00000000 T _XSetFont            libX11         XSetFont
+ 00000000 T _XSetForeground      libX11         XSetFore
+ 00000000 T _XSetFunction        libX11         XSetFunc
+ 00000000 T _XSetSizeHints       libX11         XSetHints
+ 00000000 T _XSetWMHints         libX11         XSetHints
+ 00000000 T _XSetZoomHints       libX11         XSetHints
+ 00000000 T _XSetNormalHints     libX11         XSetHints
+ 00000000 T _XSetIconSizes       libX11         XSetHints
+ 00000000 T _XSetCommand         libX11         XSetHints
+ 00000000 T _XSetStandardProperties libX11         XSetHints
+ 00000000 T _XSetTransientForHint libX11         XSetHints
+ 00000000 T _XSetClassHint       libX11         XSetHints
+ 00000000 T _XSetInputFocus      libX11         XSetIFocus
+ 00000000 T _XSetLineAttributes  libX11         XSetLStyle
+ 00000000 T _XSetPlaneMask       libX11         XSetPMask
+ 00000000 T _XSetPointerMapping  libX11         XSetPntMap
+ 00000000 T _XChangeKeyboardMapping libX11         XSetPntMap
+ 00000000 T _XSetSelectionOwner  libX11         XSetSOwner
+ 00000000 T _XSetScreenSaver     libX11         XSetSSaver
+ 00000000 T _XSetState           libX11         XSetState
+ 00000000 T _XSetStipple         libX11         XSetStip
+ 00000000 T _XSetStandardColormap libX11         XSetStCmap
+ 00000000 T _XSetTile            libX11         XSetTile
+ 00000000 T _XSetTSOrigin        libX11         XSetTSOrig
+ 00000000 T _XRotateBuffers      libX11         XStBytes
+ 00000000 T _XFetchBuffer        libX11         XStBytes
+ 00000000 T _XFetchBytes         libX11         XStBytes
+ 00000000 T _XStoreBuffer        libX11         XStBytes
+ 00000000 T _XStoreBytes         libX11         XStBytes
+ 00000000 T _XStoreColor         libX11         XStColor
+ 00000000 T _XStoreColors        libX11         XStColors
+ 00000000 T _XStoreNamedColor    libX11         XStNColor
+ 00000000 T _XStoreName          libX11         XStName
+ 00000000 T _XSetIconName        libX11         XStName
+ 00000000 T __XInitKeysymDB      libX11         XStrKeysym
+ 00000000 T _XStringToKeysym     libX11         XStrKeysym
+ 00000000 T _XSync               libX11         XSync
+ 00000000 T __XSyncFunction      libX11         XSynchro
+ 00000000 T _XSynchronize        libX11         XSynchro
+ 00000000 T _XSetAfterFunction   libX11         XSynchro
+ 00000000 T _XDrawString         libX11         XText
+ 00000000 T _XDrawString16       libX11         XText16
+ 00000000 T _XTextExtents        libX11         XTextExt
+ 00000000 T _XTextWidth          libX11         XTextExt
+ 00000000 T _XTextExtents16      libX11         XTextExt16
+ 00000000 T _XTextWidth16        libX11         XTextExt16
+ 00000000 T _XTranslateCoordinates libX11         XTrCoords
+ 00000000 T _XUndefineCursor     libX11         XUndefCurs
+ 00000000 T _XUngrabButton       libX11         XUngrabBut
+ 00000000 T _XUngrabKeyboard     libX11         XUngrabKbd
+ 00000000 T _XUngrabKey          libX11         XUngrabKey
+ 00000000 T _XUngrabPointer      libX11         XUngrabPtr
+ 00000000 T _XUngrabServer       libX11         XUngrabSvr
+ 00000000 T _XUninstallColormap  libX11         XUninsCmap
+ 00000000 T _XUnloadFont         libX11         XUnldFont
+ 00000000 T _XUnmapSubwindows    libX11         XUnmapSubs
+ 00000000 T _XUnmapWindow        libX11         XUnmapWin
+ 00000000 T _XGetVisualInfo      libX11         XVisUtil
+ 00000000 T _XMatchVisualInfo    libX11         XVisUtil
+ 00000000 T _XWarpPointer        libX11         XWarpPtr
+ 00000000 T _XWindowEvent        libX11         XWinEvent
+ 00000000 T _XCreateWindow       libX11         XWindow
+ 00000000 T __XProcessWindowAttributes libX11         XWindow
+ 00000000 T _XWriteBitmapFile    libX11         XWrBitF
+ 00000000 T __XFlush             libX11         XlibInt
+ 00000000 T __XEventsQueued      libX11         XlibInt
+ 00000000 T __XReadEvents        libX11         XlibInt
+ 00000000 T __XRead              libX11         XlibInt
+ 00000000 T __XReadPad           libX11         XlibInt
+ 00000000 T __XSend              libX11         XlibInt
+ 00000000 T __XAllocID           libX11         XlibInt
+ 00000000 T __XSetLastRequestRead libX11         XlibInt
+ 00000000 T __XReply             libX11         XlibInt
+ 00000000 T __XEatData           libX11         XlibInt
+ 00000000 T __XEnq               libX11         XlibInt
+ 00000000 T __XUnknownWireEvent  libX11         XlibInt
+ 00000000 T __XUnknownNativeEvent libX11         XlibInt
+ 00000000 T __XWireToEvent       libX11         XlibInt
+ 00000000 T __XDefaultIOError    libX11         XlibInt
+ 00000000 T __XDefaultError      libX11         XlibInt
+ 00000000 T __XDefaultWireError  libX11         XlibInt
+ 00000000 T __XError             libX11         XlibInt
+ 00000000 T __XIOError           libX11         XlibInt
+ 00000000 T __XAllocScratch      libX11         XlibInt
+ 00000000 T __XVIDtoVisual       libX11         XlibInt
+ 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
+ 00000000 T _XrmInitialize       libX11         Xrm
+ 00000000 T _XrmGetDatabase      libX11         Xrm
+ 00000000 T _XrmSetDatabase      libX11         Xrm
+ 00000000 T _XrmStringToQuarkList libX11         Xrm
+ 00000000 T _XrmStringToBindingQuarkList libX11         Xrm
+ 00000000 T _XrmCombineDatabase  libX11         Xrm
+ 00000000 T _XrmMergeDatabases   libX11         Xrm
+ 00000000 T _XrmQPutResource     libX11         Xrm
+ 00000000 T _XrmPutResource      libX11         Xrm
+ 00000000 T _XrmQPutStringResource libX11         Xrm
+ 00000000 T _XrmPutStringResource libX11         Xrm
+ 00000000 T _XrmPutLineResource  libX11         Xrm
+ 00000000 T _XrmGetStringDatabase libX11         Xrm
+ 00000000 T _XrmGetFileDatabase  libX11         Xrm
+ 00000000 T _XrmCombineFileDatabase libX11         Xrm
+ 00000000 T _XrmEnumerateDatabase libX11         Xrm
+ 00000000 T _XrmPutFileDatabase  libX11         Xrm
+ 00000000 T _XrmQGetSearchList   libX11         Xrm
+ 00000000 T _XrmQGetSearchResource libX11         Xrm
+ 00000000 T _XrmQGetResource     libX11         Xrm
+ 00000000 T _XrmGetResource      libX11         Xrm
+ 00000000 T _XrmLocaleOfDatabase libX11         Xrm
+ 00000000 T _XrmDestroyDatabase  libX11         Xrm
+ 00000000 T _XGetGCValues        libX11         GetGCVals
+ 00000000 T _XGetWMSizeHints     libX11         GetNrmHint
+ 00000000 T _XGetWMNormalHints   libX11         GetNrmHint
+ 00000000 T _XGetRGBColormaps    libX11         GetRGBCMap
+ 00000000 T _XGetTextProperty    libX11         GetTxtProp
+ 00000000 T _XGetWMName          libX11         GetTxtProp
+ 00000000 T _XGetWMIconName      libX11         GetTxtProp
+ 00000000 T _XGetWMClientMachine libX11         GetTxtProp
+ 00000000 T _XGetWMColormapWindows libX11         GetWMCMapW
+ 00000000 T _XGetWMProtocols     libX11         GetWMProto
+ 00000000 T _XIconifyWindow      libX11         Iconify
+ 00000000 T _XListPixmapFormats  libX11         PixFormats
+ 00000000 T _XAllocSizeHints     libX11         PropAlloc
+ 00000000 T _XAllocStandardColormap libX11         PropAlloc
+ 00000000 T _XAllocWMHints       libX11         PropAlloc
+ 00000000 T _XAllocClassHint     libX11         PropAlloc
+ 00000000 T _XAllocIconSize      libX11         PropAlloc
+ 00000000 T _XReconfigureWMWindow libX11         ReconfWM
+ 00000000 T _XSetWMSizeHints     libX11         SetNrmHint
+ 00000000 T _XSetWMNormalHints   libX11         SetNrmHint
+ 00000000 T _XSetRGBColormaps    libX11         SetRGBCMap
+ 00000000 T _XSetTextProperty    libX11         SetTxtProp
+ 00000000 T _XSetWMName          libX11         SetTxtProp
+ 00000000 T _XSetWMIconName      libX11         SetTxtProp
+ 00000000 T _XSetWMClientMachine libX11         SetTxtProp
+ 00000000 T _XSetWMColormapWindows libX11         SetWMCMapW
+ 00000000 T _XSetWMProperties    libX11         SetWMProps
+ 00000000 T _XSetWMProtocols     libX11         SetWMProto
+ 00000000 T _XStringListToTextProperty libX11         StrToText
+ 00000000 T _XTextPropertyToStringList libX11         TextToStr
+ 00000000 T _XFreeStringList     libX11         TextToStr
+ 00000000 T _XWMGeometry         libX11         WMGeom
+ 00000000 T _XWithdrawWindow     libX11         Withdraw
+ 00000000 T _XauDisposeAuth      libX11         AuDispose
+ 00000000 T _XauGetBestAuthByAddr libX11         AuGetBest
+ 00000000 T _XauFileName         libX11         AuFileName
+ 00000000 T _XauReadAuth         libX11         AuRead
+ 00000000 T _XcmsCIELabToCIEXYZ  libX11         CIELab
+ 00000000 T _XcmsCIEXYZToCIELab  libX11         CIELab
+ 00000000 T _XcmsCIELabClipab    libX11         CIELabGcC
+ 00000000 T _XcmsCIELabClipL     libX11         CIELabGcL
+ 00000000 T _XcmsCIELabClipLab   libX11         CIELabGcLC
+ 00000000 T _XcmsCIELabQueryMinL libX11         CIELabMnL
+ 00000000 T _XcmsCIELabQueryMaxC libX11         CIELabMxC
+ 00000000 T _XcmsCIELabQueryMaxL libX11         CIELabMxL
+ 00000000 T __XcmsCIELabQueryMaxLCRGB libX11         CIELabMxLC
+ 00000000 T _XcmsCIELabQueryMaxLC libX11         CIELabMxLC
+ 00000000 T _XcmsCIELabWhiteShiftColors libX11         CIELabWpAj
+ 00000000 T _XcmsCIELuvToCIEuvY  libX11         CIELuv
+ 00000000 T _XcmsCIEuvYToCIELuv  libX11         CIELuv
+ 00000000 T _XcmsCIELuvClipuv    libX11         CIELuvGcC
+ 00000000 T _XcmsCIELuvClipL     libX11         CIELuvGcL
+ 00000000 T _XcmsCIELuvClipLuv   libX11         CIELuvGcLC
+ 00000000 T _XcmsCIELuvQueryMinL libX11         CIELuvMnL
+ 00000000 T _XcmsCIELuvQueryMaxC libX11         CIELuvMxC
+ 00000000 T _XcmsCIELuvQueryMaxL libX11         CIELuvMxL
+ 00000000 T __XcmsCIELuvQueryMaxLCRGB libX11         CIELuvMxLC
+ 00000000 T _XcmsCIELuvQueryMaxLC libX11         CIELuvMxLC
+ 00000000 T _XcmsCIELuvWhiteShiftColors libX11         CIELuvWpAj
+ 00000000 T _XcmsCIEuvYToCIEXYZ  libX11         CIEuvY
+ 00000000 T _XcmsCIEXYZToCIEuvY  libX11         CIEuvY
+ 00000000 T _XcmsCIExyYToCIEXYZ  libX11         CIExyY
+ 00000000 T _XcmsCIEXYZToCIExyY  libX11         CIExyY
+ 00000000 T _XcmsTekHVCToCIEuvY  libX11         TekHVC
+ 00000000 T _XcmsCIEuvYToTekHVC  libX11         TekHVC
+ 00000000 T __XcmsTekHVC_CheckModify libX11         TekHVC
+ 00000000 T _XcmsTekHVCClipC     libX11         TekHVCGcC
+ 00000000 T _XcmsTekHVCClipV     libX11         TekHVCGcV
+ 00000000 T _XcmsTekHVCClipVC    libX11         TekHVCGcVC
+ 00000000 T _XcmsTekHVCQueryMinV libX11         TekHVCMnV
+ 00000000 T _XcmsTekHVCQueryMaxC libX11         TekHVCMxC
+ 00000000 T _XcmsTekHVCQueryMaxV libX11         TekHVCMxV
+ 00000000 T __XcmsTekHVCQueryMaxVCRGB libX11         TekHVCMxVC
+ 00000000 T _XcmsTekHVCQueryMaxVC libX11         TekHVCMxVC
+ 00000000 T _XcmsTekHVCQueryMaxVSamples libX11         TekHVCMxVs
+ 00000000 T _XcmsTekHVCWhiteShiftColors libX11         TekHVCWpAj
+ 00000000 T _XcmsAddColorSpace   libX11         XcmsAddDIC
+ 00000000 T _XcmsAddFunctionSet  libX11         XcmsAddSF
+ 00000000 T _XcmsAllocNamedColor libX11         XcmsAlNCol
+ 00000000 T _XcmsAllocColor      libX11         XcmsAllCol
+ 00000000 T _XcmsCreateCCC       libX11         XcmsCCC
+ 00000000 T _XcmsDefaultCCC      libX11         XcmsCCC
+ 00000000 T _XcmsFreeCCC         libX11         XcmsCCC
+ 00000000 T __XcmsAddCmapRec     libX11         XcmsCmap
+ 00000000 T __XcmsCopyCmapRecAndFree libX11         XcmsCmap
+ 00000000 T __XcmsDeleteCmapRec  libX11         XcmsCmap
+ 00000000 T _XcmsCCCOfColormap   libX11         XcmsCmap
+ 00000000 T __XcmsCopyISOLatin1Lowered libX11         XcmsColNm
+ 00000000 T __XcmsResolveColorString libX11         XcmsColNm
+ 00000000 T __XcmsConvertColorsWithWhitePt libX11         XcmsCvColW
+ 00000000 T __XcmsEqualWhitePts  libX11         XcmsCvCols
+ 00000000 T __XcmsDIConvertColors libX11         XcmsCvCols
+ 00000000 T __XcmsDDConvertColors libX11         XcmsCvCols
+ 00000000 T _XcmsConvertColors   libX11         XcmsCvCols
+ 00000000 T __XcmsRegFormatOfPrefix libX11         XcmsCvCols
+ 00000000 T _XcmsFormatOfPrefix  libX11         XcmsIdOfPr
+ 00000000 T __XcmsCopyPointerArray libX11         XcmsInt
+ 00000000 T __XcmsFreePointerArray libX11         XcmsInt
+ 00000000 T __XcmsPushPointerArray libX11         XcmsInt
+ 00000000 T __XcmsInitDefaultCCCs libX11         XcmsInt
+ 00000000 T __XcmsInitScrnInfo   libX11         XcmsInt
+ 00000000 T __XcmsFreeIntensityMaps libX11         XcmsInt
+ 00000000 T __XcmsGetIntensityMap libX11         XcmsInt
+ 00000000 T __XcmsGetTableType0  libX11         XcmsLRGB
+ 00000000 T __XcmsGetTableType1  libX11         XcmsLRGB
+ 00000000 T __XcmsValueCmp       libX11         XcmsLRGB
+ 00000000 T __XcmsIntensityCmp   libX11         XcmsLRGB
+ 00000000 T __XcmsValueInterpolation libX11         XcmsLRGB
+ 00000000 T __XcmsIntensityInterpolation libX11         XcmsLRGB
+ 00000000 T __XcmsTableSearch    libX11         XcmsLRGB
+ 00000000 T __XcmsMatVec         libX11         XcmsLRGB
+ 00000000 T _XcmsCIEXYZToRGBi    libX11         XcmsLRGB
+ 00000000 T _XcmsRGBiToCIEXYZ    libX11         XcmsLRGB
+ 00000000 T _XcmsRGBiToRGB       libX11         XcmsLRGB
+ 00000000 T _XcmsRGBToRGBi       libX11         XcmsLRGB
+ 00000000 T __XcmsLRGB_InitScrnDefault libX11         XcmsLRGB
+ 00000000 T _XcmsLookupColor     libX11         XcmsLkCol
+ 00000000 T __XcmsCubeRoot       libX11         XcmsMath
+ 00000000 T __XcmsSquareRoot     libX11         XcmsMath
+ 00000000 T _XcmsDisplayOfCCC    libX11         XcmsOfCCC
+ 00000000 T _XcmsVisualOfCCC     libX11         XcmsOfCCC
+ 00000000 T _XcmsScreenNumberOfCCC libX11         XcmsOfCCC
+ 00000000 T _XcmsScreenWhitePointOfCCC libX11         XcmsOfCCC
+ 00000000 T _XcmsClientWhitePointOfCCC libX11         XcmsOfCCC
+ 00000000 T _XcmsPrefixOfFormat  libX11         XcmsPrOfId
+ 00000000 T __XcmsGetElement     libX11         XcmsProp
+ 00000000 T __XcmsGetProperty    libX11         XcmsProp
+ 00000000 T _XcmsQueryBlack      libX11         XcmsQBlack
+ 00000000 T _XcmsQueryBlue       libX11         XcmsQBlue
+ 00000000 T _XcmsQueryGreen      libX11         XcmsQGreen
+ 00000000 T _XcmsQueryRed        libX11         XcmsQRed
+ 00000000 T _XcmsQueryWhite      libX11         XcmsQWhite
+ 00000000 T _XcmsQueryColor      libX11         XcmsQuCol
+ 00000000 T _XcmsQueryColors     libX11         XcmsQuCols
+ 00000000 T _XcmsSetWhitePoint   libX11         XcmsSetCCC
+ 00000000 T _XcmsSetCompressionProc libX11         XcmsSetCCC
+ 00000000 T _XcmsSetWhiteAdjustProc libX11         XcmsSetCCC
+ 00000000 T __XcmsSetGetColors   libX11         XcmsSetGet
+ 00000000 T _XcmsStoreColor      libX11         XcmsStCol
+ 00000000 T _XcmsStoreColors     libX11         XcmsStCols
+ 00000000 T __XcmsCosine         libX11         XcmsTrig
+ 00000000 T __XcmsSine           libX11         XcmsTrig
+ 00000000 T __XcmsArcTangent     libX11         XcmsTrig
+ 00000000 T __XcmsRGB_to_XColor  libX11         XcmsXRGB
+ 00000000 T __XColor_to_XcmsRGB  libX11         XcmsXRGB
+ 00000000 T __XcmsResolveColor   libX11         XcmsXRGB
+ 00000000 T __XcmsUnresolveColor libX11         XcmsXRGB
+ 00000000 T __XUnresolveColor    libX11         XcmsXRGB
+ 00000000 T __XParseBaseFontNameList libX11         XFSWrap
+ 00000000 T _XCreateFontSet      libX11         XFSWrap
+ 00000000 T _XFontsOfFontSet     libX11         XFSWrap
+ 00000000 T _XBaseFontNameListOfFontSet libX11         XFSWrap
+ 00000000 T _XLocaleOfFontSet    libX11         XFSWrap
+ 00000000 T _XContextDependentDrawing libX11         XFSWrap
+ 00000000 T _XExtentsOfFontSet   libX11         XFSWrap
+ 00000000 T _XFreeFontSet        libX11         XFSWrap
+ 00000000 T _XVaCreateNestedList libX11         XICWrap
+ 00000000 T _XGetIMValues        libX11         XICWrap
+ 00000000 T _XCreateIC           libX11         XICWrap
+ 00000000 T _XDestroyIC          libX11         XICWrap
+ 00000000 T _XGetICValues        libX11         XICWrap
+ 00000000 T _XSetICValues        libX11         XICWrap
+ 00000000 T _XSetICFocus         libX11         XICWrap
+ 00000000 T _XUnsetICFocus       libX11         XICWrap
+ 00000000 T _XIMOfIC             libX11         XICWrap
+ 00000000 T _XmbResetIC          libX11         XICWrap
+ 00000000 T _XwcResetIC          libX11         XICWrap
+ 00000000 T _XmbLookupString     libX11         XICWrap
+ 00000000 T _XwcLookupString     libX11         XICWrap
+ 00000000 T __XIMCompileResourceList libX11         XIMWrap
+ 00000000 T __XCopyToArg         libX11         XIMWrap
+ 00000000 T _XOpenIM             libX11         XIMWrap
+ 00000000 T _XCloseIM            libX11         XIMWrap
+ 00000000 T _XDisplayOfIM        libX11         XIMWrap
+ 00000000 T _XLocaleOfIM         libX11         XIMWrap
+ 00000000 T _XSetLocaleModifiers libX11         XlcWrap
+ 00000000 T _XSupportsLocale     libX11         XlcWrap
+ 00000000 T __XlcValidModSyntax  libX11         XlcWrap
+ 00000000 T __XlcDefaultMapModifiers libX11         XlcWrap
+ 00000000 T __XlcAddLoader       libX11         XlcWrap
+ 00000000 T __XlcCurrentLC       libX11         XlcWrap
+ 00000000 T _XmbSetWMProperties  libX11         XmbWMProps
+ 00000000 T _XmbDrawText         libX11         XmbWrap
+ 00000000 T _XmbDrawString       libX11         XmbWrap
+ 00000000 T _XmbDrawImageString  libX11         XmbWrap
+ 00000000 T _XmbTextEscapement   libX11         XmbWrap
+ 00000000 T _XmbTextExtents      libX11         XmbWrap
+ 00000000 T _XmbTextPerCharExtents libX11         XmbWrap
+ 00000000 T _XwcDrawText         libX11         XwcWrap
+ 00000000 T _XwcDrawString       libX11         XwcWrap
+ 00000000 T _XwcDrawImageString  libX11         XwcWrap
+ 00000000 T _XwcTextEscapement   libX11         XwcWrap
+ 00000000 T _XwcTextExtents      libX11         XwcWrap
+ 00000000 T _XwcTextPerCharExtents libX11         XwcWrap
+ 00000000 T _XFilterEvent        libX11         XFilterEv
+ 00000000 T __XRegisterFilterByMask libX11         XRegstFlt
+ 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
+ 00000000 T _XDefaultString      libX11         XCnvToStr
+ 00000000 T __XlcDefaultLoader   libX11         XlcDefLd
+ 00000000 T __XrmInitParseInfo   libX11         XlcLoad
+ 00000000 T _XmbTextPropertyToTextList libX11         XmbPrpText
+ 00000000 T _XmbTextListToTextProperty libX11         XmbTextPrp
+ 00000000 T _XwcTextPropertyToTextList libX11         XwcPrpText
+ 00000000 T _XwcFreeStringList   libX11         XwcPrpText
+ 00000000 T _XwcTextListToTextProperty libX11         XwcTextPrp
+ 00000000 T __X11TransConnectDisplay libX11         ConnDis
+ 00000000 T _XGetAtomNames       libX11         GetAtomNm
+ 00000000 T _XInitImage          libX11         ImUtil
+ 00000000 T _XESetBeforeFlush    libX11         InitExt
+ 00000000 T __XFreeAtomTable     libX11         IntAtom
+ 00000000 T __XUpdateAtomCache   libX11         IntAtom
+ 00000000 T _XInternAtoms        libX11         IntAtom
+ 00000000 T __XKeyInitialize     libX11         KeyBind
+ 00000000 T _XConvertCase        libX11         KeyBind
+ 00000000 T __XTranslateKey      libX11         KeyBind
+ 00000000 T __XTranslateKeySym   libX11         KeyBind
+ 00000000 T __XKeysymToModifiers libX11         KeyBind
+ 00000000 T _XExtendedMaxRequestSize libX11         Misc
+ 00000000 T _XReadBitmapFileData libX11         RdBitF
+ 00000000 T __XAsyncErrorHandler libX11         XlibAsync
+ 00000000 T __XDeqAsyncHandler   libX11         XlibAsync
+ 00000000 T __XGetAsyncReply     libX11         XlibAsync
+ 00000000 T __XGetAsyncData      libX11         XlibAsync
+ 00000000 T __XPollfdCacheInit   libX11         XlibInt
+ 00000000 T __XPollfdCacheAdd    libX11         XlibInt
+ 00000000 T __XPollfdCacheDel    libX11         XlibInt
+ 00000000 T __XRegisterInternalConnection libX11         XlibInt
+ 00000000 T __XUnregisterInternalConnection libX11         XlibInt
+ 00000000 T _XInternalConnectionNumbers libX11         XlibInt
+ 00000000 T _XProcessInternalConnection libX11         XlibInt
+ 00000000 T _XAddConnectionWatch libX11         XlibInt
+ 00000000 T _XRemoveConnectionWatch libX11         XlibInt
+ 00000000 T __XDeq               libX11         XlibInt
+ 00000000 T __XcmsCIEXYZ_ValidSpec libX11         XYZ
+ 00000000 T __XcmsCIEuvY_ValidSpec libX11         uvY
+ 00000000 T _XcmsSetCCCOfColormap libX11         cmsCmap
+ 00000000 T _XDirectionalDependentDrawing libX11         FSWrap
+ 00000000 T _XContextualDrawing  libX11         FSWrap
+ 00000000 T _XSetIMValues        libX11         ICWrap
+ 00000000 T _XRegisterIMInstantiateCallback libX11         IMWrap
+ 00000000 T _XUnregisterIMInstantiateCallback libX11         IMWrap
+ 00000000 T _XCreateOC           libX11         OCWrap
+ 00000000 T _XDestroyOC          libX11         OCWrap
+ 00000000 T _XOMOfOC             libX11         OCWrap
+ 00000000 T _XSetOCValues        libX11         OCWrap
+ 00000000 T _XGetOCValues        libX11         OCWrap
+ 00000000 T _XOpenOM             libX11         OMWrap
+ 00000000 T _XCloseOM            libX11         OMWrap
+ 00000000 T _XSetOMValues        libX11         OMWrap
+ 00000000 T _XGetOMValues        libX11         OMWrap
+ 00000000 T _XDisplayOfOM        libX11         OMWrap
+ 00000000 T _XLocaleOfOM         libX11         OMWrap
+ 00000000 T __XlcRemoveLoader    libX11         lcWrap
+ 00000000 T __XOpenLC            libX11         lcWrap
+ 00000000 T __XCloseLC           libX11         lcWrap
+ 00000000 T __XlcCopyFromArg     libX11         lcWrap
+ 00000000 T __XlcCopyToArg       libX11         lcWrap
+ 00000000 T __XlcCountVaList     libX11         lcWrap
+ 00000000 T __XlcVaToArgList     libX11         lcWrap
+ 00000000 T __XlcCompileResourceList libX11         lcWrap
+ 00000000 T __XlcGetValues       libX11         lcWrap
+ 00000000 T __XlcSetValues       libX11         lcWrap
+ 00000000 T _XInitThreads        libX11         locking
+ 00000000 T _XLockDisplay        libX11         LockDis
+ 00000000 T _XUnlockDisplay      libX11         LockDis
+ 00000000 T __X11TransFreeConnInfo libX11         x11trans
+ 00000000 T __X11TransOpenCOTSClient libX11         x11trans
+ 00000000 T __X11TransOpenCLTSClient libX11         x11trans
+ 00000000 T __X11TransSetOption  libX11         x11trans
+ 00000000 T __X11TransConnect    libX11         x11trans
+ 00000000 T __X11TransBytesReadable libX11         x11trans
+ 00000000 T __X11TransRead       libX11         x11trans
+ 00000000 T __X11TransWrite      libX11         x11trans
+ 00000000 T __X11TransReadv      libX11         x11trans
+ 00000000 T __X11TransWritev     libX11         x11trans
+ 00000000 T __X11TransDisconnect libX11         x11trans
+ 00000000 T __X11TransClose      libX11         x11trans
+ 00000000 T __X11TransCloseForCloning libX11         x11trans
+ 00000000 T __X11TransIsLocal    libX11         x11trans
+ 00000000 T __X11TransGetMyAddr  libX11         x11trans
+ 00000000 T __X11TransGetPeerAddr libX11         x11trans
+ 00000000 T __X11TransGetConnectionNumber libX11         x11trans
+ 00000000 T __X11TransGetHostname libX11         x11trans
+ 00000000 T __X11TransConvertAddress libX11         x11trans
+ 00000000 T __XimCbDispatch      libX11         imCallbk
+ 00000000 T __XimLookupMBText    libX11         imConv
+ 00000000 T __XimLookupWCText    libX11         imConv
+ 00000000 T __XimRegisterFilter  libX11         imDefFlt
+ 00000000 T __XimUnregisterFilter libX11         imDefFlt
+ 00000000 T __XimReregisterFilter libX11         imDefFlt
+ 00000000 T __XimRegisterServerFilter libX11         imDefFlt
+ 00000000 T __XimUnregisterServerFilter libX11         imDefFlt
+ 00000000 T __XimProtoCreateIC   libX11         imDefIc
+ 00000000 T __XimCheckDataSize   libX11         imDefIm
+ 00000000 T __XimSetHeader       libX11         imDefIm
+ 00000000 T __XimProtoIMFree     libX11         imDefIm
+ 00000000 T __XimProtoOpenIM     libX11         imDefIm
+ 00000000 T __XimICOfXICID       libX11         imDefLkup
+ 00000000 T __XimSetEventMaskCallback libX11         imDefLkup
+ 00000000 T __XimSync            libX11         imDefLkup
+ 00000000 T __XimProcSyncReply   libX11         imDefLkup
+ 00000000 T __XimRespSyncReply   libX11         imDefLkup
+ 00000000 T __XimSyncCallback    libX11         imDefLkup
+ 00000000 T __XimForwardEvent    libX11         imDefLkup
+ 00000000 T __XimForwardEventCallback libX11         imDefLkup
+ 00000000 T __XimRegisterTriggerKeysCallback libX11         imDefLkup
+ 00000000 T __XimGetWindowEventmask libX11         imDefLkup
+ 00000000 T __XimTriggerNotify   libX11         imDefLkup
+ 00000000 T __XimFreeCommitInfo  libX11         imDefLkup
+ 00000000 T __XimCommitCallback  libX11         imDefLkup
+ 00000000 T __XimProcError       libX11         imDefLkup
+ 00000000 T __XimErrorCallback   libX11         imDefLkup
+ 00000000 T __XimError           libX11         imDefLkup
+ 00000000 T __Ximctstombs        libX11         imDefLkup
+ 00000000 T __Ximctstowcs        libX11         imDefLkup
+ 00000000 T __XimProtoMbLookupString libX11         imDefLkup
+ 00000000 T __XimProtoWcLookupString libX11         imDefLkup
+ 00000000 T __XimRegProtoIntrCallback libX11         imDispch
+ 00000000 T __XimFreeProtoIntrCallback libX11         imDispch
+ 00000000 T __XimDispatchInit    libX11         imDispch
+ 00000000 T __XimProtoEventToWire libX11         imEvToWire
+ 00000000 T __XimProtoWireToEvent libX11         imEvToWire
+ 00000000 T __XimExtension       libX11         imExten
+ 00000000 T __XimRegisterIMInstantiateCallback libX11         imInsClbk
+ 00000000 T __XimUnRegisterIMInstantiateCallback libX11         imInsClbk
+ 00000000 T __XimResetIMInstantiateCallback libX11         imInsClbk
+ 00000000 T __XimDestroyIMStructureList libX11         imInt
+ 00000000 T __XimServerDestroy   libX11         imInt
+ 00000000 T __XimOpenIM          libX11         imInt
+ 00000000 T __XInitIM            libX11         imInt
+ 00000000 T __XimLocalFilter     libX11         imLcFlt
+ 00000000 T __XimLocalGetICValues libX11         imLcGIc
+ 00000000 T __XimLocalCreateIC   libX11         imLcIc
+ 00000000 T __XimCheckIfLocalProcessing libX11         imLcIm
+ 00000000 T __XimLocalIMFree     libX11         imLcIm
+ 00000000 T __XimLocalGetIMValues libX11         imLcIm
+ 00000000 T __XimLocalSetIMValues libX11         imLcIm
+ 00000000 T __XimLocalOpenIM     libX11         imLcIm
+ 00000000 T __XimLocalMbLookupString libX11         imLcLkup
+ 00000000 T __XimLocalWcLookupString libX11         imLcLkup
+ 00000000 T _XimParseStringFile  libX11         imLcPrs
+ 00000000 T __XimSetICValueData  libX11         imLcSIc
+ 00000000 T __XimLocalSetICValues libX11         imLcSIc
+ 00000000 T __XimSetIMResourceList libX11         imRm
+ 00000000 T __XimSetICResourceList libX11         imRm
+ 00000000 T __XimSetInnerIMResourceList libX11         imRm
+ 00000000 T __XimSetInnerICResourceList libX11         imRm
+ 00000000 T __XimCheckCreateICValues libX11         imRm
+ 00000000 T __XimGetResourceListRec libX11         imRm
+ 00000000 T __XimSetIMMode       libX11         imRm
+ 00000000 T __XimCheckIMMode     libX11         imRm
+ 00000000 T __XimSetICMode       libX11         imRm
+ 00000000 T __XimCheckICMode     libX11         imRm
+ 00000000 T __XimSetLocalIMDefaults libX11         imRm
+ 00000000 T __XimSetICDefaults   libX11         imRm
+ 00000000 T __XimDecodeLocalIMAttr libX11         imRm
+ 00000000 T __XimDecodeLocalICAttr libX11         imRm
+ 00000000 T __XimCheckLocalInputStyle libX11         imRm
+ 00000000 T __XimEncodeLocalIMAttr libX11         imRm
+ 00000000 T __XimEncodeLocalICAttr libX11         imRm
+ 00000000 T __XimGetCurrentIMValues libX11         imRm
+ 00000000 T __XimSetCurrentIMValues libX11         imRm
+ 00000000 T __XimGetCurrentICValues libX11         imRm
+ 00000000 T __XimSetCurrentICValues libX11         imRm
+ 00000000 T __XimInitialResourceInfo libX11         imRm
+ 00000000 T __XimDecodeIMATTRIBUTE libX11         imRmAttr
+ 00000000 T __XimDecodeICATTRIBUTE libX11         imRmAttr
+ 00000000 T __XimEncodeIMATTRIBUTE libX11         imRmAttr
+ 00000000 T __XimEncodeICATTRIBUTE libX11         imRmAttr
+ 00000000 T __XimGetAttributeID  libX11         imRmAttr
+ 00000000 T __XimThaiFilter      libX11         imThaiFlt
+ 00000000 T __XimThaiCreateIC    libX11         imThaiIc
+ 00000000 T __XimCheckIfThaiProcessing libX11         imThaiIm
+ 00000000 T __XimThaiOpenIM      libX11         imThaiIm
+ 00000000 T __XimThaiIMFree      libX11         imThaiIm
+ 00000000 T __XimThaiCloseIM     libX11         imThaiIm
+ 00000000 T __XimXConf           libX11         imTrX
+ 00000000 T __XimConnect         libX11         imTransR
+ 00000000 T __XimShutdown        libX11         imTransR
+ 00000000 T __XimFlush           libX11         imTransR
+ 00000000 T __XimFilterWaitEvent libX11         imTransR
+ 00000000 T __XimFreeTransIntrCallback libX11         imTrans
+ 00000000 T __XimTransFilterWaitEvent libX11         imTrans
+ 00000000 T __XimTransInternalConnection libX11         imTrans
+ 00000000 T __XimTransFlush      libX11         imTrans
+ 00000000 T __XimTransConf       libX11         imTrans
+ 00000000 T __XlcParseCharSet    libX11         lcCT
+ 00000000 T __XlcInitCTInfo      libX11         lcCT
+ 00000000 T __XlcGetCSValues     libX11         lcCharSet
+ 00000000 T __XlcGetCharSet      libX11         lcCharSet
+ 00000000 T __XlcAddCharSet      libX11         lcCharSet
+ 00000000 T __XlcCreateDefaultCharSet libX11         lcCharSet
+ 00000000 T __XlcSetConverter    libX11         lcConv
+ 00000000 T __XlcOpenConverter   libX11         lcConv
+ 00000000 T __XlcCloseConverter  libX11         lcConv
+ 00000000 T __XlcConvert         libX11         lcConv
+ 00000000 T __XlcResetConverter  libX11         lcConv
+ 00000000 T __XlcGetResource     libX11         lcDB
+ 00000000 T __XlcGetLocaleDataBase libX11         lcDB
+ 00000000 T __XlcDestroyLocaleDataBase libX11         lcDB
+ 00000000 T __XlcCreateLocaleDataBase libX11         lcDB
+ 00000000 T __XlcEucLoader       libX11         lcEuc
+ 00000000 T __XlcFileName        libX11         lcFile
+ 00000000 T __XlcResolveLocaleName libX11         lcFile
+ 00000000 T __XlcResolveDBName   libX11         lcFile
+ 00000000 T __XlcResolveI18NPath libX11         lcFile
+ 00000000 T __XlcGenericLoader   libX11         lcGenConv
+ 00000000 T __XlcInitLoader      libX11         lcInit
+ 00000000 T __XmbTextPropertyToTextList libX11         lcPrTxt
+ 00000000 T __XwcTextPropertyToTextList libX11         lcPrTxt
+ 00000000 T __XwcFreeStringList  libX11         lcPrTxt
+ 00000000 T __XGetLCValues       libX11         lcPubWrap
+ 00000000 T __XlcDestroyLC       libX11         lcPubWrap
+ 00000000 T __XlcCreateLC        libX11         lcPubWrap
+ 00000000 T __XrmDefaultInitParseInfo libX11         lcRM
+ 00000000 T __XlcSjisLoader      libX11         lcSjis
+ 00000000 T __Xlcmbtowc          libX11         lcStd
+ 00000000 T __Xlcwctomb          libX11         lcStd
+ 00000000 T __Xlcmbstowcs        libX11         lcStd
+ 00000000 T __Xlcwcstombs        libX11         lcStd
+ 00000000 T __Xmbtowc            libX11         lcStd
+ 00000000 T __Xwctomb            libX11         lcStd
+ 00000000 T __Xmbstowcs          libX11         lcStd
+ 00000000 T __Xwcstombs          libX11         lcStd
+ 00000000 T __Xwcscpy            libX11         lcStd
+ 00000000 T __Xwcsncpy           libX11         lcStd
+ 00000000 T __Xwcslen            libX11         lcStd
+ 00000000 T __Xwcscmp            libX11         lcStd
+ 00000000 T __Xwcsncmp           libX11         lcStd
+ 00000000 T __XmbTextListToTextProperty libX11         lcTxtPr
+ 00000000 T __XwcTextListToTextProperty libX11         lcTxtPr
+ 00000000 T __XlcUtfLoader       libX11         lcUTF
+ 00000000 T __XlcCompareISOLatin1 libX11         lcUtil
+ 00000000 T __XlcNCompareISOLatin1 libX11         lcUtil
+ 00000000 T __XmbDefalutTextEscapement libX11         omDefault
+ 00000000 T __XwcDefalutTextEscapement libX11         omDefault
+ 00000000 T __XmbDefalutTextExtents libX11         omDefault
+ 00000000 T __XwcDefalutTextExtents libX11         omDefault
+ 00000000 T __XmbDefalutTextPerCharExtents libX11         omDefault
+ 00000000 T __XwcDefalutTextPerCharExtents libX11         omDefault
+ 00000000 T __XmbDefalutDrawString libX11         omDefault
+ 00000000 T __XwcDefalutDrawString libX11         omDefault
+ 00000000 T __XmbDefalutDrawImageString libX11         omDefault
+ 00000000 T __XwcDefalutDrawImageString libX11         omDefault
+ 00000000 T __XomGenericOpenOM   libX11         omGeneric
+ 00000000 T __XInitOM            libX11         omGeneric
+ 00000000 T __XmbGenericDrawImageString libX11         omImText
+ 00000000 T __XwcGenericDrawImageString libX11         omImText
+ 00000000 T __XomGenericDrawString libX11         omText
+ 00000000 T __XmbGenericDrawString libX11         omText
+ 00000000 T __XwcGenericDrawString libX11         omText
+ 00000000 T __XmbGenericTextEscapement libX11         omTextEsc
+ 00000000 T __XwcGenericTextEscapement libX11         omTextEsc
+ 00000000 T __XomGenericTextExtents libX11         omTextExt
+ 00000000 T __XmbGenericTextExtents libX11         omTextExt
+ 00000000 T __XwcGenericTextExtents libX11         omTextExt
+ 00000000 T __XmbGenericTextPerCharExtents libX11         omTextPer
+ 00000000 T __XwcGenericTextPerCharExtents libX11         omTextPer
+ 00000000 T __XomConvert         libX11         omXChar
+ 00000000 T __XomInitConverter   libX11         omXChar
+ 00000000 T __Xmblen             libX11         lcStd
+ 00000000 T _SmcOpenConnection   libSM          sm_client
+ 00000000 T _SmcCloseConnection  libSM          sm_client
+ 00000000 T _SmcModifyCallbacks  libSM          sm_client
+ 00000000 T _SmcSetProperties    libSM          sm_client
+ 00000000 T _SmcDeleteProperties libSM          sm_client
+ 00000000 T _SmcGetProperties    libSM          sm_client
+ 00000000 T _SmcInteractRequest  libSM          sm_client
+ 00000000 T _SmcInteractDone     libSM          sm_client
+ 00000000 T _SmcSaveYourselfDone libSM          sm_client
+ 00000000 T _SmsGenerateClientID libSM          sm_genid
+ 00000000 T _SmsInitialize       libSM          sm_manager
+ 00000000 T _SmsClientHostName   libSM          sm_manager
+ 00000000 T _SmsRegisterClientReply libSM          sm_manager
+ 00000000 T _SmsSaveYourself     libSM          sm_manager
+ 00000000 T _SmsInteract         libSM          sm_manager
+ 00000000 T _SmsDie              libSM          sm_manager
+ 00000000 T _SmsShutdownCancelled libSM          sm_manager
+ 00000000 T _SmsReturnProperties libSM          sm_manager
+ 00000000 T _SmsCleanUp          libSM          sm_manager
+ 00000000 T __SmcProcessMessage  libSM          sm_process
+ 00000000 T __SmsProcessMessage  libSM          sm_process
+ 00000000 T __SmcDefaultErrorHandler libSM          sm_error
+ 00000000 T __SmsDefaultErrorHandler libSM          sm_error
+ 00000000 T _SmcSetErrorHandler  libSM          sm_error
+ 00000000 T _SmsSetErrorHandler  libSM          sm_error
+ 00000000 T _SmFreeProperty      libSM          sm_misc
+ 00000000 T _SmFreeReasons       libSM          sm_misc
+ 00000000 T _SmcProtocolVersion  libSM          sm_misc
+ 00000000 T _SmcProtocolRevision libSM          sm_misc
+ 00000000 T _SmcVendor           libSM          sm_misc
+ 00000000 T _SmcRelease          libSM          sm_misc
+ 00000000 T _SmcClientID         libSM          sm_misc
+ 00000000 T _SmcGetIceConnection libSM          sm_misc
+ 00000000 T _SmsProtocolVersion  libSM          sm_misc
+ 00000000 T _SmsProtocolRevision libSM          sm_misc
+ 00000000 T _SmsClientID         libSM          sm_misc
+ 00000000 T _SmsGetIceConnection libSM          sm_misc
+ 00000000 T _IceAcceptConnection libICE         accept
+ 00000000 T _IceAuthFileName     libICE         authutil
+ 00000000 T _IceLockAuthFile     libICE         authutil
+ 00000000 T _IceUnlockAuthFile   libICE         authutil
+ 00000000 T _IceReadAuthFileEntry libICE         authutil
+ 00000000 T _IceFreeAuthFileEntry libICE         authutil
+ 00000000 T _IceWriteAuthFileEntry libICE         authutil
+ 00000000 T _IceGetAuthFileEntry libICE         authutil
+ 00000000 T _IceOpenConnection   libICE         connect
+ 00000000 T __IceErrorBadMinor   libICE         error
+ 00000000 T __IceErrorBadState   libICE         error
+ 00000000 T __IceErrorBadLength  libICE         error
+ 00000000 T __IceErrorBadValue   libICE         error
+ 00000000 T __IceErrorNoAuthentication libICE         error
+ 00000000 T __IceErrorNoVersion  libICE         error
+ 00000000 T __IceErrorAuthenticationRejected libICE         error
+ 00000000 T __IceErrorAuthenticationFailed libICE         error
+ 00000000 T __IceErrorProtocolDuplicate libICE         error
+ 00000000 T __IceErrorMajorOpcodeDuplicate libICE         error
+ 00000000 T __IceErrorUnknownProtocol libICE         error
+ 00000000 T __IceErrorBadMajor   libICE         error
+ 00000000 T __IceDefaultErrorHandler libICE         error
+ 00000000 T _IceSetErrorHandler  libICE         error
+ 00000000 T __IceDefaultIOErrorHandler libICE         error
+ 00000000 T _IceSetIOErrorHandler libICE         error
+ 00000000 T __IceGetPoValidAuthIndices libICE         getauth
+ 00000000 T __IceGetPaValidAuthIndices libICE         getauth
+ 00000000 T __IcePoMagicCookie1Proc libICE         iceauth
+ 00000000 T __IcePaMagicCookie1Proc libICE         iceauth
+ 00000000 T _IceListenForConnections libICE         listen
+ 00000000 T _IceComposeNetworkIdList libICE         listen
+ 00000000 T _IceSetHostBasedAuthProc libICE         listen
+ 00000000 T _IceInitThreads      libICE         locking
+ 00000000 T _IceAllocScratch     libICE         misc
+ 00000000 T _IceConnectionStatus libICE         misc
+ 00000000 T _IceVendor           libICE         misc
+ 00000000 T _IceRelease          libICE         misc
+ 00000000 T _IceProtocolVersion  libICE         misc
+ 00000000 T _IceProtocolRevision libICE         misc
+ 00000000 T _IceConnectionNumber libICE         misc
+ 00000000 T _IceConnectionString libICE         misc
+ 00000000 T __IceRead            libICE         misc
+ 00000000 T __IceReadSkip        libICE         misc
+ 00000000 T __IceWrite           libICE         misc
+ 00000000 T __IceAddOpcodeMapping libICE         misc
+ 00000000 T __IceGetPeerName     libICE         misc
+ 00000000 T _IcePing             libICE         ping
+ 00000000 T __IceProcessCoreMessage libICE         process
+ 00000000 T _IceProtocolSetup    libICE         protosetup
+ 00000000 T _IceRegisterForProtocolSetup libICE         register
+ 00000000 T _IceRegisterForProtocolReply libICE         register
+ 00000000 T __IceAddReplyWait    libICE         replywait
+ 00000000 T __IceSearchReplyWaits libICE         replywait
+ 00000000 T __IceSetReplyReady   libICE         replywait
+ 00000000 T __IceCheckReplyReady libICE         replywait
+ 00000000 T _IceSetPaAuthData    libICE         setauth
+ 00000000 T _IceProtocolShutdown libICE         shutdown
+ 00000000 T _IceSetShutdownNegotiation libICE         shutdown
+ 00000000 T _IceCheckShutdownNegotiation libICE         shutdown
+ 00000000 T _IceCloseConnection  libICE         shutdown
+ 00000000 T __IceFreeConnection  libICE         shutdown
+ 00000000 T _IceAddConnectionWatch libICE         watch
+ 00000000 T _IceRemoveConnectionWatch libICE         watch
+ 00000000 T __IceConnectionOpened libICE         watch
+ 00000000 T __IceConnectionClosed libICE         watch
+ 00000000 T __XimGetResourceName libX11       imRm
+ 00000000 T __XimGetResourceListRecByQuark libX11       imRm
+ 00000000 T __XimSetIMValueData  libX11       imRm
+ 00000000 T __XimGetIMValueData  libX11       imRm
+ 00000000 T __XimGetICValueData  libX11       imRm
+ 00000000 T __XimMakeIMAttrIDList libX11       imRmAttr
+ 00000000 T __XimMakeICAttrIDList libX11       imRmAttr
+ 00000000 T __XimWrite           libX11       imTransR
+ 00000000 T __XimRead            libX11       imTransR
+ 00000000 T __XimRegisterDispatcher libX11       imTransR
+ 00000000 T __XimTransRegisterDispatcher libX11       imTrans
+ 00000000 T __XimTransCallDispatcher libX11       imTrans
+ 00000000 T __XimTransWrite      libX11       imTrans
+ 00000000 T __XimTransRead       libX11       imTrans
+ 00000000 T __XimXTransFreeConnInfo libX11         ximtrans
+ 00000000 T __XimXTransOpenCOTSClient libX11         ximtrans
+ 00000000 T __XimXTransOpenCLTSClient libX11         ximtrans
+ 00000000 T __XimXTransSetOption libX11         ximtrans
+ 00000000 T __XimXTransConnect   libX11         ximtrans
+ 00000000 T __XimXTransBytesReadable libX11         ximtrans
+ 00000000 T __XimXTransRead      libX11         ximtrans
+ 00000000 T __XimXTransWrite     libX11         ximtrans
+ 00000000 T __XimXTransReadv     libX11         ximtrans
+ 00000000 T __XimXTransWritev    libX11         ximtrans
+ 00000000 T __XimXTransDisconnect libX11         ximtrans
+ 00000000 T __XimXTransClose     libX11         ximtrans
+ 00000000 T __XimXTransCloseForCloning libX11         ximtrans
+ 00000000 T __XimXTransIsLocal   libX11         ximtrans
+ 00000000 T __XimXTransGetMyAddr libX11         ximtrans
+ 00000000 T __XimXTransGetPeerAddr libX11         ximtrans
+ 00000000 T __XimXTransGetConnectionNumber libX11         ximtrans
+ 00000000 T __XimXTransGetHostname libX11         ximtrans
+ 00000000 T _SmcRequestSaveYourself libSM          sm_client
+ 00000000 T _SmcRequestSaveYourselfPhase2 libSM          sm_client
+ 00000000 T __SmsProtocolSetupProc libSM          sm_manager
+ 00000000 T _SmsSaveYourselfPhase2 libSM          sm_manager
+ 00000000 T _SmsSaveComplete     libSM          sm_manager
+ 00000000 T _IceGetConnectionContext libICE         connect
+ 00000000 T __IceErrorSetupFailed libICE         error
+ 00000000 T __IceGetPoAuthData   libICE         getauth
+ 00000000 T __IceGetPaAuthData   libICE         getauth
+ 00000000 T _IceGenerateMagicCookie libICE         iceauth
+ 00000000 T _IceGetListenConnectionNumber libICE         listen
+ 00000000 T _IceGetListenConnectionString libICE         listen
+ 00000000 T _IceFreeListenObjs   libICE         listen
+ 00000000 T _IceAppLockConn      libICE         locking
+ 00000000 T _IceAppUnlockConn    libICE         locking
+ 00000000 T _IceFlush            libICE         misc
+ 00000000 T _IceGetOutBufSize    libICE         misc
+ 00000000 T _IceGetInBufSize     libICE         misc
+ 00000000 T _IceLastSentSequenceNumber libICE         misc
+ 00000000 T _IceLastReceivedSequenceNumber libICE         misc
+ 00000000 T _IceSwapping         libICE         misc
+ 00000000 T _IceProcessMessages  libICE         process
+ 00000000 T __IceTransFreeConnInfo libICE         transport
+ 00000000 T __IceTransOpenCOTSClient libICE         transport
+ 00000000 T __IceTransOpenCOTSServer libICE         transport
+ 00000000 T __IceTransOpenCLTSClient libICE         transport
+ 00000000 T __IceTransOpenCLTSServer libICE         transport
+ 00000000 T __IceTransSetOption  libICE         transport
+ 00000000 T __IceTransCreateListener libICE         transport
+ 00000000 T __IceTransResetListener libICE         transport
+ 00000000 T __IceTransAccept     libICE         transport
+ 00000000 T __IceTransConnect    libICE         transport
+ 00000000 T __IceTransBytesReadable libICE         transport
+ 00000000 T __IceTransRead       libICE         transport
+ 00000000 T __IceTransWrite      libICE         transport
+ 00000000 T __IceTransReadv      libICE         transport
+ 00000000 T __IceTransWritev     libICE         transport
+ 00000000 T __IceTransDisconnect libICE         transport
+ 00000000 T __IceTransClose      libICE         transport
+ 00000000 T __IceTransCloseForCloning libICE         transport
+ 00000000 T __IceTransIsLocal    libICE         transport
+ 00000000 T __IceTransGetMyAddr  libICE         transport
+ 00000000 T __IceTransGetPeerAddr libICE         transport
+ 00000000 T __IceTransGetConnectionNumber libICE         transport
+ 00000000 T __IceTransMakeAllCOTSServerListeners libICE         transport
+ 00000000 T __IceTransMakeAllCLTSServerListeners libICE         transport
+ 00000000 T __IceTransGetHostname libICE         transport
+ 00000000 T __IceTransGetMyNetworkId libICE         transport
+ 00000000 T __IceTransGetPeerNetworkId libICE         transport
+ 00000000 T __XimLcctstombs      libX11         imLcLkup
+ 00000000 T __XimLcctstowcs      libX11         imLcLkup
+ #ifdef HASXDMAUTH
+ 00000000 T _XdmcpWrap           libX11         Wrap
+ 00000000 T __XdmcpWrapperToOddParity libX11         Wrap
+ 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
*** /dev/null	Sun Jan 29 07:18:10 1995
--- xc/lib/X11/jump_ignore	Sun Jan 29 07:18:10 1995
***************
*** 0 ****
--- 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
*** /dev/null	Sun Jan 29 07:18:11 1995
--- xc/lib/X11/jump_vars	Sun Jan 29 07:18:11 1995
***************
*** 0 ****
--- 1,80 ----
+ # $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
+ 00000004 D __qfree              libX11         globals
+ 00000004 C __XIOErrorFunction   libX11         globals
+ 00000004 C __XErrorFunction     libX11         globals
+ 00000004 C __Xdebug             libX11         globals
+ 00000004 C __XHeadOfDisplayList libX11         globals
+ 00000040 D _XcmsCIELabColorSpace libX11         CIELab
+ 00000040 D _XcmsCIELuvColorSpace libX11         CIELuv
+ 00000040 D _XcmsCIEXYZColorSpace libX11         CIEXYZ
+ 00000040 D _XcmsCIEuvYColorSpace libX11         CIEuvY
+ 00000040 D _XcmsCIExyYColorSpace libX11         CIExyY
+ 00000040 D _XcmsTekHVCColorSpace libX11         TekHVC
+ 00000040 D _XcmsUNDEFINEDColorSpace libX11         UNDEFINED
+ 00000040 D __XcmsDIColorSpacesInit libX11         XcmsGlobls
+ 00000004 D __XcmsDIColorSpaces  libX11         XcmsGlobls
+ 00000020 D __XcmsDDColorSpacesInit libX11         XcmsGlobls
+ 00000004 D __XcmsDDColorSpaces  libX11         XcmsGlobls
+ 00000010 D __XcmsSCCFuncSetsInit libX11         XcmsGlobls
+ 00000004 D __XcmsSCCFuncSets    libX11         XcmsGlobls
+ 00000010 D __XcmsCIEXYZ_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsCIEuvY_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsCIExyY_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsCIELab_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsCIELuv_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsTekHVC_prefix   libX11         XcmsGlobls
+ 00000010 D __XcmsRGBi_prefix     libX11         XcmsGlobls
+ 00000010 D __XcmsRGB_prefix      libX11         XcmsGlobls
+ 00000080 D __XcmsRegColorSpaces libX11         XcmsGlobls
+ 00000040 D _XcmsRGBiColorSpace  libX11         XcmsLRGB
+ 00000040 D _XcmsRGBColorSpace   libX11         XcmsLRGB
+ 00000020 D _XcmsLinearRGBFunctionSet libX11         XcmsLRGB
+ 000000a8 D __X11TransSocketINETFuncs libX11         x11trans
+ 000000a8 D __X11TransSocketTCPFuncs libX11         x11trans
+ 000000a8 D __X11TransSocketUNIXFuncs libX11         x11trans
+ 000000a8 D __X11TransSocketLocalFuncs libX11         x11trans
+ 000000a8 D __XimXTransSocketINETFuncs libX11         ximtrans
+ 000000a8 D __XimXTransSocketTCPFuncs libX11         ximtrans
+ 000000a8 D __XimXTransSocketUNIXFuncs libX11         ximtrans
+ 000000a8 D __XimXTransSocketLocalFuncs libX11         ximtrans
+ 00000040 D __XimImSportRec      libX11         imImSw
+ 00000040 D __XimTransportRec    libX11         imTransR
+ 00000004 D __XlcGenericMethods  libX11         lcGeneric
+ 00000004 D __XlcPublicMethods   libX11         lcPublic
+ 00000004 D __SmcOpcode          libSM          sm_client
+ 00000004 D __SmsOpcode          libSM          sm_client
+ 00000004 D __SmVersionCount     libSM          sm_client
+ 00000018 D __SmcVersions        libSM          sm_client
+ 00000018 D __SmsVersions        libSM          sm_client
+ 00000004 D __SmAuthCount        libSM          sm_client
+ 00000004 D __SmAuthNames        libSM          sm_client
+ 00000004 D __SmcAuthProcs       libSM          sm_client
+ 00000004 D __SmsAuthProcs       libSM          sm_client
+ 00000004 D __SmcErrorHandler    libSM          sm_client
+ 00000004 D __SmsErrorHandler    libSM          sm_client
+ 00000004 C __SmsNewClientProc   libSM          sm_client
+ 00000004 C __SmsNewClientData   libSM          sm_client
+ 00000004 D __IceConnectionCount libICE         connect
+ 00000004 D __IceLastMajorOpcode libICE         connect
+ 00000004 D __IceAuthCount       libICE         connect
+ 00000004 D __IceAuthNames       libICE         connect
+ 00000004 D __IcePoAuthProcs     libICE         connect
+ 00000004 D __IcePaAuthProcs     libICE         connect
+ 00000004 D __IcePaAuthDataEntryCount libICE         connect
+ 00000004 D __IceVersionCount    libICE         connect
+ 00000018 D __IceVersions        libICE         connect
+ 00000004 D __IceWatchProcs      libICE         connect
+ 00000004 D __IceErrorHandler    libICE         connect
+ 00000004 D __IceIOErrorHandler  libICE         connect
+ 00000600 C __IceConnectionObjs  libICE         connect
+ 00000600 C __IceConnectionStrings libICE         connect
+ 00001000 C __IceProtocols       libICE         connect
+ 00001000 C __IcePaAuthDataEntries libICE         connect
+ 00000070 D __IceTransSocketINETFuncs libICE         transport
+ 00000070 D __IceTransSocketTCPFuncs libICE         transport
+ 00000070 D __IceTransSocketUNIXFuncs libICE         transport
+ 00000070 D __IceTransSocketLocalFuncs libICE         transport
*** -	Sun Jan 29 07:18:12 1995
--- xc/lib/Xbsd/Imakefile	Sun Jan 29 07:18:12 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.5 93/09/19 14:50:36 rws Exp $
  SRCS = Berklib.c
  OBJS = Berklib.o
  
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.6 94/11/21 18:24:13 kaleb Exp $
  SRCS = Berklib.c
  OBJS = Berklib.o
  
***************
*** 6,10 ****
--- 6,12 ----
  #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
  NormalLibraryTarget(Xbsd,$(OBJS))
  InstallLibrary(Xbsd,$(USRLIBDIR))
+ 
+ InstallLinkKitLibrary(Xbsd,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:13 1995
--- xc/lib/Xbsd/Berklib.c	Sun Jan 29 07:18:13 1995
***************
*** 1,4 ****
! /* $XConsortium: Berklib.c,v 1.24 94/04/17 20:23:08 dpw Exp $ */
  /*
  
  Copyright (c) 1987 X Consortium
--- 1,4 ----
! /* $XConsortium: Berklib.c,v 1.25 94/11/30 16:21:19 kaleb Exp $ */
  /*
  
  Copyright (c) 1987 X Consortium
***************
*** 63,70 ****
  #define WANT_FFS
  #endif
  
- #ifdef SYSV386
  #ifdef SYSV
  #define WANT_FFS
  #define WANT_MEMMOVE
  #endif
--- 63,70 ----
  #define WANT_FFS
  #endif
  
  #ifdef SYSV
+ #ifdef i386
  #define WANT_FFS
  #define WANT_MEMMOVE
  #endif
*** /dev/null	Sun Jan 29 07:18:14 1995
--- xc/lib/PEX5/jump_funcs	Sun Jan 29 07:18:14 1995
***************
*** 0 ****
--- 1,417 ----
+ # $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
+ 00000000 T _PEXSetEchoColor     libPEX5        pl_escape
+ 00000000 T _PEXLoadFont         libPEX5        pl_font
+ 00000000 T _PEXUnloadFont       libPEX5        pl_font
+ 00000000 T _PEXQueryFont        libPEX5        pl_font
+ 00000000 T _PEXListFonts        libPEX5        pl_font
+ 00000000 T _PEXListFontsWithInfo libPEX5        pl_font
+ 00000000 T _PEXQueryTextExtents libPEX5        pl_font
+ 00000000 T _PEXQueryEncodedTextExtents libPEX5        pl_font
+ 00000000 T _PEXFreeEnumInfo     libPEX5        pl_free
+ 00000000 T _PEXFreeFontInfo     libPEX5        pl_free
+ 00000000 T _PEXFreeFontNames    libPEX5        pl_free
+ 00000000 T _PEXFreePCAttributes libPEX5        pl_free
+ 00000000 T _PEXFreePDAttributes libPEX5        pl_free
+ 00000000 T _PEXFreePMAttributes libPEX5        pl_free
+ 00000000 T _PEXFreePickPaths    libPEX5        pl_free
+ 00000000 T _PEXFreeRendererAttributes libPEX5        pl_free
+ 00000000 T _PEXFreeSCAttributes libPEX5        pl_free
+ 00000000 T _PEXFreeStructurePaths libPEX5        pl_free
+ 00000000 T _PEXFreeTableEntries libPEX5        pl_free
+ 00000000 T _PEXFreeWorkstationAttributes libPEX5        pl_free
+ 00000000 T _PEXFreeOCData       libPEX5        pl_free
+ 00000000 T _PEXCreateLookupTable libPEX5        pl_lut
+ 00000000 T _PEXFreeLookupTable  libPEX5        pl_lut
+ 00000000 T _PEXCopyLookupTable  libPEX5        pl_lut
+ 00000000 T _PEXGetTableInfo     libPEX5        pl_lut
+ 00000000 T _PEXGetPredefinedEntries libPEX5        pl_lut
+ 00000000 T _PEXGetDefinedIndices libPEX5        pl_lut
+ 00000000 T _PEXGetTableEntry    libPEX5        pl_lut
+ 00000000 T _PEXGetTableEntries  libPEX5        pl_lut
+ 00000000 T _PEXSetTableEntries  libPEX5        pl_lut
+ 00000000 T _PEXDeleteTableEntries libPEX5        pl_lut
+ 00000000 T _PEXCreateNameSet    libPEX5        pl_nameset
+ 00000000 T _PEXFreeNameSet      libPEX5        pl_nameset
+ 00000000 T _PEXCopyNameSet      libPEX5        pl_nameset
+ 00000000 T _PEXGetNameSet       libPEX5        pl_nameset
+ 00000000 T _PEXChangeNameSet    libPEX5        pl_nameset
+ 00000000 T _PEXSetMarkerType    libPEX5        pl_oc_attr
+ 00000000 T _PEXSetMarkerScale   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetMarkerColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetMarkerColor   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetMarkerBundleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextFontIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextPrecision libPEX5        pl_oc_attr
+ 00000000 T _PEXSetCharExpansion libPEX5        pl_oc_attr
+ 00000000 T _PEXSetCharSpacing   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextColor     libPEX5        pl_oc_attr
+ 00000000 T _PEXSetCharHeight    libPEX5        pl_oc_attr
+ 00000000 T _PEXSetCharUpVector  libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextPath      libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextAlignment libPEX5        pl_oc_attr
+ 00000000 T _PEXSetATextHeight   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetATextUpVector libPEX5        pl_oc_attr
+ 00000000 T _PEXSetATextPath     libPEX5        pl_oc_attr
+ 00000000 T _PEXSetATextAlignment libPEX5        pl_oc_attr
+ 00000000 T _PEXSetATextStyle    libPEX5        pl_oc_attr
+ 00000000 T _PEXSetTextBundleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLineType      libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLineWidth     libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLineColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLineColor     libPEX5        pl_oc_attr
+ 00000000 T _PEXSetCurveApprox   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetPolylineInterpMethod libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLineBundleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetInteriorStyle libPEX5        pl_oc_attr
+ 00000000 T _PEXSetInteriorStyleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceColor  libPEX5        pl_oc_attr
+ 00000000 T _PEXSetReflectionAttributes libPEX5        pl_oc_attr
+ 00000000 T _PEXSetReflectionModel libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceInterpMethod libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFInteriorStyle libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFInteriorStyleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFSurfaceColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFSurfaceColor libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFReflectionAttributes libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFReflectionModel libPEX5        pl_oc_attr
+ 00000000 T _PEXSetBFSurfaceInterpMethod libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceApprox libPEX5        pl_oc_attr
+ 00000000 T _PEXSetFacetCullingMode libPEX5        pl_oc_attr
+ 00000000 T _PEXSetFacetDistinguishFlag libPEX5        pl_oc_attr
+ 00000000 T _PEXSetPatternSize   libPEX5        pl_oc_attr
+ 00000000 T _PEXSetPatternAttributes2D libPEX5        pl_oc_attr
+ 00000000 T _PEXSetPatternAttributes libPEX5        pl_oc_attr
+ 00000000 T _PEXSetInteriorBundleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceEdgeFlag libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceEdgeType libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceEdgeWidth libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceEdgeColorIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetSurfaceEdgeColor libPEX5        pl_oc_attr
+ 00000000 T _PEXSetEdgeBundleIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetIndividualASF libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLocalTransform libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLocalTransform2D libPEX5        pl_oc_attr
+ 00000000 T _PEXSetGlobalTransform libPEX5        pl_oc_attr
+ 00000000 T _PEXSetGlobalTransform2D libPEX5        pl_oc_attr
+ 00000000 T _PEXSetModelClipFlag libPEX5        pl_oc_attr
+ 00000000 T _PEXSetModelClipVolume libPEX5        pl_oc_attr
+ 00000000 T _PEXSetModelClipVolume2D libPEX5        pl_oc_attr
+ 00000000 T _PEXRestoreModelClipVolume libPEX5        pl_oc_attr
+ 00000000 T _PEXSetViewIndex     libPEX5        pl_oc_attr
+ 00000000 T _PEXSetLightSourceState libPEX5        pl_oc_attr
+ 00000000 T _PEXSetDepthCueIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetPickID        libPEX5        pl_oc_attr
+ 00000000 T _PEXSetHLHSRID       libPEX5        pl_oc_attr
+ 00000000 T _PEXSetColorApproxIndex libPEX5        pl_oc_attr
+ 00000000 T _PEXSetParaSurfCharacteristics libPEX5        pl_oc_attr
+ 00000000 T _PEXSetRenderingColorModel libPEX5        pl_oc_attr
+ 00000000 T _PEXAddToNameSet     libPEX5        pl_oc_attr
+ 00000000 T _PEXRemoveFromNameSet libPEX5        pl_oc_attr
+ 00000000 T _PEXDecodeOCs        libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeEnumType  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeTableIndex libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeColor     libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFloat     libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeCARD16    libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeVector2D  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeTextAlignment libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeCurveApprox libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeReflectionAttr libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeSurfaceApprox libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeCullMode  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeSwitch    libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePatternSize libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePatternAttr2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePatternAttr libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeASF       libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeLocalTransform libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeLocalTransform2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeGlobalTransform libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeGlobalTransform2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeModelClipVolume libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeModelClipVolume2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeRestoreModelClip libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeLightSourceState libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeID        libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePSC       libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeNameSet   libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeExecuteStructure libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeLabel     libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeApplicationData libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeGSE       libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeMarkers   libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeMarkers2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePolyline  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePolyline2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeText      libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeText2D    libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeAnnoText  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeAnnoText2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodePolylineSet libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeNURBCurve libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillArea  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillArea2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillAreaWithData libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillAreaSet libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillAreaSet2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeFillAreaSetWithData libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeTriangleStrip libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeQuadMesh  libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeSOFA      libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeNURBSurface libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeCellArray libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeCellArray2D libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeExtendedCellArray libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeGDP       libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeGDP2D     libPEX5        pl_oc_dec
+ 00000000 T __PEXDecodeNoop      libPEX5        pl_oc_dec
+ 00000000 T _PEXEncodeOCs        libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeEnumType  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeTableIndex libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeColor     libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFloat     libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeCARD16    libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeVector2D  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeTextAlignment libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeCurveApprox libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeReflectionAttr libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeSurfaceApprox libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeCullMode  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeSwitch    libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePatternSize libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePatternAttr2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePatternAttr libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeASF       libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeLocalTransform libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeLocalTransform2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeGlobalTransform libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeGlobalTransform2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeModelClipVolume libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeModelClipVolume2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeRestoreModelClip libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeLightSourceState libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeID        libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePSC       libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeNameSet   libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeExecuteStructure libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeLabel     libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeApplicationData libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeGSE       libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeMarkers   libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePolyline  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeMarkers2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePolyline2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeText      libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeText2D    libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeAnnoText  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeAnnoText2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodePolylineSet libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeNURBCurve libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillArea  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillArea2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillAreaWithData libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillAreaSet libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillAreaSet2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeFillAreaSetWithData libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeTriangleStrip libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeQuadMesh  libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeSOFA      libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeNURBSurface libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeCellArray libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeCellArray2D libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeExtendedCellArray libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeGDP       libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeGDP2D     libPEX5        pl_oc_enc
+ 00000000 T __PEXEncodeNoop      libPEX5        pl_oc_enc
+ 00000000 T _PEXMarkers          libPEX5        pl_oc_prim
+ 00000000 T _PEXMarkers2D        libPEX5        pl_oc_prim
+ 00000000 T _PEXText             libPEX5        pl_oc_prim
+ 00000000 T _PEXText2D           libPEX5        pl_oc_prim
+ 00000000 T _PEXAnnotationText   libPEX5        pl_oc_prim
+ 00000000 T _PEXAnnotationText2D libPEX5        pl_oc_prim
+ 00000000 T _PEXEncodedText      libPEX5        pl_oc_prim
+ 00000000 T _PEXEncodedText2D    libPEX5        pl_oc_prim
+ 00000000 T _PEXEncodedAnnoText  libPEX5        pl_oc_prim
+ 00000000 T _PEXEncodedAnnoText2D libPEX5        pl_oc_prim
+ 00000000 T _PEXPolyline         libPEX5        pl_oc_prim
+ 00000000 T _PEXPolyline2D       libPEX5        pl_oc_prim
+ 00000000 T _PEXPolylineSetWithData libPEX5        pl_oc_prim
+ 00000000 T _PEXNURBCurve        libPEX5        pl_oc_prim
+ 00000000 T _PEXFillArea         libPEX5        pl_oc_prim
+ 00000000 T _PEXFillArea2D       libPEX5        pl_oc_prim
+ 00000000 T _PEXFillAreaWithData libPEX5        pl_oc_prim
+ 00000000 T _PEXFillAreaSet      libPEX5        pl_oc_prim
+ 00000000 T _PEXFillAreaSet2D    libPEX5        pl_oc_prim
+ 00000000 T _PEXFillAreaSetWithData libPEX5        pl_oc_prim
+ 00000000 T _PEXSetOfFillAreaSets libPEX5        pl_oc_prim
+ 00000000 T _PEXTriangleStrip    libPEX5        pl_oc_prim
+ 00000000 T _PEXQuadrilateralMesh libPEX5        pl_oc_prim
+ 00000000 T _PEXNURBSurface      libPEX5        pl_oc_prim
+ 00000000 T _PEXCellArray        libPEX5        pl_oc_prim
+ 00000000 T _PEXCellArray2D      libPEX5        pl_oc_prim
+ 00000000 T _PEXExtendedCellArray libPEX5        pl_oc_prim
+ 00000000 T _PEXGDP              libPEX5        pl_oc_prim
+ 00000000 T _PEXGDP2D            libPEX5        pl_oc_prim
+ 00000000 T _PEXExecuteStructure libPEX5        pl_oc_struct
+ 00000000 T _PEXLabel            libPEX5        pl_oc_struct
+ 00000000 T _PEXNoop             libPEX5        pl_oc_struct
+ 00000000 T _PEXApplicationData  libPEX5        pl_oc_struct
+ 00000000 T _PEXGSE              libPEX5        pl_oc_struct
+ 00000000 T _PEXStartOCs         libPEX5        pl_oc_util
+ 00000000 T _PEXFinishOCs        libPEX5        pl_oc_util
+ 00000000 T __PEXSendBytesToOC   libPEX5        pl_oc_util
+ 00000000 T _PEXCopyBytesToOC    libPEX5        pl_oc_util
+ 00000000 T __PEXCopyPaddedBytesToOC libPEX5        pl_oc_util
+ 00000000 T _PEXGetOCAddr        libPEX5        pl_oc_util
+ 00000000 T _PEXSendOCs          libPEX5        pl_oc_util
+ 00000000 T __PEXGenOCBadLengthError libPEX5        pl_oc_util
+ 00000000 T _PEXGetSizeOCs       libPEX5        pl_oc_util
+ 00000000 T _PEXCountOCs         libPEX5        pl_oc_util
+ 00000000 T _PEXCreatePipelineContext libPEX5        pl_pc
+ 00000000 T _PEXFreePipelineContext libPEX5        pl_pc
+ 00000000 T _PEXCopyPipelineContext libPEX5        pl_pc
+ 00000000 T _PEXGetPipelineContext libPEX5        pl_pc
+ 00000000 T _PEXChangePipelineContext libPEX5        pl_pc
+ 00000000 T _PEXCreatePickMeasure libPEX5        pl_pick
+ 00000000 T _PEXFreePickMeasure  libPEX5        pl_pick
+ 00000000 T _PEXGetPickMeasure   libPEX5        pl_pick
+ 00000000 T _PEXUpdatePickMeasure libPEX5        pl_pick
+ 00000000 T _PEXGetPickDevice    libPEX5        pl_pick
+ 00000000 T _PEXChangePickDevice libPEX5        pl_pick
+ 00000000 T __PEXConvertMaxHitsEvent libPEX5        pl_pick
+ 00000000 T _PEXBeginPickOne     libPEX5        pl_pick
+ 00000000 T _PEXEndPickOne       libPEX5        pl_pick
+ 00000000 T _PEXPickOne          libPEX5        pl_pick
+ 00000000 T _PEXBeginPickAll     libPEX5        pl_pick
+ 00000000 T _PEXEndPickAll       libPEX5        pl_pick
+ 00000000 T _PEXPickAll          libPEX5        pl_pick
+ 00000000 T _PEXCreateRenderer   libPEX5        pl_rdr
+ 00000000 T _PEXFreeRenderer     libPEX5        pl_rdr
+ 00000000 T _PEXGetRendererAttributes libPEX5        pl_rdr
+ 00000000 T _PEXGetRendererDynamics libPEX5        pl_rdr
+ 00000000 T _PEXChangeRenderer   libPEX5        pl_rdr
+ 00000000 T _PEXBeginRendering   libPEX5        pl_rdr
+ 00000000 T _PEXEndRendering     libPEX5        pl_rdr
+ 00000000 T _PEXBeginStructure   libPEX5        pl_rdr
+ 00000000 T _PEXEndStructure     libPEX5        pl_rdr
+ 00000000 T _PEXRenderNetwork    libPEX5        pl_rdr
+ 00000000 T _PEXRenderElements   libPEX5        pl_rdr
+ 00000000 T _PEXAccumulateState  libPEX5        pl_rdr
+ 00000000 T _PEXCreateSearchContext libPEX5        pl_sc
+ 00000000 T _PEXFreeSearchContext libPEX5        pl_sc
+ 00000000 T _PEXCopySearchContext libPEX5        pl_sc
+ 00000000 T _PEXGetSearchContext libPEX5        pl_sc
+ 00000000 T _PEXChangeSearchContext libPEX5        pl_sc
+ 00000000 T _PEXSearchNetwork    libPEX5        pl_sc
+ 00000000 T _PEXInitialize       libPEX5        pl_startup
+ 00000000 T _PEXGetExtensionInfo libPEX5        pl_startup
+ 00000000 T _PEXGetProtocolFloatFormat libPEX5        pl_startup
+ 00000000 T _PEXGetEnumTypeInfo  libPEX5        pl_startup
+ 00000000 T _PEXGetImpDepConstants libPEX5        pl_startup
+ 00000000 T _PEXMatchRenderingTargets libPEX5        pl_startup
+ 00000000 T __PEXConvertOCError  libPEX5        pl_startup
+ 00000000 T __PEXPrintOCError    libPEX5        pl_startup
+ 00000000 T __PEXCloseDisplay    libPEX5        pl_startup
+ 00000000 T _PEXCreateStructure  libPEX5        pl_struct
+ 00000000 T _PEXDestroyStructures libPEX5        pl_struct
+ 00000000 T _PEXCopyStructure    libPEX5        pl_struct
+ 00000000 T _PEXGetStructureInfo libPEX5        pl_struct
+ 00000000 T _PEXGetElementInfo   libPEX5        pl_struct
+ 00000000 T _PEXGetStructuresInNetwork libPEX5        pl_struct
+ 00000000 T _PEXGetAncestors     libPEX5        pl_struct
+ 00000000 T _PEXGetDescendants   libPEX5        pl_struct
+ 00000000 T _PEXFetchElements    libPEX5        pl_struct
+ 00000000 T _PEXFetchElementsAndSend libPEX5        pl_struct
+ 00000000 T _PEXSetEditingMode   libPEX5        pl_struct
+ 00000000 T _PEXSetElementPtr    libPEX5        pl_struct
+ 00000000 T _PEXSetElementPtrAtLabel libPEX5        pl_struct
+ 00000000 T _PEXElementSearch    libPEX5        pl_struct
+ 00000000 T _PEXDeleteElements   libPEX5        pl_struct
+ 00000000 T _PEXDeleteToLabel    libPEX5        pl_struct
+ 00000000 T _PEXDeleteBetweenLabels libPEX5        pl_struct
+ 00000000 T _PEXCopyElements     libPEX5        pl_struct
+ 00000000 T _PEXChangeStructureRefs libPEX5        pl_struct
+ 00000000 T _PEXRotate           libPEX5        pl_util
+ 00000000 T _PEXRotate2D         libPEX5        pl_util
+ 00000000 T _PEXRotateGeneral    libPEX5        pl_util
+ 00000000 T _PEXScale            libPEX5        pl_util
+ 00000000 T _PEXScale2D          libPEX5        pl_util
+ 00000000 T _PEXTranslate        libPEX5        pl_util
+ 00000000 T _PEXTranslate2D      libPEX5        pl_util
+ 00000000 T _PEXMatrixMult       libPEX5        pl_util
+ 00000000 T _PEXMatrixMult2D     libPEX5        pl_util
+ 00000000 T _PEXBuildTransform   libPEX5        pl_util
+ 00000000 T _PEXBuildTransform2D libPEX5        pl_util
+ 00000000 T _PEXViewOrientationMatrix libPEX5        pl_util
+ 00000000 T _PEXViewOrientationMatrix2D libPEX5        pl_util
+ 00000000 T _PEXViewMappingMatrix libPEX5        pl_util
+ 00000000 T _PEXViewMappingMatrix2D libPEX5        pl_util
+ 00000000 T _PEXLookAtViewMatrix libPEX5        pl_util
+ 00000000 T _PEXPolarViewMatrix  libPEX5        pl_util
+ 00000000 T _PEXOrthoProjMatrix  libPEX5        pl_util
+ 00000000 T _PEXPerspProjMatrix  libPEX5        pl_util
+ 00000000 T _PEXTransformPoints  libPEX5        pl_util
+ 00000000 T _PEXTransformPoints2D libPEX5        pl_util
+ 00000000 T _PEXTransformPoints4D libPEX5        pl_util
+ 00000000 T _PEXTransformPoints2DH libPEX5        pl_util
+ 00000000 T _PEXTransformVectors libPEX5        pl_util
+ 00000000 T _PEXTransformVectors2D libPEX5        pl_util
+ 00000000 T _PEXNormalizeVectors libPEX5        pl_util
+ 00000000 T _PEXNormalizeVectors2D libPEX5        pl_util
+ 00000000 T _PEXNPCToXCTransform libPEX5        pl_util
+ 00000000 T _PEXNPCToXCTransform2D libPEX5        pl_util
+ 00000000 T _PEXXCToNPCTransform libPEX5        pl_util
+ 00000000 T _PEXXCToNPCTransform2D libPEX5        pl_util
+ 00000000 T _PEXMapXCToNPC       libPEX5        pl_util
+ 00000000 T _PEXMapXCToNPC2D     libPEX5        pl_util
+ 00000000 T _PEXInvertMatrix     libPEX5        pl_util
+ 00000000 T _PEXInvertMatrix2D   libPEX5        pl_util
+ 00000000 T _PEXIdentityMatrix   libPEX5        pl_util
+ 00000000 T _PEXIdentityMatrix2D libPEX5        pl_util
+ 00000000 T _PEXGeoNormFillArea  libPEX5        pl_util
+ 00000000 T _PEXGeoNormFillAreaSet libPEX5        pl_util
+ 00000000 T _PEXGeoNormTriangleStrip libPEX5        pl_util
+ 00000000 T _PEXGeoNormQuadrilateralMesh libPEX5        pl_util
+ 00000000 T _PEXGeoNormSetOfFillAreaSets libPEX5        pl_util
+ 00000000 T _PEXCreateWorkstation libPEX5        pl_wks
+ 00000000 T _PEXFreeWorkstation  libPEX5        pl_wks
+ 00000000 T _PEXGetWorkstationAttributes libPEX5        pl_wks
+ 00000000 T _PEXGetWorkstationDynamics libPEX5        pl_wks
+ 00000000 T _PEXGetWorkstationViewRep libPEX5        pl_wks
+ 00000000 T _PEXGetWorkstationPostings libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationViewPriority libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationDisplayUpdateMode libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationBufferMode libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationViewRep libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationWindow libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationViewport libPEX5        pl_wks
+ 00000000 T _PEXSetWorkstationHLHSRMode libPEX5        pl_wks
+ 00000000 T _PEXRedrawAllStructures libPEX5        pl_wks
+ 00000000 T _PEXUpdateWorkstation libPEX5        pl_wks
+ 00000000 T _PEXExecuteDeferredActions libPEX5        pl_wks
+ 00000000 T _PEXMapDCToWC        libPEX5        pl_wks
+ 00000000 T _PEXMapWCToDC        libPEX5        pl_wks
+ 00000000 T _PEXPostStructure    libPEX5        pl_wks
+ 00000000 T _PEXUnpostStructure  libPEX5        pl_wks
+ 00000000 T _PEXUnpostAllStructures libPEX5        pl_wks
+ 00000000 T _PEXRedrawClipRegion libPEX5        pl_wks
+ 00000000 T __PEXIEEE32toDECF    libPEX5        pl_convert
+ 00000000 T __PEXDECFtoIEEE32    libPEX5        pl_convert
+ 00000000 T __PEXOCFacet         libPEX5        pl_oc_util
+ 00000000 T __PEXOCListOfFacet   libPEX5        pl_oc_util
+ 00000000 T __PEXOCListOfVertex  libPEX5        pl_oc_util
+ 00000000 T __PEXOCListOfColor   libPEX5        pl_oc_util
+ 00000000 T __PEXStoreFacet      libPEX5        pl_oc_util
+ 00000000 T __PEXStoreListOfFacet libPEX5        pl_oc_util
+ 00000000 T __PEXStoreListOfVertex libPEX5        pl_oc_util
+ 00000000 T __PEXStoreListOfColor libPEX5        pl_oc_util
+ 00000000 T __PEXExtractFacet    libPEX5        pl_oc_util
+ 00000000 T __PEXExtractListOfFacet libPEX5        pl_oc_util
+ 00000000 T __PEXExtractListOfVertex libPEX5        pl_oc_util
+ 00000000 T __PEXExtractListOfColor libPEX5        pl_oc_util
*** /dev/null	Sun Jan 29 07:18:15 1995
--- xc/lib/PEX5/jump_ignore	Sun Jan 29 07:18:15 1995
***************
*** 0 ****
--- 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
*** /dev/null	Sun Jan 29 07:18:16 1995
--- xc/lib/PEX5/jump_vars	Sun Jan 29 07:18:16 1995
***************
*** 0 ****
--- 1,10 ----
+ # $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
+ 00000004 D _PEXPickCacheSize    libPEX5        pl_startup
+ 00000004 D _PEXPickCacheInUse   libPEX5        pl_startup
+ 00000260 D _PEX_encode_oc_funcs libPEX5        pl_startup
+ 00000260 D _PEX_decode_oc_funcs libPEX5        pl_startup
+ 00000100 D _PEX_fp_convert      libPEX5        pl_startup
*** -	Sun Jan 29 07:18:17 1995
--- xc/lib/xtrans/Xtranssock.c	Sun Jan 29 07:18:17 1995
***************
*** 1,4 ****
! /* $XConsortium: Xtranssock.c,v 1.33 94/12/01 16:33:12 kaleb Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
--- 1,4 ----
! /* $XConsortium: Xtranssock.c,v 1.34 95/01/12 18:25:25 kaleb Exp $ */
  /*
  
  Copyright (c) 1993, 1994  X Consortium
***************
*** 97,103 ****
  #include <net/errno.h>
  #endif /* _SEQUENT_  || ESIX */
  #include <sys/stropts.h>
! #endif /* SYSV386 ** SYSV || _SEQUENT_ */
  #endif /* !WIN32 */
  
  #ifdef WIN32
--- 97,103 ----
  #include <net/errno.h>
  #endif /* _SEQUENT_  || ESIX */
  #include <sys/stropts.h>
! #endif /* i386 && SYSV || _SEQUENT_ */
  #endif /* !WIN32 */
  
  #ifdef WIN32
***************
*** 1490,1500 ****
  #ifdef WIN32
      return ioctlsocket ((SOCKET) ciptr->fd, FIONREAD, (u_long *) pend);
  #else
! #if (defined(SYSV386) && defined(SYSV) && !defined(SCO)) || defined(_SEQUENT_)
      return ioctl (ciptr->fd, I_NREAD, (char *) pend);
  #else
      return ioctl (ciptr->fd, FIONREAD, (char *) pend);
! #endif /* SYSV386 && SYSV || _SEQUENT_ */
  #endif /* WIN32 */
  }
  
--- 1490,1500 ----
  #ifdef WIN32
      return ioctlsocket ((SOCKET) ciptr->fd, FIONREAD, (u_long *) pend);
  #else
! #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 */
  }
  
*** -	Sun Jan 29 07:18:18 1995
--- xc/programs/rgb/Imakefile	Sun Jan 29 07:18:18 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.30 94/05/14 16:36:45 rws Exp $
  
  #if UseRgbTxt
     RGB_DEFINES = -DUSE_RGB_TXT
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.31 94/12/08 02:28:20 kaleb Exp $
  
  #if UseRgbTxt
     RGB_DEFINES = -DUSE_RGB_TXT
***************
*** 26,32 ****
  #else
      DATAFILES = rgb.pag rgb.dir
        DATADEP = rgb.dir		/* just want one run of rgb */
! #if !(defined(SGIArchitecture) || SystemV4)
         DBMLIB = -ldbm
  #endif
  #endif
--- 26,32 ----
  #else
      DATAFILES = rgb.pag rgb.dir
        DATADEP = rgb.dir		/* just want one run of rgb */
! #if !(defined(SGIArchitecture) || defined(SVR4Architecture))
         DBMLIB = -ldbm
  #endif
  #endif
***************
*** 35,41 ****
      CCOPTIONS = /**/
      EXTRA_LOAD_FLAGS = /**/
  #endif
! #if defined(i386SVR4Architecture)
         DBMLIB = -ldbm -lucb
  #endif
  #endif /*!UseRgbTxt */
--- 35,41 ----
      CCOPTIONS = /**/
      EXTRA_LOAD_FLAGS = /**/
  #endif
! #if defined(i386Architecture) && defined(SVR4Architecture)
         DBMLIB = -ldbm -lucb
  #endif
  #endif /*!UseRgbTxt */
*** -	Sun Jan 29 07:18:20 1995
--- xc/programs/xfs/include/os.h	Sun Jan 29 07:18:19 1995
***************
*** 1,4 ****
! /* $XConsortium: os.h,v 1.8 94/04/17 19:55:59 dpw Exp $ */
  /*
  Copyright (c) 1987  X Consortium
  
--- 1,4 ----
! /* $XConsortium: os.h,v 1.9 94/09/16 19:00:32 kaleb Exp $ */
  /*
  Copyright (c) 1987  X Consortium
  
***************
*** 72,85 ****
  #define	fsrealloc(ptr, size)	FSrealloc((pointer)ptr, (unsigned long)size)
  #define	fsfree(ptr)		FSfree((pointer)ptr)
  
  #ifdef __GNUC__
  #define alloca __builtin_alloca
! #endif
  
! #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar)
  #define	ALLOCATE_LOCAL(size)		alloca((int)size)
  #define	DEALLOCATE_LOCAL(ptr)
  #endif
  
  #ifndef ALLOCATE_LOCAL
  #define	ALLOCATE_LOCAL(size)	FSalloc((unsigned long)size)
--- 72,120 ----
  #define	fsrealloc(ptr, size)	FSrealloc((pointer)ptr, (unsigned long)size)
  #define	fsfree(ptr)		FSfree((pointer)ptr)
  
+ #ifndef NO_ALLOCA
+ /*
+  * os-dependent definition of local allocation and deallocation
+  * If you want something other than FSalloc/FSfree for ALLOCATE/DEALLOCATE
+  * LOCAL then you add that in here.
+  */
+ #ifdef __HIGHC__
+ 
+ #ifndef NCR
+ extern char *alloca();
+ 
+ #if HCVERSION < 21003
+ #define ALLOCATE_LOCAL(size)    alloca((int)(size))
+ pragma on(alloca);
+ #else /* HCVERSION >= 21003 */
+ #define ALLOCATE_LOCAL(size)    _Alloca((int)(size))
+ #endif /* HCVERSION < 21003 */
+ #else /* NCR */
+ #define ALLOCATE_LOCAL(size)	alloca(size)
+ #endif /* NCR */
+ 
+ #define DEALLOCATE_LOCAL(ptr)	/* as nothing */
+ 
+ #endif /* __HIGHC__ */
+ 
  #ifdef __GNUC__
  #define alloca __builtin_alloca
! #else
  
! /*
!  * warning: old mips alloca (pre 2.10) is unusable, new one is builtin
!  * Test is easy, the new one is named __builtin_alloca and comes
!  * from alloca.h which #defines alloca.
!  */
! #ifndef NCR
! #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
  #define	ALLOCATE_LOCAL(size)		alloca((int)size)
  #define	DEALLOCATE_LOCAL(ptr)
  #endif
+ #endif /* NCR */
+ #endif /* __GNUC__ */
+ 
+ #endif /* NO_ALLOCA */
  
  #ifndef ALLOCATE_LOCAL
  #define	ALLOCATE_LOCAL(size)	FSalloc((unsigned long)size)
*** -	Sun Jan 29 07:18:21 1995
--- xc/programs/xterm/main.c	Sun Jan 29 07:18:21 1995
***************
*** 1,5 ****
  #ifndef lint
! static char *rid="$XConsortium: main.c,v 1.222 94/04/17 20:23:28 gildea Exp $";
  #endif /* lint */
  
  /*
--- 1,5 ----
  #ifndef lint
! static char *rid="$XConsortium: main.c,v 1.225.1.1 95/01/13 21:13:04 kaleb Exp $";
  #endif /* lint */
  
  /*
***************
*** 99,105 ****
  #define HAS_UTMP_UT_HOST
  #endif
  
! #ifdef SYSV386
  #define USE_SYSV_UTMP
  #define ATT
  #define USE_HANDSHAKE
--- 99,105 ----
  #define HAS_UTMP_UT_HOST
  #endif
  
! #if defined(SYSV) && defined(i386) && !defined(SVR4)
  #define USE_SYSV_UTMP
  #define ATT
  #define USE_HANDSHAKE
***************
*** 121,126 ****
--- 121,137 ----
  #if defined(sony) && defined(bsd43) && !defined(KANJI)
  #define KANJI
  #endif
+ 
+ #ifdef linux
+ #define USE_SYSV_TERMIO
+ #define USE_SYSV_PGRP
+ #define USE_SYSV_UTMP
+ #define USE_SYSV_SIGNALS
+ #define HAS_UTMP_UT_HOST
+ #define LASTLOG
+ #define WTMP
+ #endif
+ 
  #include <sys/ioctl.h>
  #include <sys/stat.h>
  
***************
*** 197,203 ****
--- 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
***************
*** 902,911 ****
  #ifndef sgi
  	d_tio.c_line = 0;
  #endif
  	d_tio.c_cc[VINTR] = 0x7f;		/* DEL  */
- 	d_tio.c_cc[VQUIT] = '\\' & 0x3f;	/* '^\'	*/
  	d_tio.c_cc[VERASE] = '#';		/* '#'	*/
  	d_tio.c_cc[VKILL] = '@';		/* '@'	*/
      	d_tio.c_cc[VEOF] = 'D' & 0x3f;		/* '^D'	*/
  	d_tio.c_cc[VEOL] = '@' & 0x3f;		/* '^@'	*/
  #ifdef VSWTCH
--- 915,930 ----
  #ifndef sgi
  	d_tio.c_line = 0;
  #endif
+ #ifndef linux
  	d_tio.c_cc[VINTR] = 0x7f;		/* DEL  */
  	d_tio.c_cc[VERASE] = '#';		/* '#'	*/
  	d_tio.c_cc[VKILL] = '@';		/* '@'	*/
+ #else
+ 	d_tio.c_cc[VINTR] = 'C' & 0x3f;		/* '^C'	*/
+ 	d_tio.c_cc[VERASE] = 0x7f;		/* DEL	*/
+ 	d_tio.c_cc[VKILL] = 'U' & 0x3f;		/* '^U'	*/
+ #endif
+ 	d_tio.c_cc[VQUIT] = '\\' & 0x3f;	/* '^\'	*/
      	d_tio.c_cc[VEOF] = 'D' & 0x3f;		/* '^D'	*/
  	d_tio.c_cc[VEOL] = '@' & 0x3f;		/* '^@'	*/
  #ifdef VSWTCH
***************
*** 940,946 ****
--- 959,969 ----
          d_ltc.t_lnextc = '\377';
  #endif	/* TIOCSLTC */
  #ifdef USE_TERMIOS
+ #ifndef linux
  	d_tio.c_cc[VSUSP] = '\000';
+ #else
+ 	d_tio.c_cc[VSUSP] = 'Z' & 0x3f;
+ #endif
  	d_tio.c_cc[VDSUSP] = '\000';
  	d_tio.c_cc[VREPRINT] = '\377';
  	d_tio.c_cc[VDISCARD] = '\377';
***************
*** 1142,1148 ****
  		i = open ("xterm.debug.log", O_WRONLY | O_TRUNC, 0666);
  	}
  	if(i >= 0) {
! #if defined(USE_SYSV_TERMIO) && !defined(SVR4)
  		/* SYSV has another pointer which should be part of the
  		** FILE structure but is actually a seperate array.
  		*/
--- 1165,1171 ----
  		i = open ("xterm.debug.log", O_WRONLY | O_TRUNC, 0666);
  	}
  	if(i >= 0) {
! #if defined(USE_SYSV_TERMIO) && !defined(SVR4) && !defined(linux)
  		/* SYSV has another pointer which should be part of the
  		** FILE structure but is actually a seperate array.
  		*/
***************
*** 1157,1163 ****
--- 1180,1190 ----
  #endif
  		_bufend(stderr) = old_bufend;
  #else	/* USE_SYSV_TERMIO */
+ #ifndef linux
  		stderr->_file = i;
+ #else
+ 		setfileno(stderr, i);
+ #endif
  #endif	/* USE_SYSV_TERMIO */
  
  		/* mark this file as close on exec */
***************
*** 1264,1270 ****
  get_pty (pty)
      int *pty;
  {
! #if defined(SYSV) && defined(SYSV386)
          /*
  	  The order of this code is *important*.  On SYSV/386 we want to open
  	  a /dev/ttyp? first if at all possible.  If none are available, then
--- 1291,1297 ----
  get_pty (pty)
      int *pty;
  {
! #if defined(SYSV) && defined(i386) && !defined(SVR4)
          /*
  	  The order of this code is *important*.  On SYSV/386 we want to open
  	  a /dev/ttyp? first if at all possible.  If none are available, then
***************
*** 1290,1303 ****
  	  */
          if (pty_search(pty) == 0)
  	    return 0;
! #endif /* SYSV && SYSV386 */
  #ifdef ATT
  	if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0) {
  	    return 1;
  	}
! #if defined(SVR4) || defined(SYSV386)
  	strcpy(ttydev, ptsname(*pty));
! #if defined (SYSV) && defined(SYSV386)
  	IsPts = True;
  #endif
  #endif
--- 1317,1330 ----
  	  */
          if (pty_search(pty) == 0)
  	    return 0;
! #endif /* SYSV && i386 && !SVR4 */
  #ifdef ATT
  	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;
  #endif
  #endif
***************
*** 1638,1643 ****
--- 1665,1675 ----
  	screen->uid = getuid();
  	screen->gid = getgid();
  
+ #ifdef linux
+ 	bzero(termcap, sizeof termcap);
+ 	bzero(newtc, sizeof newtc);
+ #endif
+ 
  #ifdef SIGTTOU
  	/* so that TIOCSWINSZ || TIOCSIZE doesn't block */
  	signal(SIGTTOU,SIG_IGN);
***************
*** 1878,1886 ****
  #endif
  
  #ifdef USE_USG_PTYS
! #if defined(SYSV) && defined(SYSV386)
                  if (IsPts) {	/* SYSV386 supports both, which did we open? */
! #endif /* SYSV && SYSV386 */
  		int ptyfd;
  
  		setpgrp();
--- 1910,1918 ----
  #endif
  
  #ifdef USE_USG_PTYS
! #if defined(SYSV) && defined(i386) && !defined(SVR4)
                  if (IsPts) {	/* SYSV386 supports both, which did we open? */
! #endif /* SYSV && i386 && !SVR4 */
  		int ptyfd;
  
  		setpgrp();
***************
*** 1892,1898 ****
  		if (ioctl (ptyfd, I_PUSH, "ptem") < 0) {
  		    SysError (2);
  		}
! #if !defined(SVR4) && !defined(SYSV386)
  		if (!getenv("CONSEM") && ioctl (ptyfd, I_PUSH, "consem") < 0) {
  		    SysError (3);
  		}
--- 1924,1930 ----
  		if (ioctl (ptyfd, I_PUSH, "ptem") < 0) {
  		    SysError (2);
  		}
! #if !defined(SVR4) && !(defined(SYSV) && defined(i386))
  		if (!getenv("CONSEM") && ioctl (ptyfd, I_PUSH, "consem") < 0) {
  		    SysError (3);
  		}
***************
*** 1921,1929 ****
                          ws.ws_ypixel = FullHeight(screen);
                  }
  #endif
! #if defined(SYSV) && defined(SYSV386)
                  } else {	/* else pty, not pts */
! #endif /* SYSV && SYSV386 */
  #endif /* USE_USG_PTYS */
  
  #ifdef USE_HANDSHAKE		/* warning, goes for a long ways */
--- 1953,1961 ----
                          ws.ws_ypixel = FullHeight(screen);
                  }
  #endif
! #if defined(SYSV) && defined(i386) && !defined(SVR4)
                  } else {	/* else pty, not pts */
! #endif /* SYSV && i386 && !SVR4 */
  #endif /* USE_USG_PTYS */
  
  #ifdef USE_HANDSHAKE		/* warning, goes for a long ways */
***************
*** 2029,2037 ****
  			ttydev = realloc (ttydev, (unsigned) (strlen(ptr) + 1));
  			(void) strcpy(ttydev, ptr);
  		}
! #if defined(SYSV) && defined(SYSV386)
                  } /* end of IsPts else clause */
! #endif /* SYSV && SYSV386 */
  
  #endif /* USE_HANDSHAKE -- from near fork */
  
--- 2061,2069 ----
  			ttydev = realloc (ttydev, (unsigned) (strlen(ptr) + 1));
  			(void) strcpy(ttydev, ptr);
  		}
! #if defined(SYSV) && defined(i386) && !defined(SVR4)
                  } /* end of IsPts else clause */
! #endif /* SYSV && i386 && !SVR4 */
  
  #endif /* USE_HANDSHAKE -- from near fork */
  
***************
*** 2064,2070 ****
  		 */
  		{
  #ifdef USE_SYSV_TERMIO
! #if defined(umips) || defined(CRAY)
  		    /* If the control tty had its modes screwed around with,
  		       eg. by lineedit in the shell, or emacs, etc. then tio
  		       will have bad values.  Let's just get termio from the
--- 2096,2102 ----
  		 */
  		{
  #ifdef USE_SYSV_TERMIO
! #if defined(umips) || defined(CRAY) || defined(linux)
  		    /* If the control tty had its modes screwed around with,
  		       eg. by lineedit in the shell, or emacs, etc. then tio
  		       will have bad values.  Let's just get termio from the
***************
*** 2330,2336 ****
--- 2362,2370 ----
  
  		/* set up the new entry */
  		utmp.ut_type = USER_PROCESS;
+ #ifndef linux
  		utmp.ut_exit.e_exit = 2;
+ #endif
  		(void) strncpy(utmp.ut_user,
  			       (pw && pw->pw_name) ? pw->pw_name : "????",
  			       sizeof(utmp.ut_user));
***************
*** 2343,2353 ****
--- 2377,2389 ----
  #ifdef HAS_UTMP_UT_HOST
  		(void) strncpy(buf, DisplayString(screen->display),
  			       sizeof(buf));
+ #ifndef linux
  	        {
  		    char *disfin = strrchr(buf, ':');
  		    if (disfin)
  			*disfin = '\0';
  		}
+ #endif
  		(void) strncpy(utmp.ut_host, buf, sizeof(utmp.ut_host));
  #endif
  		(void) strncpy(utmp.ut_name, pw->pw_name, 
*** -	Sun Jan 29 07:18:24 1995
--- xc/programs/xterm/resize.c	Sun Jan 29 07:18:24 1995
***************
*** 1,5 ****
  /*
!  *	$XConsortium: resize.c,v 1.29 93/09/20 17:42:18 hersh Exp $
   */
  
  /*
--- 1,5 ----
  /*
!  *	$XConsortium: resize.c,v 1.31 94/11/30 23:51:18 kaleb Exp $
   */
  
  /*
***************
*** 32,38 ****
  #include <stdio.h>
  #include <ctype.h>
  
! #if defined(att) || (defined(SYSV) && defined(SYSV386))
  #define ATT
  #endif
  
--- 32,38 ----
  #include <stdio.h>
  #include <ctype.h>
  
! #if defined(att) || (defined(SYSV) && defined(i386))
  #define ATT
  #endif
  
***************
*** 54,60 ****
  #undef SYSV				/* pretend to be bsd */
  #endif /* macII */
  
! #ifdef SYSV
  #define USE_SYSV_TERMIO
  #define USE_SYSV_UTMP
  #else /* else not SYSV */
--- 54,60 ----
  #undef SYSV				/* pretend to be bsd */
  #endif /* macII */
  
! #if defined(SYSV) || defined(linux)
  #define USE_SYSV_TERMIO
  #define USE_SYSV_UTMP
  #else /* else not SYSV */
***************
*** 65,71 ****
--- 65,73 ----
  #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
***************
*** 90,98 ****
  
  #ifdef USE_SYSV_TERMIO
  #ifdef X_NOT_POSIX
! #ifndef SYSV386
  extern struct passwd *getpwuid(); 	/* does ANYBODY need this? */
! #endif /* SYSV386 */
  #endif /* X_NOT_POSIX */
  #define	bzero(s, n)	memset(s, 0, n)
  #endif	/* USE_SYSV_TERMIO */
--- 92,100 ----
  
  #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 */
*** -	Sun Jan 29 07:18:25 1995
--- xc/programs/xinit/xinit.c	Sun Jan 29 07:18:25 1995
***************
*** 1,4 ****
! /* $XConsortium: xinit.c,v 11.58 94/04/17 20:24:30 rws Exp $ */
  
  /*
  
--- 1,4 ----
! /* $XConsortium: xinit.c,v 11.61 95/01/09 21:20:29 kaleb Exp $ */
  
  /*
  
***************
*** 37,43 ****
  #include <sys/wait.h>
  #endif
  #include <errno.h>
- extern int sys_nerr;
  #include <setjmp.h>
  
  #ifndef X_NOT_STDC_ENV
--- 37,42 ----
***************
*** 68,98 ****
  
  char *bindir = BINDIR;
  char *server_names[] = {
- #ifdef vax				/* Digital */
-     "Xqvss       Digital monochrome display on Microvax or VAXstation",
-     "Xqdss       Digital color display on Microvax of VAXstation",
- #endif
  #if defined(ultrix) && defined(mips)
!     "Xmfbpmax    Digital monochrome display on DECstation 3100",
!     "Xcfbpmax    Digital color display on DECstation 3100",
  #endif
  #ifdef sun				/* Sun */
!     "Xsun        Sun monochrome and color displays on Sun 2, 3, or 4 series",
  #endif
  #ifdef hpux				/* HP */
      "Xhp         HP monochrome and colors displays on 9000/300 series",
  #endif
- #ifdef apollo				/* Apollo */
-     "Xapollo     Apollo monochrome and color displays",
- #endif
  #ifdef ibm				/* IBM */
      "Xibm        IBM AED, APA, 8514a, megapel, VGA displays on PC/RT",
  #endif
  #ifdef macII				/* MacII */
      "XmacII      Apple monochrome display on Macintosh II",
  #endif
! #ifdef M4310				/* Tektronix Pegasus */
!     "Xpeg        Tektronix Pegasus display on 431x series",
  #endif
      NULL};
  
--- 67,101 ----
  
  char *bindir = BINDIR;
  char *server_names[] = {
  #if defined(ultrix) && defined(mips)
!     "Xdec        Digital color display on DECstation",
  #endif
  #ifdef sun				/* Sun */
!     "Xsun        Sun BW2, CG2, CG3, CG4, or CG6 on Sun 2, 3, 4, or 386i",
!     "Xsunmono    Sun BW2 on Sun 2, 3, 4, or 386i ",
!     "Xsun24      Sun BW2, CG2, CG3, CG4, CG6, or CG8 on Sun 4",
  #endif
  #ifdef hpux				/* HP */
      "Xhp         HP monochrome and colors displays on 9000/300 series",
  #endif
  #ifdef ibm				/* IBM */
      "Xibm        IBM AED, APA, 8514a, megapel, VGA displays on PC/RT",
  #endif
  #ifdef macII				/* MacII */
      "XmacII      Apple monochrome display on Macintosh II",
  #endif
! #ifdef XFREE86
!     "XF86_SVGA   SVGA color display on i386 PC",
!     "XF86_Mono   monochrome display on i386 PC",
!     "XF86_VGA16  16 color VGA display on i386 PC",
!     "XF86_S3     S3 color display on i386 PC",
!     "XF86_8514   IBM 8514/A color display on i386 PC",
!     "XF86_Mach8  ATI Mach8 color display on i386 PC",
!     "XF86_Mach32 ATI Mach32 color display on i386 PC",
!     "XF86_Mach64 ATI Mach64 color display on i386 PC",
!     "XF86_P9000  Weitek P9000 color display on i386 PC",
!     "XF86_AGX    IIT AGX color display on i386 PC",
!     "XF86_W32    Tseng ET4000/W32 color display on i386 PC",
  #endif
      NULL};
  
***************
*** 122,128 ****
  char *program;
  Display *xd;			/* server connection */
  #ifndef SYSV
! #if defined(SVR4) || defined(_POSIX_SOURCE) || defined(__bsdi__)
  int status;
  #else
  union wait	status;
--- 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;
***************
*** 160,166 ****
  SIGVAL sigAlarm(sig)
  	int sig;
  {
! #ifdef SYSV
  	signal (sig, sigAlarm);
  #endif
  }
--- 163,169 ----
  SIGVAL sigAlarm(sig)
  	int sig;
  {
! #if defined(SYSV) || defined(SVR4) || defined(linux)
  	signal (sig, sigAlarm);
  #endif
  }
***************
*** 169,175 ****
  sigUsr1(sig)
  	int sig;
  {
! #ifdef SYSV
  	signal (sig, sigUsr1);
  #endif
  }
--- 172,178 ----
  sigUsr1(sig)
  	int sig;
  {
! #if defined(SYSV) || defined(SVR4) || defined(linux)
  	signal (sig, sigUsr1);
  #endif
  }
***************
*** 629,638 ****
  Error(fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
  	char	*fmt;
  {
- 	extern char	*sys_errlist[];
- 
  	fprintf(stderr, "%s:  ", program);
! 	if (errno > 0 && errno < sys_nerr)
! 	  fprintf (stderr, "%s (errno %d):  ", sys_errlist[errno], errno);
  	fprintf(stderr, fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9);
  }
--- 632,638 ----
  Error(fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
  	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);
  }
*** -	Sun Jan 29 07:18:27 1995
--- xc/programs/Xserver/Imakefile	Sun Jan 29 07:18:27 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.184.1.1 95/01/19 21:43:21 gildea Exp $
  /*
   * Server Master Makefile
   */
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.192 95/01/25 20:37:15 kaleb Exp $
  /*
   * Server Master Makefile
   */
***************
*** 13,21 ****
--- 13,25 ----
  #define PreFbLibs $(DIX) $(OS) $(FONT)
  #define BarePostFbLibs $(MFB) $(MI)
  #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
+ #define NoMfbBarePostFbLibs $(MI)
+ #define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS)
  
  #define MFBBareLibs PreFbLibs BarePostFbLibs
+ #define NoMFBBareLibs PreFbLibs NoMfbBarePostFbLibs
  #define MFBLibs PreFbLibs PostFbLibs
+ #define NoMFBLibs PreFbLibs NoMfbPostFbLibs
  #define CFBLibs PreFbLibs $(CFB) PostFbLibs
  #define CFB8Libs PreFbLibs $(CFB8) PostFbLibs
  #define CFB16Libs PreFbLibs $(CFB16) PostFbLibs
***************
*** 79,91 ****
  #ifdef ServerExtraSysLibs
     EXTRASYSLIBS = ServerExtraSysLibs
  #endif
! #if XirisServer || XhpServer || SystemV4 || defined(BSD386Architecture) || defined(i386BsdArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
          SYSLIBS = MathLibrary Krb5Libraries $(EXTRASYSLIBS)
  #else
          SYSLIBS = MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
  #endif
             CBRT = mi/cbrt.o
!         STDDIRS = dix os mi $(EXTDIRS)
  
  XCOMM
  XCOMM This turns off the default rule for compiling .c files because
--- 83,95 ----
  #ifdef ServerExtraSysLibs
     EXTRASYSLIBS = ServerExtraSysLibs
  #endif
! #if SystemV4 || defined(SGIArchitecture) || defined(XFree86Version)
          SYSLIBS = MathLibrary Krb5Libraries $(EXTRASYSLIBS)
  #else
          SYSLIBS = MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
  #endif
             CBRT = mi/cbrt.o
!         STDDIRS = include dix os mi $(EXTDIRS)
  
  XCOMM
  XCOMM This turns off the default rule for compiling .c files because
***************
*** 243,249 ****
  MFBDIR = mfb
  DDXDIR1 = hw/sunAmoeba
  SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
! SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sun/sunInExMono.o
  SUNMLIBS = hw/sunAmoeba/libsun.a MFBBareLibs $(OTHEREXTS)
  ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
  #ifndef ServerToInstall
--- 247,253 ----
  MFBDIR = mfb
  DDXDIR1 = hw/sunAmoeba
  SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
! SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o
  SUNMLIBS = hw/sunAmoeba/libsun.a MFBBareLibs $(OTHEREXTS)
  ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
  #ifndef ServerToInstall
***************
*** 388,394 ****
  HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
  HPOBJS = hw/hp/hp.o
  HPLIBS = CFB32Libs
! HPSYSLIBS = $(CBRT) $(SYSLIBS) /usr/lib/libdbm.a -ldld
  ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xhp
--- 392,398 ----
  HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
  HPOBJS = hw/hp/hp.o
  HPLIBS = CFB32Libs
! HPSYSLIBS = $(CBRT) $(SYSLIBS)
  ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall Xhp
***************
*** 420,429 ****
  XCOMM
  MFBDIR  = mfb
  CFB8DIR = cfb
  DDXDIR1 = hw/xfree86
! XF86SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
  XF86SVGAOBJS = $(XF86COMSRC)/XF86_SVGA.o $(XF86SRC)/vga256/vga256Conf.o
! XF86SVGALIBS = $(VGADRIVERSRC)/libdriver256.a $(XF86SRC)/vga256/libvga256.a $(XF86LIBS) MFBLibs
  XF86SVGASYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_SVGA,$(XF86SVGASUBDIRS),$(XF86SVGAOBJS),$(XF86SVGALIBS),$(XF86SVGASYSLIBS))
  #ifndef ServerToInstall
--- 424,435 ----
  XCOMM
  MFBDIR  = mfb
  CFB8DIR = cfb
+ CFB16DIR = cfb16
+ CFB32DIR = cfb32
  DDXDIR1 = hw/xfree86
! XF86SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
  XF86SVGAOBJS = $(XF86COMSRC)/XF86_SVGA.o $(XF86SRC)/vga256/vga256Conf.o
! XF86SVGALIBS = $(VGADRIVERSRC)/libdriver256.a $(XF86SRC)/vga256/libvga256.a $(XF86LIBS) CFBLibs
  XF86SVGASYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_SVGA,$(XF86SVGASUBDIRS),$(XF86SVGAOBJS),$(XF86SVGALIBS),$(XF86SVGASYSLIBS))
  #ifndef ServerToInstall
***************
*** 436,448 ****
  XCOMM
  XCOMM XFree86 VGA 16 color Server
  XCOMM
- MFBDIR  = mfb
- CFB8DIR = cfb
  DDXDIR1 = hw/xfree86
! XF86VGA16SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
  XF86VGA16OBJS = $(XF86COMSRC)/XF86_VGA16.o $(XF86SRC)/vga16/vga16Conf.o \
!                 $(XF86SRC)/vga16/misc/vga16misc.o
! XF86VGA16LIBS = $(VGA16DRIVERSRC)/libdriver16.a $(XF86SRC)/vga16/libvga16.a $(XF86MLIBS) MFBBareLibs $(OTHEREXTS)
  XF86VGA16SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_VGA16,$(XF86VGA16SUBDIRS),$(XF86VGA16OBJS),$(XF86VGA16LIBS),$(XF86VGA16SYSLIBS))
  #ifndef ServerToInstall
--- 442,457 ----
  XCOMM
  XCOMM XFree86 VGA 16 color Server
  XCOMM
  DDXDIR1 = hw/xfree86
! #if XF86VGA16DualServer
! XF86VGA16MONOOBJS = $(XF86SRC)/mono/monoConf.o
! XF86VGA16MONOLIBS = $(MONODRIVERSRC)/libmonodrv.a $(XF86SRC)/mono/libmono.a
! #endif
! XF86VGA16SUBDIRS = $(STDDIRS) $(DDXDIR1) $(DEPDIRS)
  XF86VGA16OBJS = $(XF86COMSRC)/XF86_VGA16.o $(XF86SRC)/vga16/vga16Conf.o \
!                 $(XF86SRC)/vga16/misc/vga16misc.o $(XF86VGA16MONOOBJS)
! XF86VGA16LIBS = $(VGA16DRIVERSRC)/libdriver16.a $(XF86SRC)/vga16/libvga16.a \
!                 $(XF86VGA16MONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
  XF86VGA16SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_VGA16,$(XF86VGA16SUBDIRS),$(XF86VGA16OBJS),$(XF86VGA16LIBS),$(XF86VGA16SYSLIBS))
  #ifndef ServerToInstall
***************
*** 450,466 ****
  #endif
  #endif	/* XF86VGA16Server */
  
  
  #if XF86MonoServer
  XCOMM
  XCOMM XFree86 Monochrome VGA Server
  XCOMM
- MFBDIR  = mfb
  DDXDIR1 = hw/xfree86
  XF86MONOSUBDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
  XF86MONOOBJS = $(XF86COMSRC)/XF86_Mono.o $(XF86SRC)/vga2/vga2Conf.o \
!                $(XF86SRC)/vga2/misc/vga2misc.o
! XF86MONOLIBS = $(VGA2DRIVERSRC)/libdriver2.a $(XF86SRC)/vga2/libvga2.a $(XF86MLIBS) MFBBareLibs $(OTHEREXTS)
  XF86MONOSYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_Mono,$(XF86MONOSUBDIRS),$(XF86MONOOBJS),$(XF86MONOLIBS),$(XF86MONOSYSLIBS))
  #ifndef ServerToInstall
--- 459,495 ----
  #endif
  #endif	/* XF86VGA16Server */
  
+ #if XF86W32Server
+ XCOMM
+ XCOMM XFree86 W32 Server
+ XCOMM
+ MFBDIR  = mfb
+ CFB8DIR = cfb
+ DDXDIR1 = hw/xfree86
+ XF86W32SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIR) $(DDXDIR1) $(DEPDIRS)
+ XF86W32OBJS = $(XF86COMSRC)/XF86_W32.o $(XF86ACCELSRC)/et4000w32/w32Conf.o
+ XF86W32LIBS = $(XF86ACCELSRC)/et4000w32/w32/libw32.a $(XF86ACCELSRC)/et4000w32/cfb.w32/libcfb.a $(XF86ACCELSRC)/et4000w32/w32/libw32.a $(XF86ACCELSRC)/et4000w32/asm/libasm.a CFB8Libs $(XF86LIBS)
+ XF86W32SYSLIBS = $(SYSLIBS)
+ SetUIDServerTarget(XF86_W32,$(XF86W32SUBDIRS),$(XF86W32OBJS),$(XF86W32LIBS),$(XF86W32SYSLIBS))
+ #ifndef ServerToInstall
+ #define ServerToInstall XF86_W32
+ #endif
+ #endif
  
  #if XF86MonoServer
  XCOMM
  XCOMM XFree86 Monochrome VGA Server
  XCOMM
  DDXDIR1 = hw/xfree86
+ #if XF86MonoDualServer
+ XF86MONOMONOOBJS = $(XF86SRC)/mono/monoConf.o
+ XF86MONOMONOLIBS = $(MONODRIVERSRC)/libmonodrv.a $(XF86SRC)/mono/libmono.a
+ #endif
  XF86MONOSUBDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
  XF86MONOOBJS = $(XF86COMSRC)/XF86_Mono.o $(XF86SRC)/vga2/vga2Conf.o \
!                $(XF86SRC)/vga2/misc/vga2misc.o $(XF86MONOMONOOBJS)
! XF86MONOLIBS = $(VGA2DRIVERSRC)/libdriver2.a $(XF86SRC)/vga2/libvga2.a \
! 	       $(XF86MONOMONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
  XF86MONOSYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_Mono,$(XF86MONOSUBDIRS),$(XF86MONOOBJS),$(XF86MONOLIBS),$(XF86MONOSYSLIBS))
  #ifndef ServerToInstall
***************
*** 469,508 ****
  #endif	/* XF86MonoServer */
  
  
- #if XF86BdmServer
- XCOMM
- XCOMM XFree86 Banked Monochrome Server
- XCOMM
- DDXDIR1 = hw/xfree86
- XF86BDMSUBDIRS = $(STDDIRS) $(DDXDIR1) $(DEPDIRS)
- XF86BDMOBJS = $(XF86COMSRC)/XF86_Bdm.o $(XF86SRC)/bdm2/bdm2Conf.o \
-               $(XF86SRC)/bdm2/misc/bdm2misc.o
- XF86BDMLIBS = $(BDM2DRIVERSRC)/libbdm2drv.a $(XF86SRC)/bdm2/libbdm2.a \
-               $(XF86MLIBS) $(DIX) $(OS) $(FONT) $(MI) $(OTHEREXTS)
- XF86BDMSYSLIBS = $(SYSLIBS)
- SetUIDServerTarget(XF86_Bdm,$(XF86BDMSUBDIRS),$(XF86BDMOBJS),$(XF86BDMLIBS),$(XF86BDMSYSLIBS))
- #ifndef ServerToInstall
- #define ServerToInstall XF86_Bdm
- #endif
- #endif	/* XF86BdmServer */
- 
- 
  #if XF86S3Server
  XCOMM
  XCOMM XFree86 S3 Server
  XCOMM
! MFBDIR  = mfb
! CFB8DIR = cfb
  DDXDIR1 = hw/xfree86
! XF86S3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
  XF86S3OBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3/s3Conf.o $(S3DRIVERSRC)/mmio_928/mmio_928.o $(S3DRIVERSRC)/s3_generic/s3_generic.o
! XF86S3LIBS = $(XF86ACCELSRC)/s3/libs3.a $(XF86ACCELSRC)/s3/s3mmio/libs3mmio.a $(XF86LIBS) CFB8Libs
  XF86S3SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_S3,$(XF86S3SUBDIRS),$(XF86S3OBJS),$(XF86S3LIBS),$(XF86S3SYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall XF86_S3
  #endif
! #endif	/* XF86SVGAServer */
  
  
  #if XF86I8514Server
--- 498,521 ----
  #endif	/* XF86MonoServer */
  
  
  #if XF86S3Server
  XCOMM
  XCOMM XFree86 S3 Server
  XCOMM
! MFBDIR   = mfb
! CFB8DIR  = cfb
! CFB16DIR = cfb16
! CFB32DIR = cfb32
  DDXDIR1 = hw/xfree86
! XF86S3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
  XF86S3OBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3/s3Conf.o $(S3DRIVERSRC)/mmio_928/mmio_928.o $(S3DRIVERSRC)/s3_generic/s3_generic.o
! XF86S3LIBS = $(XF86ACCELSRC)/s3/libs3.a $(XF86ACCELSRC)/s3/s3mmio/libs3mmio.a $(XF86LIBS) CFBLibs $(XF86ACCELSRC)/cache/libxf86cache.a
  XF86S3SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_S3,$(XF86S3SUBDIRS),$(XF86S3OBJS),$(XF86S3LIBS),$(XF86S3SYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall XF86_S3
  #endif
! #endif	/* XF86S3Server */
  
  
  #if XF86I8514Server
***************
*** 520,526 ****
  #ifndef ServerToInstall
  #define ServerToInstall XF86_8514
  #endif
! #endif	/* XF86SVGAServer */
  
  
  #if XF86Mach8Server
--- 533,539 ----
  #ifndef ServerToInstall
  #define ServerToInstall XF86_8514
  #endif
! #endif	/* XF86I8514Server */
  
  
  #if XF86Mach8Server
***************
*** 538,562 ****
  #ifndef ServerToInstall
  #define ServerToInstall XF86_Mach8
  #endif
! #endif	/* XF86SVGAServer */
  
  
  #if XF86Mach32Server
  XCOMM
  XCOMM XFree86 Mach32 Server
  XCOMM
! MFBDIR  = mfb
! CFB8DIR = cfb
! DDXDIR1 = hw/xfree86
! XF86MACH32SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
  XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o
! XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/libmach32.a $(XF86LIBS) CFB8Libs
  XF86MACH32SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_Mach32,$(XF86MACH32SUBDIRS),$(XF86MACH32OBJS),$(XF86MACH32LIBS),$(XF86MACH32SYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall XF86_Mach32
  #endif
! #endif	/* XF86SVGAServer */
  
  
  #if XnestServer
--- 551,634 ----
  #ifndef ServerToInstall
  #define ServerToInstall XF86_Mach8
  #endif
! #endif	/* XF86Mach8Server */
  
  
  #if XF86Mach32Server
  XCOMM
  XCOMM XFree86 Mach32 Server
  XCOMM
! MFBDIR   = mfb
! CFB8DIR  = cfb
! CFB16DIR = cfb16
! DDXDIR1  = hw/xfree86
! XF86MACH32SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(DDXDIR1) $(DEPDIRS)
  XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o
! XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/libmach32.a $(XF86LIBS) CFB16Libs $(XF86ACCELSRC)/cache/libxf86cache.a
  XF86MACH32SYSLIBS = $(SYSLIBS)
  SetUIDServerTarget(XF86_Mach32,$(XF86MACH32SUBDIRS),$(XF86MACH32OBJS),$(XF86MACH32LIBS),$(XF86MACH32SYSLIBS))
  #ifndef ServerToInstall
  #define ServerToInstall XF86_Mach32
  #endif
! #endif	/* XF86Mach32Server */
! 
! 
! #if XF86Mach64Server
! XCOMM
! XCOMM XFree86 Mach64 Server
! XCOMM
! MFBDIR   = mfb
! CFB8DIR  = cfb
! CFB16DIR = cfb16
! CFB32DIR = cfb32
! DDXDIR1  = hw/xfree86
! XF86MACH64SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
! XF86MACH64OBJS = $(XF86COMSRC)/XF86_Mach64.o
! XF86MACH64LIBS = $(XF86ACCELSRC)/mach64/libmach64.a $(XF86LIBS) CFBLibs
! XF86MACH64SYSLIBS = $(SYSLIBS)
! SetUIDServerTarget(XF86_Mach64,$(XF86MACH64SUBDIRS),$(XF86MACH64OBJS),$(XF86MACH64LIBS),$(XF86MACH64SYSLIBS))
! #ifndef ServerToInstall
! #define ServerToInstall XF86_Mach64
! #endif
! #endif	/* XF86Mach64Server */
! 
! 
! #if XF86P9000Server
! XCOMM
! XCOMM XFree86 P9000 Server
! XCOMM
! MFBDIR  = mfb
! CFB8DIR = cfb
! CFB16DIR = cfb16
! CFB32DIR = cfb32
! DDXDIR1 = hw/xfree86
! XF86P9000SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
! XF86P9000OBJS = $(XF86COMSRC)/XF86_P9000.o
! XF86P9000LIBS = $(XF86ACCELSRC)/p9000/libp9000.a $(XF86LIBS) CFBLibs
! XF86P9000SYSLIBS = $(SYSLIBS)
! SetUIDServerTarget(XF86_P9000,$(XF86P9000SUBDIRS),$(XF86P9000OBJS),$(XF86P9000LIBS),$(XF86P9000SYSLIBS))
! #ifndef ServerToInstall
! #define ServerToInstall XF86_P9000
! #endif
! #endif        /* XF86P9000Server */
! 
! 
! #if XF86AGXServer
! XCOMM
! XCOMM XFree86 AGX Server
! XCOMM
! MFBDIR   = mfb
! CFB8DIR  = cfb
! DDXDIR1  = hw/xfree86
! XF86AGXSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
! XF86AGXOBJS = $(XF86COMSRC)/XF86_AGX.o
! XF86AGXLIBS = $(XF86ACCELSRC)/agx/libagx.a $(XF86LIBS) CFB8Libs
! XF86AGXSYSLIBS = $(SYSLIBS)
! SetUIDServerTarget(XF86_AGX,$(XF86AGXSUBDIRS),$(XF86AGXOBJS),$(XF86AGXLIBS),$(XF86AGXSYSLIBS))
! #ifndef ServerToInstall
! #define ServerToInstall XF86_AGX
! #endif
! #endif        /* XF86AGXServer */
  
  
  #if XnestServer
***************
*** 567,573 ****
  XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
  XNESTOBJS = 
  XNEST = hw/xnest/libxnest.a
! XNESTLIBS = $(DIX) $(OS) $(FONT) $(XNEST) $(MI) $(EXTENSIONS)
  XNESTSYSLIBS = $(LDPRELIB) $(XLIB) $(SYSLIBS)
  ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS),$(XNESTLIBS),$(XNESTSYSLIBS))
  #endif /* XnestServer */
--- 639,645 ----
  XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
  XNESTOBJS = 
  XNEST = hw/xnest/libxnest.a
! XNESTLIBS = $(DIX) $(OS) $(FONT) $(XNEST) $(MI) $(EXTENSIONS) $(XNEST)
  XNESTSYSLIBS = $(LDPRELIB) $(XLIB) $(SYSLIBS)
  ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS),$(XNESTLIBS),$(XNESTSYSLIBS))
  #endif /* XnestServer */
***************
*** 587,593 ****
  
  #if XVirtualFramebufferServer
  XCOMM
! XCOMM server with Virtual (malloc'ed) framebuffer
  XCOMM
  MFBDIR   = mfb
  CFB8DIR  = cfb
--- 659,665 ----
  
  #if XVirtualFramebufferServer
  XCOMM
! XCOMM server with Virtual (malloced) framebuffer
  XCOMM
  MFBDIR   = mfb
  CFB8DIR  = cfb
***************
*** 598,608 ****
  XVFBOBJS = hw/vfb/stubs.o
  XVFB = hw/vfb/libvfb.a
  XVFBLIBS = $(DIX) $(OS) $(FONT) $(XVFB) $(MFB) $(CFB) $(MI) $(EXTENSIONS) 
- #ifdef HPArchitecture
- XVFBSYSLIBS =  $(CBRT) $(SYSLIBS) /usr/lib/libdbm.a -ldld
- #else
  XVFBSYSLIBS = $(SYSLIBS)
- #endif
  ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS),$(XVFBLIBS),$(XVFBSYSLIBS))
  #endif /* XVirtualFramebufferServer */
  
--- 670,676 ----
*** /dev/null	Sun Jan 29 07:18:29 1995
--- xc/programs/Xserver/include/Imakefile	Sun Jan 29 07:18:29 1995
***************
*** 0 ****
--- 1,35 ----
+ 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::
+ 
+ InstallLinkKitNonExecFile(closure.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(colormap.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(colormapst.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cursor.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cursorstr.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(dix.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(dixfont.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(dixfontstr.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(gc.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(gcstruct.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(input.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(misc.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(miscstruct.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(opaque.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(os.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(pixmap.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(pixmapstr.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(property.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(resource.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(region.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(regionstr.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(screenint.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(servermd.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(scrnintstr.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(validate.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(window.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(windowstr.h,$(LINKKITDIR)/include)
+ 
+ depend::
+ 
*** -	Sun Jan 29 07:18:30 1995
--- xc/programs/Xserver/include/servermd.h	Sun Jan 29 07:18:30 1995
***************
*** 47,53 ****
  ******************************************************************/
  #ifndef SERVERMD_H
  #define SERVERMD_H 1
! /* $XConsortium: servermd.h,v 1.71 94/05/05 16:03:22 dpw Exp $ */
  
  /*
   * Machine dependent values:
--- 47,53 ----
  ******************************************************************/
  #ifndef SERVERMD_H
  #define SERVERMD_H 1
! /* $XConsortium: servermd.h,v 1.73 95/01/09 20:56:43 kaleb Exp $ */
  
  /*
   * Machine dependent values:
***************
*** 131,137 ****
  
  #endif /* vax */
  
! #ifdef sun
  
  #if defined(sun386) || defined(sun5)
  # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
--- 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 */
***************
*** 235,241 ****
  
  #endif /* macII */
  
! #if defined(mips) && !defined(sgi)
  
  #if defined(MIPSEL) || defined(__MIPSEL__)
  # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */
--- 237,243 ----
  
  #endif /* macII */
  
! #if (defined(mips) || defined(__mips)) && !defined(sgi)
  
  #if defined(MIPSEL) || defined(__MIPSEL__)
  # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */
***************
*** 321,334 ****
       defined(MACH386) || \
       defined(linux) || \
       (defined(AMOEBA) && defined(i80386)) || \
!      defined(_MINIX))
  
  #ifndef IMAGE_BYTE_ORDER
  #define IMAGE_BYTE_ORDER	LSBFirst
  #endif
  
  #ifndef BITMAP_BIT_ORDER
! # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86BDM2)
  #  define BITMAP_BIT_ORDER      MSBFirst
  # else
  #  define BITMAP_BIT_ORDER      LSBFirst
--- 323,336 ----
       defined(MACH386) || \
       defined(linux) || \
       (defined(AMOEBA) && defined(i80386)) || \
!      defined(MINIX))
  
  #ifndef IMAGE_BYTE_ORDER
  #define IMAGE_BYTE_ORDER	LSBFirst
  #endif
  
  #ifndef BITMAP_BIT_ORDER
! # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
  #  define BITMAP_BIT_ORDER      MSBFirst
  # else
  #  define BITMAP_BIT_ORDER      LSBFirst
***************
*** 352,358 ****
  #define FAST_CONSTANT_OFFSET_MODE
  #define FAST_MEMCPY
  #define NO_ONE_RECT
- #define SINGLEDEPTH
  #endif
  
  #endif /* SVR4 / BSD / i386 */
--- 354,359 ----
*** -	Sun Jan 29 07:18:32 1995
--- xc/programs/Xserver/include/os.h	Sun Jan 29 07:18:31 1995
***************
*** 46,52 ****
  
  ******************************************************************/
  
! /* $XConsortium: os.h,v 1.61 94/04/17 20:25:52 dpw Exp $ */
  
  #ifndef OS_H
  #define OS_H
--- 46,52 ----
  
  ******************************************************************/
  
! /* $XConsortium: os.h,v 1.64 95/01/05 19:50:01 kaleb Exp $ */
  
  #ifndef OS_H
  #define OS_H
***************
*** 82,114 ****
   */
  #ifdef __HIGHC__
  
  extern char *alloca();
  
  #if HCVERSION < 21003
  #define ALLOCATE_LOCAL(size)	alloca((int)(size))
- #if defined(NCR)
- #pragma on(alloca);
- #else
  pragma on(alloca);
- #endif
  #else /* HCVERSION >= 21003 */
  #define	ALLOCATE_LOCAL(size)	_Alloca((int)(size))
  #endif /* HCVERSION < 21003 */
  
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  
  #endif /* defined(__HIGHC__) */
  
  
! #ifdef __GNUC__
  #define alloca __builtin_alloca
! #endif
  
  /*
   * warning: old mips alloca (pre 2.10) is unusable, new one is builtin
   * Test is easy, the new one is named __builtin_alloca and comes
   * from alloca.h which #defines alloca.
   */
  #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
  /*
   * Some System V boxes extract alloca.o from /lib/libPW.a; if you
--- 82,115 ----
   */
  #ifdef __HIGHC__
  
+ #ifndef NCR
  extern char *alloca();
  
  #if HCVERSION < 21003
  #define ALLOCATE_LOCAL(size)	alloca((int)(size))
  pragma on(alloca);
  #else /* HCVERSION >= 21003 */
  #define	ALLOCATE_LOCAL(size)	_Alloca((int)(size))
  #endif /* HCVERSION < 21003 */
+ #else /* NCR */
+ #define ALLOCATE_LOCAL(size)	alloca(size)
+ #endif
  
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  
  #endif /* defined(__HIGHC__) */
  
  
! #if defined(__GNUC__) && !defined(alloca)
  #define alloca __builtin_alloca
! #else
  
  /*
   * warning: old mips alloca (pre 2.10) is unusable, new one is builtin
   * Test is easy, the new one is named __builtin_alloca and comes
   * from alloca.h which #defines alloca.
   */
+ #ifndef NCR
  #if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca)
  /*
   * Some System V boxes extract alloca.o from /lib/libPW.a; if you
***************
*** 121,126 ****
--- 122,129 ----
  #define ALLOCATE_LOCAL(size) alloca((int)(size))
  #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
  #endif /* who does alloca */
+ #endif /* NCR */
+ #endif /* ! __GNUC__ */
  
  #endif /* NO_ALLOCA */
  
*** -	Sun Jan 29 07:18:33 1995
--- xc/programs/Xserver/dix/Imakefile	Sun Jan 29 07:18:33 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.46 94/02/04 10:51:26 rws Exp $
  #include <Server.tmpl>
  
  SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.47 94/11/21 18:27:00 kaleb Exp $
  #include <Server.tmpl>
  
  SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
***************
*** 54,58 ****
--- 54,60 ----
  SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
  SpecialCObjectRule(tables,$(ICONFIGFILES),$(K5DEFS))
  SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(K5DEFS))
+ 
+ InstallLinkKitLibrary(dix,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:34 1995
--- xc/programs/Xserver/os/access.c	Sun Jan 29 07:18:34 1995
***************
*** 1,4 ****
! /* $XConsortium: access.c,v 1.73 94/04/17 20:26:53 rws Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XConsortium: access.c,v 1.75 94/11/21 18:27:47 kaleb Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
***************
*** 461,467 ****
      register struct ifreq *ifr;
      
  #ifdef DNETCONN
!     struct dn_naddr *dnaddr = getnodeadd(0);
      /*
       * AF_DECnet may not be listed in the interface list.  Instead use
       * the supported library call to find out the local address (if any).
--- 461,467 ----
      register struct ifreq *ifr;
      
  #ifdef DNETCONN
!     struct dn_naddr *dnaddr = getnodeadd();
      /*
       * AF_DECnet may not be listed in the interface list.  Instead use
       * the supported library call to find out the local address (if any).
***************
*** 494,500 ****
      if (ioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0)
          Error ("Getting interface configuration");
      for (ifr = ifc.ifc_req
! #if defined (__bsdi__) || defined(__NetBSD__)
  	 ; (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) ?
--- 494,500 ----
      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) ?
*** -	Sun Jan 29 07:18:35 1995
--- xc/programs/Xserver/os/osinit.c	Sun Jan 29 07:18:35 1995
***************
*** 45,51 ****
  SOFTWARE.
  
  ******************************************************************/
! /* $XConsortium: osinit.c,v 1.48 94/04/17 20:27:05 dpw Exp $ */
  
  #include <stdio.h>
  #include "X.h"
--- 45,51 ----
  SOFTWARE.
  
  ******************************************************************/
! /* $XConsortium: osinit.c,v 1.49 95/01/17 14:12:18 kaleb Exp $ */
  
  #include <stdio.h>
  #include "X.h"
***************
*** 80,85 ****
--- 80,87 ----
  int limitNoFile = -1;
  #endif
  
+ Bool OsDelayInitColors = FALSE;
+ 
  void
  OsInit()
  {
***************
*** 183,187 ****
      OsVendorInit();
  #endif
      OsInitAllocator();
!     OsInitColors();
  }
--- 185,189 ----
      OsVendorInit();
  #endif
      OsInitAllocator();
!     if (!OsDelayInitColors) OsInitColors();
  }
*** -	Sun Jan 29 07:18:36 1995
--- xc/programs/Xserver/os/io.c	Sun Jan 29 07:18:36 1995
***************
*** 1,5 ****
  /***********************************************************
- /***********************************************************
  
  Copyright (c) 1987, 1989  X Consortium
  
--- 1,4 ----
***************
*** 46,52 ****
  SOFTWARE.
  
  ******************************************************************/
! /* $XConsortium: io.c,v 1.90 94/12/02 17:33:26 mor Exp $ */
  /*****************************************************************
   * i/o functions
   *
--- 45,51 ----
  SOFTWARE.
  
  ******************************************************************/
! /* $XConsortium: io.c,v 1.91 95/01/25 11:14:28 kaleb Exp $ */
  /*****************************************************************
   * i/o functions
   *
*** -	Sun Jan 29 07:18:37 1995
--- xc/programs/Xserver/os/Imakefile	Sun Jan 29 07:18:37 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.77 94/12/02 19:22:00 mor Exp $
  #include <Server.tmpl>
  
  /*
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.78 94/12/02 19:23:26 mor Exp $
  #include <Server.tmpl>
  
  /*
***************
*** 127,131 ****
--- 127,133 ----
  #if HasKrb5
  LinkSourceFile(k5encode.c,$(XAUTHSRC))
  #endif
+ 
+ InstallLinkKitLibrary(os,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:38 1995
--- xc/programs/Xserver/mi/Imakefile	Sun Jan 29 07:18:38 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 5.21 93/12/13 17:28:23 dpw Exp $
  #include <Server.tmpl>
  
  SRCS =  mivaltree.c mipolyseg.c mipolyrect.c \
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 5.24 95/01/06 21:58:10 kaleb Exp $
  #include <Server.tmpl>
  
  SRCS =  mivaltree.c mipolyseg.c mipolyrect.c \
***************
*** 6,12 ****
  	mifillrct.c miwideline.c mispans.c \
   	miarc.c mizerarc.c mifillarc.c \
  	miwindow.c micursor.c miregion.c \
! 	mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c\
  	miexpose.c miglblt.c mizerline.c mifpolycon.c \
  	midash.c mibstore.c miinitext.c mieq.c \
  	mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c
--- 6,12 ----
  	mifillrct.c miwideline.c mispans.c \
   	miarc.c mizerarc.c mifillarc.c \
  	miwindow.c micursor.c miregion.c \
! 	mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \
  	miexpose.c miglblt.c mizerline.c mifpolycon.c \
  	midash.c mibstore.c miinitext.c mieq.c \
  	mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c
***************
*** 16,22 ****
  	mifillrct.o miwideline.o mispans.o \
  	miarc.o mizerarc.o mifillarc.o \
  	miwindow.o micursor.o miregion.o \
! 	mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o\
  	miexpose.o miglblt.o mizerline.o mifpolycon.o \
  	midash.o mibstore.o miinitext.o mieq.o \
  	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o
--- 16,22 ----
  	mifillrct.o miwideline.o mispans.o \
  	miarc.o mizerarc.o mifillarc.o \
  	miwindow.o micursor.o miregion.o \
! 	mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \
  	miexpose.o miglblt.o mizerline.o mifpolycon.o \
  	midash.o mibstore.o miinitext.o mieq.o \
  	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o
***************
*** 35,39 ****
--- 35,50 ----
  
  SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
  SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
+ 
+ InstallLinkKitLibrary(mi,$(LINKKITDIR)/lib)
+ InstallLinkKitLibrary(cbrt,$(LINKKITDIR)/lib)
+ InstallLinkKitNonExecFile(mi.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mibstore.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(miline.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mipointer.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(misprite.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mispritest.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mistruct.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(miinitext.c,$(LINKKITDIR)/include)
  
  DependTarget()
*** -	Sun Jan 29 07:18:39 1995
--- xc/programs/Xserver/mfb/Imakefile	Sun Jan 29 07:18:39 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.38 94/03/11 18:47:47 dpw Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.39 94/11/21 18:28:53 kaleb Exp $
  #include <Server.tmpl>
  
  SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
***************
*** 81,85 ****
--- 81,90 ----
  ObjectFromSpecialSource(mfbtileC,mfbtile,-DMROP=Mcopy)
  
  ObjectFromSpecialSource(mfbtileG,mfbtile,-DMROP=0)
+ 
+ InstallLinkKitLibrary(mfb,$(LINKKITDIR)/lib)
+ InstallLinkKitNonExecFile(fastblt.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mfb.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(mergerop.h,$(LINKKITDIR)/include)
  
  DependTarget()
*** -	Sun Jan 29 07:18:40 1995
--- xc/programs/Xserver/cfb/Imakefile	Sun Jan 29 07:18:40 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 5.41 93/09/06 18:37:23 rws Exp $
  #include <Server.tmpl>
  
  #ifndef PixelSize
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 5.42 94/11/21 18:29:57 kaleb Exp $
  #include <Server.tmpl>
  
  #ifndef PixelSize
***************
*** 214,219 ****
--- 214,234 ----
  stipsprcte32.o: stipsprcte32.s
  	$(CPP) -DTETEXT stipsprcte32.s | $(AS) -o $@ -
  #endif
+ #endif
+ 
+ #if PixelSize == 32
+ InstallLinkKitNamedLibrary(cfb,cfb32,$(LINKKITDIR)/lib)
+ #endif
+ #if PixelSize == 16
+ InstallLinkKitNamedLibrary(cfb,cfb16,$(LINKKITDIR)/lib)
+ #endif
+ #if PixelSize == 8
+ InstallLinkKitLibrary(cfb,$(LINKKITDIR)/lib)
+ InstallLinkKitNonExecFile(cfb.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cfb8bit.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cfbmap.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cfbmskbits.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(cfbrrop.h,$(LINKKITDIR)/include)
  #endif
  
  DependTarget()
*** -	Sun Jan 29 07:18:42 1995
--- xc/programs/Xserver/cfb/cfbmap.h	Sun Jan 29 07:18:41 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: cfbmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $
   *
  Copyright (c) 1991  X Consortium
  
--- 1,5 ----
  /*
!  * $XConsortium: cfbmap.h,v 1.10 94/09/22 21:12:06 dpw Exp $
   *
  Copyright (c) 1991  X Consortium
  
***************
*** 87,93 ****
  #define cfbCreateGC NAME(CreateGC)
  #define cfbCreatePixmap NAME(CreatePixmap)
  #define cfbCreateWindow NAME(CreateWindow)
! #define cfbCreateScreenResources NAME(CreateScreenResoures)
  #define cfbDestroyPixmap NAME(DestroyPixmap)
  #define cfbDestroyWindow NAME(DestroyWindow)
  #define cfbDoBitblt NAME(DoBitblt)
--- 87,93 ----
  #define cfbCreateGC NAME(CreateGC)
  #define cfbCreatePixmap NAME(CreatePixmap)
  #define cfbCreateWindow NAME(CreateWindow)
! #define cfbCreateScreenResources NAME(CreateScreenResources)
  #define cfbDestroyPixmap NAME(DestroyPixmap)
  #define cfbDestroyWindow NAME(DestroyWindow)
  #define cfbDoBitblt NAME(DoBitblt)
*** -	Sun Jan 29 07:18:43 1995
--- xc/programs/Xserver/cfb/cfbply1rct.c	Sun Jan 29 07:18:42 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: cfbply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,5 ----
  /*
!  * $XConsortium: cfbply1rct.c,v 1.15 94/11/21 18:29:57 kaleb Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 44,49 ****
--- 44,51 ----
  RROP_NAME(cfbFillPoly1Rect) (pDrawable, pGC, shape, mode, count, ptsIn)
      DrawablePtr	pDrawable;
      GCPtr	pGC;
+     int		shape;
+     int		mode;
      int		count;
      DDXPointPtr	ptsIn;
  {
*** -	Sun Jan 29 07:18:43 1995
--- xc/programs/Xserver/Xext/Imakefile	Sun Jan 29 07:18:43 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 5.38 94/04/08 17:47:15 rws Exp $
  #include <Server.tmpl>
  
  #if HasShm
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 5.39 94/11/21 18:30:11 kaleb Exp $
  #include <Server.tmpl>
  
  #if HasShm
***************
*** 18,22 ****
--- 18,24 ----
  NormalLibraryTarget(ext,$(OBJS))
  LintLibraryTarget(ext,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ext,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:45 1995
--- xc/programs/Xserver/XIE/dixie/Imakefile	Sun Jan 29 07:18:45 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:48:24 rws Exp $
  XCOMM build dixie archive
  #include <Server.tmpl>
  
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:24 kaleb Exp $
  XCOMM build dixie archive
  #include <Server.tmpl>
  
***************
*** 16,18 ****
--- 16,21 ----
  
  MakeLintLibSubdirs($(SUBDIRS))
  LintSubdirs($(SUBDIRS))
+ 
+ InstallLinkKitLibrary(dixie,$(LINKKITDIR)/lib)
+ 
*** -	Sun Jan 29 07:18:46 1995
--- xc/programs/Xserver/XIE/mixie/Imakefile	Sun Jan 29 07:18:46 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.3 93/11/07 10:56:56 rws Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:38 kaleb Exp $
  #include <Server.tmpl>
  
  #define	IHaveSubdirs
***************
*** 21,23 ****
--- 21,26 ----
  
  MakeLintLibSubdirs($(SUBDIRS))
  LintSubdirs($(SUBDIRS))
+ 
+ InstallLinkKitLibrary(mixie,$(LINKKITDIR)/lib)
+ 
*** -	Sun Jan 29 07:18:47 1995
--- xc/programs/Xserver/PEX5/ospex/Imakefile	Sun Jan 29 07:18:47 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.6 94/04/17 20:36:01 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:30:58 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 68,73 ****
--- 68,75 ----
  NormalLibraryTarget(ospex,$(OBJS))
  LintLibraryTarget(osp,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ospex,$(LINKKITDIR)/lib)
  
  DependTarget()
  
*** -	Sun Jan 29 07:18:48 1995
--- xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile	Sun Jan 29 07:18:48 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.7 94/04/17 20:36:03 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8 94/11/21 18:31:20 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
***************
*** 56,61 ****
--- 56,63 ----
  NormalLibraryTarget(didipex,$(OBJS))
  LintLibraryTarget(dsp,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(didipex,$(LINKKITDIR)/lib)
  
  DependTarget()
  
*** -	Sun Jan 29 07:18:49 1995
--- xc/programs/Xserver/PEX5/dipex/objects/Imakefile	Sun Jan 29 07:18:49 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8 94/04/17 20:36:07 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8.1.1 94/11/21 19:38:34 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 55,60 ****
--- 55,62 ----
  NormalLibraryTarget(diobpex,$(OBJS))
  LintLibraryTarget(obj,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(diobpex,$(LINKKITDIR)/lib)
  
  #ifdef HPArchitecture
  SpecialObjectRule(hpext.o, $(IRULESRC)/$(MACROFILE), $(EXT_DEFINES))
*** -	Sun Jan 29 07:18:50 1995
--- xc/programs/Xserver/PEX5/dipex/swap/Imakefile	Sun Jan 29 07:18:50 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.11 94/04/17 20:36:16 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.13 94/12/01 16:47:39 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 59,63 ****
--- 59,65 ----
  NormalLibraryTarget(diswapex,$(OBJS))
  LintLibraryTarget(dsw,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(diswapex,$(LINKKITDIR)/lib)
  
  DependTarget()
*** -	Sun Jan 29 07:18:52 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile	Sun Jan 29 07:18:52 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.7 94/04/17 20:36:51 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.7.1.1 94/11/21 19:42:53 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 70,75 ****
--- 70,77 ----
  
  LintLibraryTarget(dp1, $(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ddpex1,$(LINKKITDIR)/lib)
  
  DependTarget()
  
*** -	Sun Jan 29 07:18:53 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile	Sun Jan 29 07:18:53 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.6 94/04/17 20:36:57 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:32:10 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 108,113 ****
--- 108,115 ----
  
  LintLibraryTarget(dp2, $(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ddpex2,$(LINKKITDIR)/lib)
  
  DependTarget()
  
*** -	Sun Jan 29 07:18:54 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile	Sun Jan 29 07:18:54 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8 94/04/17 20:37:24 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.9 94/11/21 18:32:21 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 54,59 ****
--- 54,61 ----
  
  LintLibraryTarget(dp3, $(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ddpex3,$(LINKKITDIR)/lib)
  
  DependTarget()
  
*** -	Sun Jan 29 07:18:55 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile	Sun Jan 29 07:18:55 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8 94/04/17 20:37:27 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:38:15 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 72,77 ****
--- 72,79 ----
  
  LintLibraryTarget(dp4,$(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ddpex4,$(LINKKITDIR)/lib)
  
  SpecialCObjectRule(miWks,$(ICONFIGFILES),$(EXT_DEFINES))
  
*** -	Sun Jan 29 07:18:56 1995
--- xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile	Sun Jan 29 07:18:56 1995
***************
*** 1,5 ****
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.8 94/04/17 20:37:37 rws Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
--- 1,5 ----
  XCOMM
! XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:39:03 kaleb Exp $
  XCOMM
  XCOMM 
  XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
***************
*** 88,93 ****
--- 88,95 ----
  
  LintLibraryTarget(dps, $(SRCS))
  NormalLintTarget($(SRCS))
+ 
+ InstallLinkKitLibrary(ddpexs,$(LINKKITDIR)/lib)
  
  SpecialCObjectRule(miMisc,$(ICONFIGFILES),$(EXT_DEFINES))
  
*** -	Sun Jan 29 07:18:57 1995
--- xc/programs/Xserver/hw/xnest/Imakefile	Sun Jan 29 07:18:57 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.3 93/09/04 17:37:04 rws Exp $
  #include <Server.tmpl>
  
  SRCS = 	Args.c \
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.3.1.1 95/01/16 15:55:48 kaleb Exp $
  #include <Server.tmpl>
  
  SRCS = 	Args.c \
***************
*** 48,51 ****
--- 48,54 ----
  NormalLibraryTarget(xnest,$(OBJS))
  
  InstallManPage(Xnest,$(MANDIR))
+ 
+ InstallLinkKitLibrary(xnest,$(LINKKITDIR)/lib)
+ 
  DependTarget()
*** -	Sun Jan 29 07:18:58 1995
--- xc/programs/xauth/gethost.c	Sun Jan 29 07:18:58 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: gethost.c,v 1.21 94/04/17 20:37:51 hersh Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
--- 1,5 ----
  /*
!  * $XConsortium: gethost.c,v 1.22 94/11/30 16:29:52 kaleb Exp $
   *
   * 
  Copyright (c) 1989  X Consortium
***************
*** 52,64 ****
  #include <sys/socket.h>
  #include <netdb.h>
  #include <netinet/in.h>
! #ifdef SYSV386
! #ifndef SVR4
  #ifndef SCO
  #include <net/errno.h>
  #endif /* !SCO */
! #endif /* !SVR4 */
! #endif /* SYSV386 */
  #endif /* !STREAMSCONN */
  #endif /* !WIN32 */
  #include <errno.h>
--- 52,64 ----
  #include <sys/socket.h>
  #include <netdb.h>
  #include <netinet/in.h>
! #ifdef SYSV
! #ifdef i386
  #ifndef SCO
  #include <net/errno.h>
  #endif /* !SCO */
! #endif /* i386 */
! #endif /* SYSV */
  #endif /* !STREAMSCONN */
  #endif /* !WIN32 */
  #include <errno.h>
*** -	Sun Jan 29 07:18:59 1995
--- xc/programs/xconsole/xconsole.c	Sun Jan 29 07:18:59 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: xconsole.c,v 1.19 94/04/17 20:39:48 rws Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,5 ----
  /*
!  * $XConsortium: xconsole.c,v 1.21 95/01/05 21:04:06 kaleb Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 57,63 ****
  #include <ctype.h>
  
  /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
! #if defined(SYSV) && defined(SYSV386) && defined(__STDC__) && defined(ISC)
  extern FILE *fdopen(int, char const *);
  #endif
  
--- 57,63 ----
  #include <ctype.h>
  
  /* 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 *);
  #endif
  
***************
*** 140,146 ****
  #endif
  #endif
  
! #if defined(SVR4) || (defined(SYSV) && defined(SYSV386))
  #define USE_OSM
  #include <signal.h>
  FILE *osm_pipe();
--- 140,146 ----
  #endif
  #endif
  
! #if defined(SVR4) || (defined(SYSV) && defined(i386))
  #define USE_OSM
  #include <signal.h>
  FILE *osm_pipe();
*** -	Sun Jan 29 07:19:01 1995
--- xc/programs/xdm/daemon.c	Sun Jan 29 07:19:00 1995
***************
*** 1,4 ****
! /* $XConsortium: daemon.c,v 1.14 94/04/17 20:03:35 gildea Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
--- 1,4 ----
! /* $XConsortium: daemon.c,v 1.16 94/12/01 17:10:49 kaleb Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 41,47 ****
  #else
  #include <sys/ioctl.h>
  #endif
! #ifdef __osf__
  #define setpgrp setpgid
  #endif
  #ifdef hpux
--- 41,47 ----
  #else
  #include <sys/ioctl.h>
  #endif
! #if defined(__osf__) || defined(linux)
  #define setpgrp setpgid
  #endif
  #ifdef hpux
***************
*** 122,128 ****
      close (1);
      close (2);
  
! #ifndef SYSV386
      if ((i = open ("/dev/tty", O_RDWR)) >= 0) {	/* did open succeed? */
  #if defined(USG) && defined(TCCLRCTTY)
  	int zero = 0;
--- 122,128 ----
      close (1);
      close (2);
  
! #if !((defined(SYSV) || defined(SVR4)) && defined(i386))
      if ((i = open ("/dev/tty", O_RDWR)) >= 0) {	/* did open succeed? */
  #if defined(USG) && defined(TCCLRCTTY)
  	int zero = 0;
***************
*** 137,143 ****
  #endif
  	(void) close (i);
      }
! #endif /* !SYSV386 */
  
      /*
       * Set up the standard file descriptors.
--- 137,143 ----
  #endif
  	(void) close (i);
      }
! #endif /* !i386 */
  
      /*
       * Set up the standard file descriptors.
*** -	Sun Jan 29 07:19:02 1995
--- xc/programs/xdm/util.c	Sun Jan 29 07:19:01 1995
***************
*** 1,4 ****
! /* $XConsortium: util.c,v 1.17 94/04/17 20:03:48 rws Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,4 ----
! /* $XConsortium: util.c,v 1.18 94/11/21 18:33:11 kaleb Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
***************
*** 52,58 ****
  #undef _POSIX_SOURCE
  #endif
  #endif
! #ifdef __osf__
  #define setpgrp setpgid
  #endif
  
--- 52,58 ----
  #undef _POSIX_SOURCE
  #endif
  #endif
! #if defined(__osf__) || defined(linux)
  #define setpgrp setpgid
  #endif
  
*** -	Sun Jan 29 07:19:03 1995
--- xc/programs/xdm/auth.c	Sun Jan 29 07:19:03 1995
***************
*** 1,4 ****
! /* $XConsortium: auth.c,v 1.56 94/10/03 21:01:57 mor Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
--- 1,4 ----
! /* $XConsortium: auth.c,v 1.56.1.1 95/01/27 14:42:23 kaleb Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 778,784 ****
      if (ioctl (fd, SIOCGIFCONF, (char *) &ifc) < 0)
          LogError ("Trouble getting network interface configuration");
      for (ifr = ifc.ifc_req
! #if defined (__bsdi__) || defined(__NetBSD__)
  	 ; (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) ?
--- 778,784 ----
      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) ?
*** -	Sun Jan 29 07:19:04 1995
--- xc/programs/xdm/Imakefile	Sun Jan 29 07:19:04 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.72 94/04/01 12:37:39 gildea Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
  
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.76 95/01/05 20:57:42 kaleb Exp $
  #define IHaveSubdirs
  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
  
***************
*** 46,61 ****
--- 46,80 ----
  #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
  
+ #ifdef i386Architecture
+ FRAGILE_DEFINES = -DFRAGILE_DEV_MEM
+ #endif
+ 
+ #if HasVFork
+ VFORK_DEFINES = -DHAS_VFORK
+ #endif
+ 
     XDMCONFIGDIR = XdmConfigurationSubdirectory
          SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
  
***************
*** 99,105 ****
  		$(SIGNAL_DEFINES) \
  		$(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) \
  		$(PWD_DEFINES) $(CONN_DEFINES) \
! 		$(GREET_DEFINES) \
  		-DOSMAJORVERSION=$(OSMAJORVERSION) \
  		-DOSMINORVERSION=$(OSMINORVERSION)
  
--- 118,124 ----
  		$(SIGNAL_DEFINES) \
  		$(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) \
  		$(PWD_DEFINES) $(CONN_DEFINES) \
! 		$(GREET_DEFINES) $(FRAGILE_DEFINES) \
  		-DOSMAJORVERSION=$(OSMAJORVERSION) \
  		-DOSMINORVERSION=$(OSMINORVERSION)
  
***************
*** 130,135 ****
--- 149,155 ----
  ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
  NormalProgramTarget(xdmshell,$(OBJS2),NullParameter,NullParameter,NullParameter)
  NormalProgramTarget(sessreg,$(OBJS4),NullParameter,NullParameter,NullParameter)
+ InstallProgram(sessreg,$(BINDIR))
  #if BuildChooser
  SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
  NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
***************
*** 142,147 ****
--- 162,168 ----
  SpecialCObjectRule(resource,$(ICONFIGFILES),$(RES_DEFINES))
  SpecialCObjectRule(socket,$(ICONFIGFILES),$(SOCK_DEFINES))
  SpecialCObjectRule(xdmcp,$(ICONFIGFILES),$(SOCK_DEFINES))
+ SpecialCObjectRule(xdmshell,$(ICONFIGFILES),$(VFORK_DEFINES))
  
  #if !SharedLibXdmGreet
  LinkSourceFile(greet.c,greeter)
*** -	Sun Jan 29 07:19:05 1995
--- xc/programs/xdm/genauth.c	Sun Jan 29 07:19:05 1995
***************
*** 1,4 ****
! /* $XConsortium: genauth.c,v 1.18 94/04/17 20:03:39 gildea Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
--- 1,4 ----
! /* $XConsortium: genauth.c,v 1.18.1.1 94/11/21 19:57:04 kaleb Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 84,89 ****
--- 84,92 ----
      fd = open (name, 0);
      if (fd < 0)
  	return 0;
+ #ifdef FRAGILE_DEV_MEM
+     if (strcmp(name, "/dev/mem") == 0) lseek (fd, (off_t) 0x100000, SEEK_SET);
+ #endif
      reads = FILE_LIMIT;
      sum[0] = 0;
      sum[1] = 0;
*** -	Sun Jan 29 07:19:07 1995
--- xc/programs/xdm/chooser.c	Sun Jan 29 07:19:07 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: chooser.c,v 1.20 94/06/03 16:34:39 mor Exp $
   *
  Copyright (c) 1990  X Consortium
  
--- 1,5 ----
  /*
!  * $XConsortium: chooser.c,v 1.21 94/11/21 18:33:11 kaleb Exp $
   *
  Copyright (c) 1990  X Consortium
  
***************
*** 516,522 ****
  	if (ioctl (socketFD, (int) SIOCGIFCONF, (char *) &ifc) < 0)
  	    return;
  	for (ifr = ifc.ifc_req
! #if defined (__bsdi__) || defined(__NetBSD__)
  	     ; (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) ?
--- 516,522 ----
  	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) ?
*** -	Sun Jan 29 07:19:08 1995
--- xc/programs/xdm/xdmshell.c	Sun Jan 29 07:19:08 1995
***************
*** 1,3 ****
--- 1,4 ----
+ /* $XConsortium: xdmshell.c,v 1.16 95/01/05 20:57:57 kaleb Exp $ */
  /*
   * xdmshell - simple program for running xdm from login
   *
***************
*** 43,51 ****
  extern int errno;
  #endif
  
- extern int sys_nerr;
- extern char *sys_errlist[];
- 
  #ifdef macII
  #define ON_CONSOLE_ONLY
  #endif
--- 44,49 ----
***************
*** 61,67 ****
  /*
   * HP-UX does have vfork, but A/UX doesn't
   */
! #if (defined(SYSV) || defined(macII)) && !defined(hpux)
  #define vfork() fork()
  #endif
  
--- 59,65 ----
  /*
   * HP-UX does have vfork, but A/UX doesn't
   */
! #ifndef HAS_VFORK
  #define vfork() fork()
  #endif
  
***************
*** 70,77 ****
  static char *SysErrorMsg (n)
      int n;
  {
!     char *s = (n > 0 && n < sys_nerr) ? sys_errlist[n] : "unknown";
!     return (s ? s : "null system error");
  }
  
  
--- 68,75 ----
  static char *SysErrorMsg (n)
      int n;
  {
!     char *s = strerror(n);
!     return (s ? s : "unknown error");
  }
  
  
*** -	Sun Jan 29 07:19:09 1995
--- xc/programs/xdm/dm.h	Sun Jan 29 07:19:09 1995
***************
*** 1,4 ****
! /* $XConsortium: dm.h,v 1.63 94/04/17 20:03:37 gildea Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
--- 1,4 ----
! /* $XConsortium: dm.h,v 1.63.1.1 95/01/26 19:31:18 kaleb Exp $ */
  /*
  
  Copyright (c) 1988  X Consortium
***************
*** 252,258 ****
  };
  
  /* setgroups is not covered by POSIX, arg type varies */
! #if defined(SYSV) || defined(SVR4) || defined(__osf__)
  #define GID_T gid_t
  #else
  #define GID_T int
--- 252,258 ----
  };
  
  /* setgroups is not covered by POSIX, arg type varies */
! #if defined(SYSV) || defined(SVR4) || defined(__osf__) || defined(linux)
  #define GID_T gid_t
  #else
  #define GID_T int
*** -	Sun Jan 29 07:19:10 1995
--- xc/programs/xdm/sessreg.c	Sun Jan 29 07:19:10 1995
***************
*** 1,30 ****
  /*
!  * $XConsortium: sessreg.c,v 1.11 94/04/17 20:03:46 rws Exp $
   *
! Copyright (c) 1990  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
   */
  
  /*
--- 1,35 ----
  /*
!  * $XConsortium: sessreg.c,v 1.17 95/01/29 12:07:22 kaleb Exp $
   *
!  * Copyright (c) 1990  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
+  * Lastlog support and dynamic utmp entry allocation
+  *   by Andreas Stolcke <stolcke@icsi.berkeley.edu>
   */
  
  /*
***************
*** 42,52 ****
--- 47,67 ----
   * one of -a or -d must be specified
   */
  
+ 
  # include	<X11/Xos.h>
  # include	<X11/Xfuncs.h>
  # include	<stdio.h>
  # include	<utmp.h>
  
+ #if defined(SYSV) || defined(CSRG_BASED)
+ #define NO_LASTLOG
+ #endif
+ 
+ #ifndef NO_LASTLOG
+ # include	<lastlog.h>
+ # include	<pwd.h>
+ #endif
+ 
  #ifdef SVR4
  #define SYSV			/* nice System V utmp interface still the same */
  #endif
***************
*** 57,66 ****
  #ifndef UTMP_FILE
  # define UTMP_FILE	"/etc/utmp"
  #endif
  #ifndef SYSV
- # ifndef SERVERS_FILE
- #  define SERVERS_FILE	"/usr/lib/X11/xdm/Xservers"
- # endif
  # ifndef TTYS_FILE
  #  define TTYS_FILE	"/etc/ttys"
  # endif
--- 72,83 ----
  #ifndef UTMP_FILE
  # define UTMP_FILE	"/etc/utmp"
  #endif
+ #ifndef NO_LASTLOG
+ #ifndef LLOG_FILE
+ # define LLOG_FILE	"/usr/adm/lastlog"
+ #endif
+ #endif
  #ifndef SYSV
  # ifndef TTYS_FILE
  #  define TTYS_FILE	"/etc/ttys"
  # endif
***************
*** 91,103 ****
  char	*xservers_file, *ttys_file;
  char	*user_name;
  int	aflag, dflag;
  
  char	*program_name;
  
  usage (x)
  {
  	if (x) {
! 		fprintf (stderr, "%s: usage %s {-a -d} [-w wtmp-file] [-u utmp-file]\n", program_name, program_name);
  		fprintf (stderr, "             [-t ttys-file] [-l line-name] [-h host-name]\n");
  		fprintf (stderr, "             [-s slot-number] [-x servers-file] user-name\n");
  		exit (1);
--- 108,128 ----
  char	*xservers_file, *ttys_file;
  char	*user_name;
  int	aflag, dflag;
+ #ifndef NO_LASTLOG
+ char	*llog_file;
+ int	llog_none, Lflag;
+ #endif
  
  char	*program_name;
  
  usage (x)
  {
  	if (x) {
! 		fprintf (stderr, "%s: usage %s {-a -d} [-w wtmp-file] [-u utmp-file]", program_name, program_name);
! #ifndef NO_LASTLOG
! 		fprintf (stderr, " [-L lastlog-file]");
! #endif
! 		fprintf (stderr, "\n");
  		fprintf (stderr, "             [-t ttys-file] [-l line-name] [-h host-name]\n");
  		fprintf (stderr, "             [-s slot-number] [-x servers-file] user-name\n");
  		exit (1);
***************
*** 168,173 ****
--- 193,205 ----
  			if (!strcmp (utmp_file, "none"))
  				utmp_none = 1;
  			break;
+ #ifndef NO_LASTLOG
+ 		case 'L':
+ 			llog_file = getstring (&argv, &Lflag);
+ 			if (!strcmp (llog_file, "none"))
+ 				llog_none = 1;
+ 			break;
+ #endif
  		case 't':
  			ttys_file = getstring (&argv, &tflag);
  			break;
***************
*** 206,217 ****
  		wtmp_file = WTMP_FILE;
  	if (!uflag)
  		utmp_file = UTMP_FILE;
! #ifndef SYSV
  	if (!tflag)
  		ttys_file = TTYS_FILE;
! 	if (!sflag) {
  		if (xflag)
! 			sysnerr (slot_number = Xslot (ttys_file, xservers_file, line), "Xslot");
  		else
  			sysnerr (slot_number = ttyslot (), "ttyslot");
  	}
--- 238,253 ----
  		wtmp_file = WTMP_FILE;
  	if (!uflag)
  		utmp_file = UTMP_FILE;
! #ifndef NO_LASTLOG
! 	if (!Lflag)
! 		llog_file = LLOG_FILE;
! #endif
! #if !defined(SYSV) && !defined(linux)
  	if (!tflag)
  		ttys_file = TTYS_FILE;
! 	if (!sflag && !utmp_none) {
  		if (xflag)
! 			sysnerr (slot_number = Xslot (ttys_file, xservers_file, line, host_name, aflag), "Xslot");
  		else
  			sysnerr (slot_number = ttyslot (), "ttyslot");
  	}
***************
*** 236,242 ****
  #else
  		utmp = open (utmp_file, O_RDWR);
  		if (utmp != -1) {
! 			syserr ((int) lseek (utmp, (long) (slot_number - 1) * sizeof (struct utmp), 0), "lseek");
  			sysnerr (write (utmp, (char *) &utmp_entry, sizeof (utmp_entry))
  				        == sizeof (utmp_entry), "write utmp entry");
  			close (utmp);
--- 272,278 ----
  #else
  		utmp = open (utmp_file, O_RDWR);
  		if (utmp != -1) {
! 			syserr ((int) lseek (utmp, (long) slot_number * sizeof (struct utmp), 0), "lseek");
  			sysnerr (write (utmp, (char *) &utmp_entry, sizeof (utmp_entry))
  				        == sizeof (utmp_entry), "write utmp entry");
  			close (utmp);
***************
*** 251,256 ****
--- 287,318 ----
  			close (wtmp);
  		}
  	}
+ #ifndef NO_LASTLOG
+ 	if (aflag && !llog_none) {
+ 	        int llog;
+ 	        struct passwd *pwd = getpwnam(user_name);
+ 
+ 	        sysnerr( pwd != NULL, "get user id");
+ 	        llog = open (llog_file, O_WRONLY);
+ 
+ 		if (llog != -1) {
+ 			int	user_id;
+ 			struct lastlog ll;
+ 
+ 			bzero((char *)&ll, sizeof(ll));
+ 			ll.ll_time = current_time;
+ 			if (line)
+ 			 (void) strncpy (ll.ll_line, line, sizeof (ll.ll_line));
+ 			if (host_name)
+ 			 (void) strncpy (ll.ll_host, host_name, sizeof (ll.ll_host));
+ 
+ 			sysnerr (lseek(llog, (long) pwd->pw_uid*sizeof(ll), 0) != -1, "seeking lastlog entry");
+ 			sysnerr (write (llog, (char *) &ll, sizeof (ll))
+ 				        == sizeof (ll), "write lastlog entry");
+ 			close (llog);
+ 		}
+ 	}
+ #endif
  	return 0;
  }
  
***************
*** 311,322 ****
   * by counting the lines in /etc/ttys and adding the line-number
   * that the display appears on in Xservers.  This is a poor
   * design, but is limited by the non-existant interface to utmp.
   */
  
! Xslot (ttys_file, servers_file, display_name)
  char	*ttys_file;
  char	*servers_file;
! char	*display_name;
  {
  	FILE	*ttys, *servers;
  	int	c;
--- 373,388 ----
   * by counting the lines in /etc/ttys and adding the line-number
   * that the display appears on in Xservers.  This is a poor
   * design, but is limited by the non-existant interface to utmp.
+  * If host_name is non-NULL, assume it contains the display name,
+  * otherwise use the tty_line argument (i.e., the tty name).
   */
  
! Xslot (ttys_file, servers_file, tty_line, host_name, addp)
  char	*ttys_file;
  char	*servers_file;
! char	*tty_line;
! char	*host_name;
! int	addp;
  {
  	FILE	*ttys, *servers;
  	int	c;
***************
*** 328,334 ****
  	char	*pos;
  
  	/* remove screen number from the display name */
! 	strcpy(disp_name, display_name);
  	pos = strrchr(disp_name, ':');
  	if (pos) {
  	    pos = strchr(pos, '.');
--- 394,400 ----
  	char	*pos;
  
  	/* remove screen number from the display name */
! 	strcpy(disp_name, host_name ? host_name : tty_line);
  	pos = strrchr(disp_name, ':');
  	if (pos) {
  	    pos = strchr(pos, '.');
***************
*** 346,351 ****
--- 412,418 ----
  		++slot;
  	(void) fclose (ttys);
  	sysnerr (servers = fopen (servers_file, "r"), servers_file);
+ 
  	len = strlen (disp_name);
  	column0 = 1;
  	while (fgets (servers_line, sizeof (servers_line), servers)) {
***************
*** 361,366 ****
  		else
  			column0 = 1;
  	}
! 	return 0;
  }
  #endif
--- 428,488 ----
  		else
  			column0 = 1;
  	}
! 	/*
! 	 * display not found in Xservers file - allocate utmp entry dinamically
! 	 */
! 	return findslot (tty_line, host_name, addp, slot);
! }
! 
! /*
!  * find a free utmp slot for the X display.  This allocates a new entry
!  * past the regular tty entries if necessary, reusing existing entries
!  * (identified by (line,hostname)) if possible.
!  */
! findslot (line_name, host_name, addp, slot)
! char	*line_name;
! char	*host_name;
! int	addp;
! int	slot;
! {
! 	int	utmp;
! 	struct	utmp entry;
! 	int	found = 0;
! 	int	freeslot = -1;
! 
! 	syserr(utmp = open (utmp_file, O_RDONLY), "open utmp");
! 
! 	/*
! 	 * first, try to locate a previous entry for this display
! 	 * also record location of a free slots in case we need a new one
! 	 */
! 	syserr ((int) lseek (utmp, (long) slot * sizeof (struct utmp), 0), "lseek");
! 
! 	if (!host_name)
! 		host_name = "";
! 
! 	while (read (utmp, (char *) &entry, sizeof (entry)) == sizeof (entry)) {
! 		if (strncmp(entry.ut_line, line_name,
! 			sizeof(entry.ut_line)) == 0 &&
! 		    strncmp(entry.ut_host, host_name,
! 			sizeof(entry.ut_host)) == 0) {
! 			found = 1;
! 			break;
! 		}
! 		if (freeslot < 0 && *entry.ut_name == '\0')
! 			freeslot = slot;
! 		++slot;
! 	}
! 
! 	close (utmp);
! 
! 	if (found)
! 		return slot;
! 	else if (!addp)
! 		return 0;	/* trying to delete a non-existing entry */
! 	else if (freeslot < 0)
! 		return slot;	/* first slot past current entries */
! 	else
! 		return freeslot;
  }
  #endif
*** -	Sun Jan 29 07:19:11 1995
--- xc/programs/xmag/Scale.c	Sun Jan 29 07:19:11 1995
***************
*** 1,4 ****
! /* $XConsortium: Scale.c,v 1.18 94/04/17 20:24:57 gildea Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
--- 1,4 ----
! /* $XConsortium: Scale.c,v 1.20 95/01/05 19:49:01 kaleb Exp $ */
  /*
  
  Copyright (c) 1989  X Consortium
***************
*** 50,56 ****
  #include <stdlib.h>
  #endif
  
! #if defined(ISC) && defined(SYSV) && defined(SYSV386) && __STDC__
  extern double atof(char *);
  #endif
  
--- 50,56 ----
  #include <stdlib.h>
  #endif
  
! #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern double atof(char *);
  #endif
  
*** -	Sun Jan 29 07:19:13 1995
--- xc/programs/xmh/miscfuncs.c	Sun Jan 29 07:19:12 1995
***************
*** 1,4 ****
! /* $XConsortium: miscfuncs.c,v 1.6 91/07/13 17:52:59 gildea Exp $ */
  
  #include <X11/Xos.h>
  
--- 1,4 ----
! /* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */
  
  #include <X11/Xos.h>
  
***************
*** 24,30 ****
  
  
  
! #if defined(SYSV) && (defined(SYSV386) || defined(MOTOROLA))
  
  /* These systems don't have the ftruncate() system call, so we emulate it.
   * This emulation can only shorten, not lengthen.
--- 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.
*** -	Sun Jan 29 07:19:14 1995
--- xc/programs/twm/lex.l	Sun Jan 29 07:19:13 1995
***************
*** 53,59 ****
  
  /***********************************************************************
   *
!  * $XConsortium: lex.l,v 1.68 94/04/17 20:38:14 rws Exp $
   *
   * .twmrc lex file
   *
--- 53,59 ----
  
  /***********************************************************************
   *
!  * $XConsortium: lex.l,v 1.69 94/11/21 18:33:32 kaleb Exp $
   *
   * .twmrc lex file
   *
***************
*** 67,73 ****
  extern char *ProgramName;
  
  extern int ParseError;
! #ifdef __bsdi__
  int yylineno;
  
  #undef YY_INPUT
--- 67,73 ----
  extern char *ProgramName;
  
  extern int ParseError;
! #if defined(CSRG_BASED) || defined(linux)
  int yylineno;
  
  #undef YY_INPUT
*** -	Sun Jan 29 07:19:14 1995
--- xc/programs/rstart/Imakefile	Sun Jan 29 07:19:14 1995
***************
*** 1,4 ****
! XCOMM $XConsortium: Imakefile,v 1.10 94/03/29 19:43:33 mor Exp $
  XCOMM
  XCOMM Copyright (c) 1993 Quarterdeck Office Systems
  XCOMM
--- 1,4 ----
! XCOMM $XConsortium: Imakefile,v 1.12 94/12/01 20:16:44 kaleb Exp $
  XCOMM
  XCOMM Copyright (c) 1993 Quarterdeck Office Systems
  XCOMM
***************
*** 11,17 ****
  XCOMM publicity pertaining to distribution of this software without
  XCOMM specific, written prior permission.
  XCOMM
! XCOMM THIS SOFTWARE IS PROVIDED `AS-IS'.  QUARTERDECK OFFICE SYSTEMS,
  XCOMM INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  XCOMM INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF
  XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
--- 11,17 ----
  XCOMM publicity pertaining to distribution of this software without
  XCOMM specific, written prior permission.
  XCOMM
! XCOMM THIS SOFTWARE IS PROVIDED 'AS-IS'.  QUARTERDECK OFFICE SYSTEMS,
  XCOMM INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  XCOMM INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF
  XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
***************
*** 22,28 ****
  XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
  XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
! XCOMM Having had to change the name once, I don't want it to be tough
  XCOMM the next time...
  SERVERNAME=rstartd
  CLIENTNAME=rstart
--- 22,28 ----
  XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
  XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
! XCOMM Having had to change the name once, I do not want it to be tough
  XCOMM the next time...
  SERVERNAME=rstartd
  CLIENTNAME=rstart
***************
*** 62,72 ****
  
  AllTarget($(SERVERNAME))
  CppScriptTarget($(SERVERNAME),server.cpp,-DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME),NullParameter)
! InstallProgram($(SERVERNAME),$(USRBIN))
  
  AllTarget($(CLIENTNAME))
  CppScriptTarget($(CLIENTNAME),client.cpp,-DRSHCMD=$(RSHCMD) -DSERVERNAME=$(SERVERNAME),NullParameter)
! InstallProgram($(CLIENTNAME),$(BINDIR))
  
  AllTarget(config)
  CppFileTarget(config,config.cpp,-DBINDIR=$(BINDIR) -DLIBDIR=$(MYLIBDIR) -DPACKAGEname=$(PACKAGEname) -DENVPREFIX=$(ENVPREFIX),NullParameter)
--- 62,72 ----
  
  AllTarget($(SERVERNAME))
  CppScriptTarget($(SERVERNAME),server.cpp,-DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME),NullParameter)
! InstallNamedProg($(SERVERNAME),$(SERVERNAME),$(USRBIN))
  
  AllTarget($(CLIENTNAME))
  CppScriptTarget($(CLIENTNAME),client.cpp,-DRSHCMD=$(RSHCMD) -DSERVERNAME=$(SERVERNAME),NullParameter)
! InstallNamedProg($(CLIENTNAME),$(CLIENTNAME),$(BINDIR))
  
  AllTarget(config)
  CppFileTarget(config,config.cpp,-DBINDIR=$(BINDIR) -DLIBDIR=$(MYLIBDIR) -DPACKAGEname=$(PACKAGEname) -DENVPREFIX=$(ENVPREFIX),NullParameter)
*** -	Sun Jan 29 07:19:16 1995
--- xc/programs/Xserver/mi/mifillarc.c	Sun Jan 29 07:19:16 1995
***************
*** 27,33 ****
  
  ********************************************************/
  
! /* $XConsortium: mifillarc.c,v 5.17 94/04/17 20:27:33 keith Exp $ */
  
  #include <math.h>
  #include "X.h"
--- 27,33 ----
  
  ********************************************************/
  
! /* $XConsortium: mifillarc.c,v 5.18 95/01/10 20:59:49 kaleb Exp $ */
  
  #include <math.h>
  #include "X.h"
***************
*** 50,64 ****
  #define Dsin(d)	sin((double)d*(M_PI/11520.0))
  #define Dcos(d)	cos((double)d*(M_PI/11520.0))
  
- /* could use 64-bit integers */
- typedef struct _miFillArcD {
-     int xorg, yorg;
-     int y;
-     int dx, dy;
-     double e;
-     double ym, yk, xm, xk;
- } miFillArcDRec;
- 
  void
  miFillArcSetup(arc, info)
      register xArc *arc;
--- 50,55 ----
***************
*** 114,120 ****
      }
  }
  
! static void
  miFillArcDSetup(arc, info)
      register xArc *arc;
      register miFillArcDRec *info;
--- 105,111 ----
      }
  }
  
! void
  miFillArcDSetup(arc, info)
      register xArc *arc;
      register miFillArcDRec *info;
*** -	Sun Jan 29 07:19:17 1995
--- xc/programs/Xserver/mi/mifillarc.h	Sun Jan 29 07:19:16 1995
***************
*** 25,31 ****
  
  ********************************************************/
  
! /* $XConsortium: mifillarc.h,v 5.7 94/04/17 20:27:34 dpw Exp $ */
  
  #define FULLCIRCLE (360 * 64)
  
--- 25,31 ----
  
  ********************************************************/
  
! /* $XConsortium: mifillarc.h,v 5.9 95/01/11 16:19:24 dpw Exp $ */
  
  #define FULLCIRCLE (360 * 64)
  
***************
*** 37,42 ****
--- 37,51 ----
      int ym, yk, xm, xk;
  } miFillArcRec;
  
+ /* could use 64-bit integers */
+ typedef struct _miFillArcD {
+     int xorg, yorg;
+     int y;
+     int dx, dy;
+     double e;
+     double ym, yk, xm, xk;
+ } miFillArcDRec;
+ 
  #define miFillArcEmpty(arc) (!(arc)->angle2 || \
  			     !(arc)->width || !(arc)->height || \
  			     (((arc)->width == 1) && ((arc)->height & 1)))
***************
*** 183,188 ****
--- 192,204 ----
  #if NeedFunctionPrototypes
      xArc * /*arc*/,
      miFillArcRec * /*info*/
+ #endif
+ );
+ 
+ extern void miFillArcDSetup(
+ #if NeedFunctionPrototypes
+     xArc * /*arc*/,
+     miFillArcDRec * /*info*/
  #endif
  );
  
*** -	Sun Jan 29 07:19:18 1995
--- xc/programs/Xserver/hw/sun/sun.h	Sun Jan 29 07:19:18 1995
***************
*** 1,5 ****
  
! /* $XConsortium: sun.h,v 5.39 94/08/16 13:45:30 dpw Exp $ */
  
  /*-
   * Copyright (c) 1987 by the Regents of the University of California
--- 1,5 ----
  
! /* $XConsortium: sun.h,v 5.39.1.1 95/01/05 19:58:43 kaleb Exp $ */
  
  /*-
   * Copyright (c) 1987 by the Regents of the University of California
***************
*** 48,58 ****
--- 48,60 ----
  #endif
  #endif
  #include <fcntl.h>
+ #ifndef __NetBSD__
  #ifndef i386
  # include <poll.h>
  #else
  # include <sys/poll.h>
  #endif
+ #endif
  #include <errno.h>
  #include <memory.h>
  
***************
*** 76,92 ****
  # include <stropts.h>
  # define usleep(usec) poll((struct pollfd *) 0, (size_t) 0, usec / 1000)
  #else
! # include <sun/fbio.h>
! # include <sundev/kbd.h>
! # include <sundev/kbio.h>
! # include <sundev/msio.h>
! # include <sundev/vuid_event.h>
! # include <pixrect/pixrect.h>
! # include <pixrect/memreg.h>
  extern int ioctl();
  extern int getrlimit();
  extern int setrlimit();
  extern int getpagesize();
  #endif
  extern int gettimeofday();
  
--- 78,101 ----
  # include <stropts.h>
  # define usleep(usec) poll((struct pollfd *) 0, (size_t) 0, usec / 1000)
  #else
! # ifndef __NetBSD__
! #  include <sun/fbio.h>
! #  include <sundev/kbd.h>
! #  include <sundev/kbio.h>
! #  include <sundev/msio.h>
! #  include <sundev/vuid_event.h>
! #  include <pixrect/pixrect.h>
! #  include <pixrect/memreg.h>
  extern int ioctl();
  extern int getrlimit();
  extern int setrlimit();
  extern int getpagesize();
+ # else
+ #  include <machine/fbio.h>
+ #  include <machine/kbd.h>
+ #  include <machine/kbio.h>
+ #  include <machine/vuid_event.h>
+ # endif
  #endif
  extern int gettimeofday();
  
***************
*** 276,282 ****
  
  extern void sunNonBlockConsoleOff(
  #if NeedFunctionPrototypes
! #ifdef SVR4
      void
  #else
      char* /* arg */
--- 285,291 ----
  
  extern void sunNonBlockConsoleOff(
  #if NeedFunctionPrototypes
! #if defined(SVR4) || defined(__NetBSD__)
      void
  #else
      char* /* arg */
*** -	Sun Jan 29 07:19:19 1995
--- xc/programs/Xserver/hw/sun/constype.c	Sun Jan 29 07:19:19 1995
***************
*** 1,5 ****
  /*
!  * $XConsortium: constype.c,v 1.5 92/11/18 14:10:04 rws Exp $
   * 
   * consoletype - utility to print out string identifying Sun console type
   *
--- 1,5 ----
  /*
!  * $XConsortium: constype.c,v 1.6 95/01/05 20:01:06 kaleb Exp $
   * 
   * consoletype - utility to print out string identifying Sun console type
   *
***************
*** 68,74 ****
--- 68,78 ----
  #include <fcntl.h>
  #include <sys/fbio.h>
  #else
+ #ifndef __NetBSD__
  #include <sun/fbio.h>
+ #else
+ #include <machine/fbio.h>
+ #endif
  #endif
  
  /* decoding as of Release 3.4 : fbio.h 1.3 87/01/09 SMI */
*** -	Sun Jan 29 07:19:20 1995
--- xc/programs/Xserver/hw/sun/kbd_mode.c	Sun Jan 29 07:19:20 1995
***************
*** 1,4 ****
! /* $XConsortium: kbd_mode.c,v 4.6 94/04/17 20:29:33 kaleb Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
--- 1,4 ----
! /* $XConsortium: kbd_mode.c,v 4.7 95/01/05 20:03:44 kaleb Exp $ */
  /************************************************************
  Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
  
***************
*** 46,53 ****
--- 46,58 ----
  #include <sys/kbio.h>
  #include <sys/kbd.h>
  #else
+ #ifndef __NetBSD__
  #include <sundev/kbio.h>
  #include <sundev/kbd.h>
+ #else
+ #include <machine/kbio.h>
+ #include <machine/kbd.h>
+ #endif
  #endif
  #include <stdio.h>
  
*** -	Sun Jan 29 07:19:22 1995
--- xc/programs/Xserver/hw/sun/sunIo.c	Sun Jan 29 07:19:21 1995
***************
*** 1,4 ****
! /* $XConsortium: sunIo.c,v 5.26 94/05/02 17:24:53 mor Exp $ */
  /*-
   * sunIo.c --
   *	Functions to handle input from the keyboard and mouse.
--- 1,4 ----
! /* $XConsortium: sunIo.c,v 5.26.1.3 95/01/25 23:02:33 kaleb Exp $ */
  /*-
   * sunIo.c --
   *	Functions to handle input from the keyboard and mouse.
***************
*** 169,175 ****
      devPtr = LookupKeyboardDevice();
      if (devPtr)
  	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
! #ifdef SVR4
      sunNonBlockConsoleOff ();
  #else
      sunNonBlockConsoleOff (NULL);
--- 169,175 ----
      devPtr = LookupKeyboardDevice();
      if (devPtr)
  	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
! #if defined(SVR4) || defined(__NetBSD__)
      sunNonBlockConsoleOff ();
  #else
      sunNonBlockConsoleOff (NULL);
*** -	Sun Jan 29 07:19:23 1995
--- xc/programs/Xserver/hw/sun/sunInit.c	Sun Jan 29 07:19:23 1995
***************
*** 1,4 ****
! /* $XConsortium: sunInit.c,v 5.53 94/08/16 13:45:30 dpw Exp $ */
  /*
   * sunInit.c --
   *	Initialization functions for screen/keyboard/mouse, etc.
--- 1,4 ----
! /* $XConsortium: sunInit.c,v 5.54 94/12/23 16:49:38 kaleb Exp $ */
  /*
   * sunInit.c --
   *	Initialization functions for screen/keyboard/mouse, etc.
***************
*** 375,381 ****
   */
  void sunNonBlockConsoleOff(
  #if NeedFunctionPrototypes
! #ifdef SVR4
      void
  #else
      char* arg
--- 375,381 ----
   */
  void sunNonBlockConsoleOff(
  #if NeedFunctionPrototypes
! #if defined(SVR4) || defined(__NetBSD__)
      void
  #else
      char* arg
***************
*** 562,572 ****
       */
      if (nonBlockConsole) {
  	if (!setup_on_exit) {
! #ifdef SVR4 /* { */
  	    if (atexit(sunNonBlockConsoleOff))
! #else /* }{ */
  	    if (on_exit(sunNonBlockConsoleOff, (char *)0))
! #endif /* } */
  		ErrorF("InitOutput: can't register NBIO exit handler\n");
  
  	    setup_on_exit = 1;
--- 562,572 ----
       */
      if (nonBlockConsole) {
  	if (!setup_on_exit) {
! #if defined(SVR4) || defined(__NetBSD__)
  	    if (atexit(sunNonBlockConsoleOff))
! #else
  	    if (on_exit(sunNonBlockConsoleOff, (char *)0))
! #endif
  		ErrorF("InitOutput: can't register NBIO exit handler\n");
  
  	    setup_on_exit = 1;
*** -	Sun Jan 29 07:19:24 1995
--- xc/programs/Xserver/hw/sun/sunCfb.c	Sun Jan 29 07:19:24 1995
***************
*** 1,5 ****
  
! /* $XConsortium: sunCfb.c,v 1.15 94/05/18 11:17:56 kaleb Exp $ */
  
  /*
  Copyright (c) 1990  X Consortium
--- 1,5 ----
  
! /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
  
  /*
  Copyright (c) 1990  X Consortium
***************
*** 250,261 ****
   * cg3var.h is needed for is this one #define, we'll just #define it here 
   * and let it go at that.
   */
- 
- #ifdef SVR4
  #define CG3_MMAP_OFFSET 0x04000000
- #else
- #include <pixrect/cg3var.h>
- #endif
  
  Bool sunCG3Init (screen, pScreen, argc, argv)
      int	    	  screen;    	/* what screen am I going to be */
--- 250,256 ----
***************
*** 275,281 ****
--- 270,280 ----
  #ifdef SVR4
  #include <sys/cg2reg.h>
  #else
+ #ifndef __NetBSD__
  #include <pixrect/cg2reg.h>
+ #else
+ #include <machine/cgtworeg.h>
+ #endif
  #endif
  
  typedef struct {
***************
*** 359,370 ****
      }
      return ret;
  }
- 
- #ifdef SVR4
- #include    <sys/cg4reg.h>
- #else
- #include    <sundev/cg4reg.h>
- #endif
  
  #define	CG4_HEIGHT	900
  #define	CG4_WIDTH	1152
--- 358,363 ----
*** -	Sun Jan 29 07:19:25 1995
--- xc/programs/Xserver/hw/sun/sunMfb.c	Sun Jan 29 07:19:25 1995
***************
*** 1,5 ****
  
! /* $XConsortium: sunMfb.c,v 1.4 94/04/17 20:29:46 kaleb Exp $ */
  
  /*
  Copyright (c) 1990, 1993  X Consortium
--- 1,5 ----
  
! /* $XConsortium: sunMfb.c,v 1.5 95/01/05 20:15:41 kaleb Exp $ */
  
  /*
  Copyright (c) 1990, 1993  X Consortium
***************
*** 86,98 ****
  
  #include "sun.h"
  #include "mfb.h"
- /* #include <sys/mman.h> */
- 
- #ifdef SVR4
- #include <sys/bw2reg.h>
- #else
- #include <sundev/bw2reg.h>
- #endif
  
  Bool sunBW2Init (screen, pScreen, argc, argv)
      int		    screen;    	/* what screen am I going to be */
--- 86,91 ----
*** -	Sun Jan 29 07:19:27 1995
--- xc/workInProgress/lbx/programs/lbxproxy/os/access.c	Sun Jan 29 07:19:27 1995
***************
*** 1,4 ****
! /* $XConsortium: access.c,v 1.4 94/04/17 21:17:11 rws Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
--- 1,4 ----
! /* $XConsortium: access.c,v 1.5 95/01/27 15:05:53 kaleb Exp $ */
  /***********************************************************
  
  Copyright (c) 1987  X Consortium
***************
*** 77,86 ****
  #  include <net/if.h>
  # endif
  #else
! #if defined(SVR4) || defined(SYSV386)
  # include <sys/utsname.h>
  #endif
! #if defined(SYSV) && defined(SYSV386)
  # include <sys/stream.h>
  #endif
  #ifdef ESIX
--- 77,86 ----
  #  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
