Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

19 files changed, 25 insertions, 21 deletions

diff --git a/include/access.h b/include/access.h
index 4b9efc0..19c774c 100644
--- a/include/access.h
+++ b/include/access.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)access.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/access.h,v 1.5 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/access.h,v 1.4 2001/01/17 23:45:30 dawes Exp $ */
 
 #ifndef _ACCESS_H_
 #define _ACCESS_H_
diff --git a/include/accstr.h b/include/accstr.h
index 991a1fa..50a134d 100644
--- a/include/accstr.h
+++ b/include/accstr.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)accstr.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.7 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.6 2001/06/25 20:40:18 paulo Exp $ */
 
 #ifndef _ACCSTR_H_
 #define _ACCSTR_H_
diff --git a/include/auth.h b/include/auth.h
index 06958ce..0ea06f0 100644
--- a/include/auth.h
+++ b/include/auth.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)auth.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/auth.h,v 1.6 2001/12/14 20:01:36 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/auth.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _AUTH_H_
 #define _AUTH_H_
diff --git a/include/cache.h b/include/cache.h
index 4f75abd..7e5a2b2 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)cache.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/cache.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/cache.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _CACHE_H_
 #define	_CACHE_H_
diff --git a/include/client.h b/include/client.h
index 5f484ab..722959d 100644
--- a/include/client.h
+++ b/include/client.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/client.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/client.h,v 1.6 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef	_CLIENT_H_
 #define	_CLIENT_H_
diff --git a/include/clientstr.h b/include/clientstr.h
index 100a1ce..4f977ce 100644
--- a/include/clientstr.h
+++ b/include/clientstr.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.6 2001/08/28 23:44:53 paulo Exp $ */
 
 #ifndef _CLIENTSTR_H_
 #define	_CLIENTSTR_H_
diff --git a/include/difsfn.h b/include/difsfn.h
index 9005ff5..a55a9f8 100644
--- a/include/difsfn.h
+++ b/include/difsfn.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _DIFSFONT_H_
 #define _DIFSFONT_H_
diff --git a/include/difsfnst.h b/include/difsfnst.h
index 301efea..4353155 100644
--- a/include/difsfnst.h
+++ b/include/difsfnst.h
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.5 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */
 
 #ifndef _DIFSFONTST_H_
 #define _DIFSFONTST_H_
diff --git a/include/difsutils.h b/include/difsutils.h
index 2a31631..d8a1ef4 100644
--- a/include/difsutils.h
+++ b/include/difsutils.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.5 2002/10/15 01:45:03 dawes Exp $
+ * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.4 2001/06/25 20:40:18 paulo Exp $
  */
 
 /************************************************************
diff --git a/include/dispatch.h b/include/dispatch.h
index ba359da..c476d17 100644
--- a/include/dispatch.h
+++ b/include/dispatch.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/dispatch.h,v 1.3 2001/08/28 23:44:54 paulo Exp $
+ * $XFree86: xc/programs/xfs/include/dispatch.h,v 1.2 1999/03/07 11:41:00 dawes Exp $
  */
 
 /************************************************************
diff --git a/include/extentst.h b/include/extentst.h
index 3249c73..48a5dca 100644
--- a/include/extentst.h
+++ b/include/extentst.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)extentst.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.7 2003/07/16 01:39:17 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.6 2001/12/14 20:01:38 dawes Exp $ */
 
 #ifndef _EXTENTST_H_
 #define _EXTENTST_H_
diff --git a/include/fsevents.h b/include/fsevents.h
index 1047235..7ed50fb 100644
--- a/include/fsevents.h
+++ b/include/fsevents.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from the X Consortium.
  * @(#)events.h	4.2	91/05/03
  *
  */
-/* $XFree86: xc/programs/xfs/include/fsevents.h,v 1.3 1998/10/25 12:48:04 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _EVENTS_H_
 #define _EVENTS_H_
diff --git a/include/fsresource.h b/include/fsresource.h
index 3f4c204..d68343e 100644
--- a/include/fsresource.h
+++ b/include/fsresource.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from the X Consortium.
  * @(#)resource.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.4 1999/03/07 11:41:01 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.3 1998/10/25 12:48:04 dawes Exp $ */
 
 #ifndef _RESOURCE_H_
 #define _RESOURCE_H_
diff --git a/include/misc.h b/include/misc.h
index a6de816..43d8733 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/misc.h,v 3.9 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/misc.h,v 3.8 2001/07/25 15:05:21 dawes Exp $ */
 
 #ifndef _MISC_H_
 #define _MISC_H_
diff --git a/include/os.h b/include/os.h
index 52e7b14..bfc1074 100644
--- a/include/os.h
+++ b/include/os.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)os.h,v 4.2 1991/05/10 07:59:16 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/include/os.h,v 3.15 2004/01/07 03:47:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/os.h,v 3.14 2002/10/15 01:45:03 dawes Exp $ */
 
 #ifndef	_OS_H_
 #define	_OS_H_
diff --git a/include/osstruct.h b/include/osstruct.h
index be758b3..686f4da 100644
--- a/include/osstruct.h
+++ b/include/osstruct.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osstruct.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.4 2001/12/14 20:01:38 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.3 2001/07/29 22:08:16 tsi Exp $ */
 
 #ifndef _OSSTRUCT_H_
 #define _OSSTRUCT_H_
diff --git a/include/servermd.h b/include/servermd.h
index a2b8cf9..6e5cc8a 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -44,17 +44,21 @@ in this Software without prior written authorization from The Open Group.
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.5 2001/12/19 21:37:35 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.4 2001/12/14 20:01:38 dawes Exp $ */
 
 #ifndef _SERVERMD_H_
 #define _SERVERMD_H_
 
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE 6600
+#define VENDOR_RELEASE 6700
 #endif
 
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The XFree86 Project (experimental version)"
+# if defined VENDORNAME
+#  define VENDOR_STRING VENDORNAME
+# else
+#  define VENDOR_STRING "X.Org Foundation"
+# endif
 #endif
 
 #ifndef DEFAULT_FS_PORT
diff --git a/include/swaprep.h b/include/swaprep.h
index df15318..ca91141 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/swaprep.h,v 1.1 1998/10/25 07:12:32 dawes Exp $
+ * $XFree86$
  */
 
 /************************************************************
diff --git a/include/swapreq.h b/include/swapreq.h
index 698aa34..b3d4e3d 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xfs/include/swapreq.h,v 1.2 2001/06/25 20:40:18 paulo Exp $
+ * $XFree86: xc/programs/xfs/include/swapreq.h,v 1.1 1998/10/25 07:12:32 dawes Exp $
  */
 
 /************************************************************