Merging XORG-CURRENT into trunk

40 files changed, 48 insertions, 41 deletions

diff --git a/include/XIstubs.h b/include/XIstubs.h
index ad36bc716..e005493c4 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/bstore.h b/include/bstore.h
index c3a6a9f38..098abcd86 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
+/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/bstorestr.h b/include/bstorestr.h
index 694841ed0..8f21855c4 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/
+/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/closestr.h b/include/closestr.h
index 34d5931f2..fcd64ed45 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
 
 
 #ifndef CLOSESTR_H
diff --git a/include/colormap.h b/include/colormap.h
index f249f4f03..e8b235529 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/cursor.h b/include/cursor.h
index 7509a94af..512133eb3 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 0e2f04a6d..3984245ad 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */
 
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
diff --git a/include/dix.h b/include/dix.h
index a47bfd8cc..0ca157ad4 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/dixevents.h b/include/dixevents.h
index f80f3ab0b..46a5faef0 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixfont.h b/include/dixfont.h
index 2a6877de2..d3bb69b0a 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
 
 #ifndef DIXFONT_H
 #define DIXFONT_H 1
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 21992e786..042e063db 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 43920540f..9c39a8aec 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
diff --git a/include/exevents.h b/include/exevents.h
index ea3804bd3..91c7acb6b 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extension.h b/include/extension.h
index 6b674f07f..34750173b 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 
 #ifndef EXTENSION_H
 #define EXTENSION_H 
diff --git a/include/extinit.h b/include/extinit.h
index 107eee891..37fa9a245 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 0d7debe0b..daf37bf43 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef EXTENSIONSTRUCT_H
 #define EXTENSIONSTRUCT_H 
diff --git a/include/gc.h b/include/gc.h
index a886d77b8..2288e8491 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 43cc679b4..6feff51f5 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 
 
-/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
diff --git a/include/globals.h b/include/globals.h
index 3b1b6ba0b..359f2eee2 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
diff --git a/include/input.h b/include/input.h
index acf3bca1a..fa88febda 100644
--- a/include/input.h
+++ b/include/input.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
 
 #ifndef INPUT_H
 #define INPUT_H
diff --git a/include/inputstr.h b/include/inputstr.h
index a8a834807..70627629b 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/misc.h b/include/misc.h
index ffa65b31e..5944a427f 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 86f114792..f0ff25b28 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
diff --git a/include/opaque.h b/include/opaque.h
index b5a55a60b..09a3570f9 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */
 
 #ifndef OPAQUE_H
 #define OPAQUE_H
diff --git a/include/os.h b/include/os.h
index e9328c8fa..b553e06e1 100644
--- a/include/os.h
+++ b/include/os.h
@@ -231,6 +231,8 @@ extern SIGVAL GiveUp(int /*sig*/);
 
 extern void UseMsg(void);
 
+extern void InitGlobals(void);
+
 extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
 
 extern int set_font_authorizations(
@@ -333,7 +335,7 @@ extern int GetHosts(
 
 typedef struct sockaddr * sockaddrPtr;
 
-extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/);
+extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
 
 extern int LocalClient(ClientPtr /* client */);
 
@@ -412,6 +414,8 @@ extern XID GenerateAuthorization(
 extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
 #endif
 
+extern void ddxInitGlobals(void);
+
 extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
 
 extern void ddxUseMsg(void);
diff --git a/include/pixmap.h b/include/pixmap.h
index 56bb675ae..6cea329ec 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef PIXMAP_H
 #define PIXMAP_H
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index d5bc21273..1b0df9fd3 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
diff --git a/include/property.h b/include/property.h
index 66103bc8e..21a38d51c 100644
--- a/include/property.h
+++ b/include/property.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
 
 #ifndef PROPERTY_H
 #define PROPERTY_H 
diff --git a/include/propertyst.h b/include/propertyst.h
index 5c335d038..177fca171 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */
 
 #ifndef PROPERTYSTRUCT_H
 #define PROPERTYSTRUCT_H 
diff --git a/include/regionstr.h b/include/regionstr.h
index 29fcfbac4..192983dab 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.6 2003/12/06 13:24:29 kaleb Exp $ */
 /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
@@ -45,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
diff --git a/include/resource.h b/include/resource.h
index 6517ab212..49c189869 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
 
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
diff --git a/include/screenint.h b/include/screenint.h
index 988a7416c..b3e76c4c2 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
 #ifndef SCREENINT_H
 #define SCREENINT_H
 
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 0f1813c00..edd14c12f 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
 
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
diff --git a/include/servermd.h b/include/servermd.h
index 654e1411b..994f5c087 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -389,7 +389,7 @@ SOFTWARE.
 
 #endif /* ia64 */
 
-#if defined(__AMD64__) || defined(AMD64)
+#if defined(__amd64__) || defined(amd64)
 # define IMAGE_BYTE_ORDER	LSBFirst
 
 # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
diff --git a/include/site.h b/include/site.h
index 1c272fc3f..be8c003da 100644
--- a/include/site.h
+++ b/include/site.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
 
 #ifndef SITE_H
 #define SITE_H
diff --git a/include/swaprep.h b/include/swaprep.h
index b6671e7d9..2c026c659 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/swapreq.h b/include/swapreq.h
index 59ba8c5be..9c59bbf84 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/validate.h b/include/validate.h
index 2a13962a7..467533d22 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -24,7 +24,7 @@ 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */
 
 #ifndef VALIDATE_H
 #define VALIDATE_H
diff --git a/include/window.h b/include/window.h
index 0c886559e..5056512b8 100644
--- a/include/window.h
+++ b/include/window.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef WINDOW_H
 #define WINDOW_H
diff --git a/include/windowstr.h b/include/windowstr.h
index 2dce443d3..8e8d2542a 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
 
 #ifndef WINDOWSTRUCT_H
 #define WINDOWSTRUCT_H