summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/X11/Composite.h2
-rw-r--r--include/X11/Xtos.h1
-rw-r--r--src/Composite.c2
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"