diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-10-18 14:24:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:28:24 -0400 |
| commit | abbd85742a390e18497b96902a0c0d976739e3bd (patch) | |
| tree | cf480cccb1ff075810d0d73c36b05a2099ae7fc8 /include | |
| parent | dff81687f5eac3eac9b49f58d4654cc30add2547 (diff) | |
dix: FIXES is not optional
It's already not optional at configure time, this just makes it so at
build time too.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/cursorstr.h | 2 | ||||
| -rw-r--r-- | include/dixstruct.h | 11 | ||||
| -rw-r--r-- | include/extinit.h | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/include/cursorstr.h b/include/cursorstr.h index 68ab2ecfd..2157954c9 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -78,10 +78,8 @@ typedef struct _Cursor { int refcnt; PrivateRec *devPrivates; /* set by pScr->RealizeCursor */ XID id; -#ifdef XFIXES CARD32 serialNumber; Atom name; -#endif } CursorRec; #define CURSOR_REC_SIZE (sizeof(CursorRec) + dixPrivatesSize(PRIVATE_CURSOR)) diff --git a/include/dixstruct.h b/include/dixstruct.h index aef822ca2..0be7f0e27 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -61,7 +61,6 @@ typedef enum { ClientStateInitial, ClientStateGone } ClientState; -#ifdef XFIXES typedef struct _saveSet { struct _Window *windowPtr; Bool toRoot; @@ -73,16 +72,6 @@ typedef struct _saveSet { #define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w)) #define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr)) #define SaveSetAssignMap(ss,m) ((ss).map = (m)) -#else -typedef struct _Window *SaveSetElt; - -#define SaveSetWindow(ss) (ss) -#define SaveSetToRoot(ss) FALSE -#define SaveSetShouldMap(ss) TRUE -#define SaveSetAssignWindow(ss,w) ((ss) = (w)) -#define SaveSetAssignToRoot(ss,tr) -#define SaveSetAssignMap(ss,m) -#endif typedef struct _Client { pointer requestBuffer; diff --git a/include/extinit.h b/include/extinit.h index 5690d7b01..6d67bf2e5 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -140,10 +140,8 @@ extern void XFree86BigfontExtensionInit(void); extern void BigReqExtensionInit(void); -#ifdef XFIXES extern _X_EXPORT Bool noXFixesExtension; extern void XFixesExtensionInit(void); -#endif extern void XInputExtensionInit(void); extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev, |