Merge the new release from HEADXACE-SELINUX

5 files changed, 7 insertions, 4 deletions

diff --git a/X.h b/X.h
index 7643140..0a9c501 100644
--- a/X.h
+++ b/X.h
@@ -304,6 +304,9 @@ are reserved in the protocol for errors and replies. */
 #define FamilyChaos		2
 #define FamilyInternet6		6	/* IPv6 */
 
+/* authentication families not tied to a specific protocol */
+#define FamilyServerInterpreted 5
+
 /* Property notification */
 
 #define PropertyNewValue	0
diff --git a/Xfuncs.h b/Xfuncs.h
index 02c0e17..12a03ed 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/include/Xfuncs.h,v 1.1.4.2 2003/12/20 00:28:21 kaleb Exp $
+ * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $
  * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
  * 
  * 
diff --git a/Xmd.h b/Xmd.h
index 317bcff..bba4512 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -64,7 +64,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				/* 32/64-bit architecture */
 #endif
diff --git a/Xos.h b/Xos.h
index 05060c7..a44eda7 100644
--- a/Xos.h
+++ b/Xos.h
@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/include/Xos.h,v 1.1.4.4 2004/02/16 20:55:02 alanc Exp $
+ * $XdotOrg: xc/include/Xos.h,v 1.2 2004/04/23 18:43:05 eich Exp $
  * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
  * 
  * 
diff --git a/Xosdefs.h b/Xosdefs.h
index 77061e1..d92e498 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -1,7 +1,7 @@
 /*
  * O/S-dependent (mis)feature macro definitions
  *
- * $XdotOrg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
+ * $XdotOrg: xc/include/Xosdefs.h,v 1.2 2004/04/23 18:43:05 eich Exp $
  * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
  *
 Copyright 1991, 1998  The Open Group