Merging XORG-CURRENT into trunkXACE-SELINUX-MERGECOMPOSITEWRAP

17 files changed, 18 insertions, 18 deletions

diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
index b45ef68..4ae08ab 100644
--- a/include/X11/CallbackI.h
+++ b/include/X11/CallbackI.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/CallbackI.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86$ */
 
 /****************************************************************
  *
diff --git a/include/X11/Composite.h b/include/X11/Composite.h
index 90a8ba4..e355154 100644
--- a/include/X11/Composite.h
+++ b/include/X11/Composite.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Composite.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _XtComposite_h
 #define _XtComposite_h
diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
index 674fdfb..02c0e5c 100644
--- a/include/X11/ConvertI.h
+++ b/include/X11/ConvertI.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.4 2003/04/21 16:34:26 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
 
 /* Representation types */
 
diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
index 482317b..87abb1d 100644
--- a/include/X11/CreateI.h
+++ b/include/X11/CreateI.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xt/CreateI.h,v 1.1 2001/08/22 22:52:17 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XtcreateI_h
 #define _XtcreateI_h
diff --git a/include/X11/EventI.h b/include/X11/EventI.h
index e2d7564..11e4e75 100644
--- a/include/X11/EventI.h
+++ b/include/X11/EventI.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/EventI.h,v 1.4 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */
 
 /* 
  * Event.h - exported types and functions for toolkit event handler
diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
index b5f185c..c2fe47c 100644
--- a/include/X11/InitialI.h
+++ b/include/X11/InitialI.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/InitialI.h,v 3.11 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */
 
 #ifndef _XtinitialI_h
 #define _XtinitialI_h
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h
index edbdfc2..603ecc0 100644
--- a/include/X11/Intrinsic.h
+++ b/include/X11/Intrinsic.h
@@ -48,7 +48,7 @@ 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/lib/Xt/Intrinsic.h,v 3.9 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */
 
 #ifndef _XtIntrinsic_h
 #define _XtIntrinsic_h
diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
index 6b0e8ef..9ce362c 100644
--- a/include/X11/IntrinsicI.h
+++ b/include/X11/IntrinsicI.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.9 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */
 
 #ifndef _XtintrinsicI_h
 #define _XtintrinsicI_h
diff --git a/include/X11/IntrinsicP.h b/include/X11/IntrinsicP.h
index ec70f05..aa0155d 100644
--- a/include/X11/IntrinsicP.h
+++ b/include/X11/IntrinsicP.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/IntrinsicP.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _XtintrinsicP_h
 #define _XtintrinsicP_h
diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
index 91c3de4..02e2964 100644
--- a/include/X11/PassivGraI.h
+++ b/include/X11/PassivGraI.h
@@ -51,7 +51,7 @@ 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/lib/Xt/PassivGraI.h,v 1.4 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */
 
 #ifndef _PDI_h_
 #define _PDI_h_
diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h
index 2fe22ee..a06cda7 100644
--- a/include/X11/ResConfigP.h
+++ b/include/X11/ResConfigP.h
@@ -52,7 +52,7 @@ dealings in this Software without prior written authorization from the IBM
 Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */
 
 #ifndef _RESCONFIGP_H
 #define _RESCONFIGP_H
diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
index 0957b96..488a160 100644
--- a/include/X11/ResourceI.h
+++ b/include/X11/ResourceI.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.6 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */
 
 /****************************************************************
  *
diff --git a/include/X11/ShellI.h b/include/X11/ShellI.h
index 33d45da..6a093d7 100644
--- a/include/X11/ShellI.h
+++ b/include/X11/ShellI.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xt/ShellI.h,v 1.1 2001/08/18 02:41:29 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XtShellInternal_h
 #define _XtShellInternal_h
diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
index 14d34b0..7813174 100644
--- a/include/X11/ThreadsI.h
+++ b/include/X11/ThreadsI.h
@@ -53,7 +53,7 @@ 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/lib/Xt/ThreadsI.h,v 3.6 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */
 
 #ifndef _XtThreadsI_h
 #define _XtThreadsI_h
diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
index 3af90eb..f67f6e2 100644
--- a/include/X11/TranslateI.h
+++ b/include/X11/TranslateI.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.4 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */
 
 /* 
  * TranslateI.h - Header file private to translation management
diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
index 87a26db..e15404a 100644
--- a/include/X11/VarargsI.h
+++ b/include/X11/VarargsI.h
@@ -25,7 +25,7 @@ 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/lib/Xt/VarargsI.h,v 3.7 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */
 
 #ifndef _VarargsI_h_ 
 #define _VarargsI_h_ 
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index f87fdb2..005cf0d 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Xtos.h,v 3.12tsi Exp $ */
 
 #ifndef _Xtos_h
 #define _Xtos_h
@@ -67,7 +67,7 @@ SOFTWARE.
     defined(__sparc64__) || \
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
-    defined(__AMD64__) || defined(AMD64) || \
+    defined(__amd64__) || defined(amd64) || \
     (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64
 #endif