summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-09-15 16:33:01 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-09-15 16:33:01 +0000
commit4a33b396f2e336c6121b24c2b66bff96f1b5cab2 (patch)
treec29ec4989a8aac92ae5402f32dc94f3b2817707e
parenta4033ce3f5b92089295937e860b2e075bb6dad07 (diff)
downloadxorg-proto-x11proto-4a33b396f2e336c6121b24c2b66bff96f1b5cab2.tar.gz
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE
-rw-r--r--Xfuncs.h2
-rw-r--r--Xmd.h1
-rw-r--r--Xos.h2
-rw-r--r--Xosdefs.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/Xfuncs.h b/Xfuncs.h
index bffd853..12a03ed 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -1,5 +1,5 @@
/*
- * $XdotOrg: xc/include/Xfuncs.h,v 1.1.4.3.2.1 2004/03/04 17:46:21 eich 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 bba4512..8c70de9 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -65,6 +65,7 @@ SOFTWARE.
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64__)) || \
defined(__amd64__) || defined(amd64) || \
+ defined(__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
#define LONG64 /* 32/64-bit architecture */
#endif
diff --git a/Xos.h b/Xos.h
index 70c16e0..a44eda7 100644
--- a/Xos.h
+++ b/Xos.h
@@ -1,5 +1,5 @@
/*
- * $XdotOrg: xc/include/Xos.h,v 1.1.4.5.2.1 2004/03/04 17:46:21 eich 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 756b039..d92e498 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -1,7 +1,7 @@
/*
* O/S-dependent (mis)feature macro definitions
*
- * $XdotOrg: xc/include/Xosdefs.h,v 1.1.4.2.4.1 2004/03/04 17:46:21 eich 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