From 4b3a011911ab70d5bfdc73394f1bf00cb9d1bd0b Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 15 Sep 2004 16:33:21 +0000
Subject: Pull XORG-6_8_0 to CYGWIN branch

---
 include/X11/Composite.h | 2 +-
 include/X11/Xtos.h      | 1 +
 src/Composite.c         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/X11/Composite.h b/include/X11/Composite.h
index e355154..0a58332 100644
--- a/include/X11/Composite.h
+++ b/include/X11/Composite.h
@@ -97,7 +97,7 @@ extern void XtChangeManagedSet(
 
 _XFUNCPROTOEND
 
-#ifndef COMPOSITE
+#ifndef XT_COMPOSITE
 externalref WidgetClass compositeWidgetClass;
 #endif
 
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
index 005cf0d..013b241 100644
--- a/include/X11/Xtos.h
+++ b/include/X11/Xtos.h
@@ -68,6 +68,7 @@ SOFTWARE.
     defined(__s390x__) || \
     (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
+    defined(__powerpc64__) || \
     (defined(sgi) && (_MIPS_SZLONG == 64))
 #define LONG64
 #endif
diff --git a/src/Composite.c b/src/Composite.c
index a2e43f4..27bc4a1 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */
 
-#define COMPOSITE
+#define XT_COMPOSITE
 #include "IntrinsicI.h"
 #include "StringDefs.h"
 
-- 
cgit v1.2.3