168. Fix 16bpp colour maps on Mach64's (Marc La France).

 167. Fix Mach64 DPMS bug (Marc La France).
 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc La France).
 165. Document what a ChipAdjustFrame() function should to to prevent moving
      of hardware cursors during mode switches (Marc La France).
 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La France).
 163. Ensure installed headers can find the headers they, in turn, #include
      (Marc La France).
 162. Make imake pass its -W* flags to cpp (Marc La France).
 161. More accomodations for newer GCC's (Mike A. Harris).

8 files changed, 35 insertions, 38 deletions

diff --git a/include/DPS/dpsclient.h b/include/DPS/dpsclient.h
index 8980f446a..4538a677c 100644
--- a/include/DPS/dpsclient.h
+++ b/include/DPS/dpsclient.h
@@ -35,7 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86$ */
+/* $XFree86: xc/include/DPS/dpsclient.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef DPSCLIENT_H
 #define DPSCLIENT_H
@@ -296,16 +296,6 @@ extern void DPSResetContext(DPSContext ctxt);
      the context has terminated in the server, the dps_err_invalidContext
      error will be reported via ctxt's error proc. */
   
-extern void DPSWaitContext(DPSContext ctxt);
-
-  /* Waits until the PostScript interpreter is ready for more input to
-     this context.  This is useful for synchronizing an application
-     with the DPS server.
-
-     If 'ctxt' represents an invalid context, for example because
-     the context has terminated in the server, the dps_err_invalidContext
-     error will be reported via ctxt's error proc. */
-
 extern void DPSInterruptContext(DPSContext ctxt);
 
   /* Sends a request to the server to interrupt execution of the context.
diff --git a/include/DPS/dpsfriends.h b/include/DPS/dpsfriends.h
index 072cc3f1c..098c92ca1 100644
--- a/include/DPS/dpsfriends.h
+++ b/include/DPS/dpsfriends.h
@@ -35,7 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86$ */
+/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef	DPSFRIENDS_H
 #define	DPSFRIENDS_H
@@ -464,6 +464,16 @@ extern int DPSGenerateExtensionRecID(void);
 
   /* This procedure generates a unique extension record id. */
 
+extern void DPSWaitContext(DPSContext ctxt);
+
+  /* Waits until the PostScript interpreter is ready for more input to
+     this context.  This is useful for synchronizing an application
+     with the DPS server.
+
+     If 'ctxt' represents an invalid context, for example because
+     the context has terminated in the server, the dps_err_invalidContext
+     error will be reported via ctxt's error proc. */
+  
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
diff --git a/include/GL/glxint.h b/include/GL/glxint.h
index b87a40311..74e9efe63 100644
--- a/include/GL/glxint.h
+++ b/include/GL/glxint.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glxint_h__
 #define __GLX_glxint_h__
 
-/* $XFree86: xc/include/GL/glxint.h,v 1.2 1999/06/14 07:23:28 dawes Exp $ */
+/* $XFree86: xc/include/GL/glxint.h,v 1.3 2000/11/18 19:37:04 tsi Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
@@ -23,8 +23,8 @@
 ** $SGI$
 */
 
-#include "X.h"
-#include "Xdefs.h"
+#include <X11/X.h>
+#include <X11/Xdefs.h>
 
 typedef struct __GLXvisualConfigRec __GLXvisualConfig;
 
diff --git a/include/GL/glxproto.h b/include/GL/glxproto.h
index a643d36bb..707675171 100644
--- a/include/GL/glxproto.h
+++ b/include/GL/glxproto.h
@@ -1,7 +1,7 @@
 #ifndef _GLX_glxproto_h_
 #define _GLX_glxproto_h_
 
-/* $XFree86: xc/include/GL/glxproto.h,v 1.3 2001/03/21 15:51:38 dawes Exp $ */
+/* $XFree86: xc/include/GL/glxproto.h,v 1.4 2001/04/10 16:07:49 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -36,7 +36,7 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 */
 
-#include "GL/glxmd.h"
+#include <GL/glxmd.h>
 
 /*****************************************************************************/
 
diff --git a/include/extensions/Imakefile b/include/extensions/Imakefile
index c3c22e3fa..04ce5266c 100644
--- a/include/extensions/Imakefile
+++ b/include/extensions/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
 
 
 
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.41 2001/04/28 23:52:32 dawes Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.42 2001/05/23 03:29:37 keithp Exp $
 
 #if BuildScreenSaverExt || BuildScreenSaveLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
@@ -22,7 +22,8 @@ XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
 XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
 #endif
 #if BuildLBX
-LBXHEADERS = lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h
+LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
+	     lbxstr.h lbxzlib.h
 #endif
 #if BuildXvExt || BuildXvLibrary
 XVHEADERS = Xv.h Xvlib.h Xvproto.h
diff --git a/include/extensions/Printstr.h b/include/extensions/Printstr.h
index d5d32eda5..9a3d15708 100644
--- a/include/extensions/Printstr.h
+++ b/include/extensions/Printstr.h
@@ -43,7 +43,7 @@
  **
  ******************************************************************************
  *****************************************************************************/
-/* $XFree86: xc/include/extensions/Printstr.h,v 1.3 1999/12/16 02:26:32 robin Exp $ */
+/* $XFree86: xc/include/extensions/Printstr.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */
 
 
 #ifndef _XpPrintstr_H_
@@ -662,9 +662,8 @@ extern XPHinterProc  _xp_hinter_proc;
 extern char         *_xp_hinter_desc;
 extern int           _xp_hinter_init;
 
-#endif /* _XP_PRINT_SERVER_ */
+#else /* _XP_PRINT_SERVER_ */
 
-#ifdef _XP_PRINT_SERVER_
 /***********************************************************************
  *
  * Server-only definitions shared between the extension and DDX layers.
@@ -775,7 +774,8 @@ extern int XpAllocateContextPrivateIndex(void);
 extern int XpRehashPrinterList(void);
 extern void XpSetFontResFunc(ClientPtr);
 extern void XpUnsetFontResFunc(ClientPtr);
-
+extern XpContextPtr XpContextOfClient(ClientPtr);
+extern void XpRegisterInitFunc(ScreenPtr, char *, int (*)(struct _XpContext *));
 
 #endif /* _XP_PRINT_SERVER_ */
 
diff --git a/include/fonts/FS.h b/include/fonts/FS.h
index 55aae6fd3..d07385147 100644
--- a/include/fonts/FS.h
+++ b/include/fonts/FS.h
@@ -46,13 +46,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/include/fonts/FS.h,v 1.5 1999/08/22 08:58:48 dawes Exp $ */
+/* $XFree86: xc/include/fonts/FS.h,v 1.6 2001/01/17 17:53:25 dawes Exp $ */
 
 #ifndef _FS_H_
 #define	_FS_H_
 
-#include "X11/Xdefs.h"
-#include "fsmasks.h"
+#include <X11/Xdefs.h>
+#include <X11/fonts/fsmasks.h>
 
 #define	FS_PROTOCOL		2
 #define	FS_PROTOCOL_MINOR	0
diff --git a/include/fonts/FSproto.h b/include/fonts/FSproto.h
index 02e91307a..3702e7d50 100644
--- a/include/fonts/FSproto.h
+++ b/include/fonts/FSproto.h
@@ -1,14 +1,9 @@
-/* $XConsortium: FSproto.h,v 1.11 94/04/17 20:11:05 gildea Exp $ */
+/* $Xorg: FSproto.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
 /*
  
-Copyright (c) 1990, 1991  X Consortium
+Copyright 1990, 1991, 1998  The Open Group
 
-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:
+All Rights Reserved.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -16,13 +11,13 @@ 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
+OPEN GROUP 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
+Except as contained in this notice, the name of The Open Group 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.
+in this Software without prior written authorization from The Open Group.
 
  * Copyright 1990, 1991 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation 
@@ -44,11 +39,12 @@ in this Software without prior written authorization from the X Consortium.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
+/* $XFree86$ */
 
 #ifndef _FS_PROTO_H_
 #define _FS_PROTO_H_
 
-#include	"FS.h"
+#include <X11/fonts/FS.h>
 
 #define sz_fsPropOffset 20
 #define sz_fsPropInfo 8