diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-07-31 01:21:51 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-07-31 01:21:51 +0000 |
| commit | 7a541dcaa28b6f97a647d0d8e0873f665ea372aa (patch) | |
| tree | 461743977b0880a8d5a6f2785f652a44dee7968a | |
| parent | b83924fa380f9e68c0c8a9dada6094c95fc44441 (diff) | |
Rename some COMPOSITE macros and enums to avoid conflicting with theXORG-6_7_99_1
COMPOSITE extension's new macro. These appear to only be used
internally.
| -rw-r--r-- | include/X11/Composite.h | 2 | ||||
| -rw-r--r-- | src/Composite.c | 2 |
2 files changed, 2 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/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" |