From 81fd17c8678e89cea6610b8b2996b028b21eb5dc Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 7 Oct 2013 08:23:46 +0200 Subject: xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013 xserver commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a xkeyboard-config commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 pixman commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7 fontconfig commit 604c2a683f1357fc65bad372b5d25a90099f827f mesa commit cfbfb50cb8d47b7f6975828b504936f9324f3b12 --- xorg-server/include/cursorstr.h | 2 -- xorg-server/include/dixstruct.h | 11 ----------- xorg-server/include/extinit.h | 2 -- xorg-server/include/list.h | 2 +- xorg-server/include/privates.h | 1 - 5 files changed, 1 insertion(+), 17 deletions(-) (limited to 'xorg-server/include') diff --git a/xorg-server/include/cursorstr.h b/xorg-server/include/cursorstr.h index 68ab2ecfd..2157954c9 100644 --- a/xorg-server/include/cursorstr.h +++ b/xorg-server/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/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index aef822ca2..0be7f0e27 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/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/xorg-server/include/extinit.h b/xorg-server/include/extinit.h index 5690d7b01..6d67bf2e5 100644 --- a/xorg-server/include/extinit.h +++ b/xorg-server/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, diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h index 11de7c561..455c670d3 100644 --- a/xorg-server/include/list.h +++ b/xorg-server/include/list.h @@ -213,7 +213,7 @@ xorg_list_del(struct xorg_list *entry) * * @return True if the list contains one or more elements or False otherwise. */ -static inline Bool +static inline int xorg_list_is_empty(struct xorg_list *head) { return head->next == head; diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h index 2c8864b8a..0abdce784 100644 --- a/xorg-server/include/privates.h +++ b/xorg-server/include/privates.h @@ -46,7 +46,6 @@ typedef enum { PRIVATE_CURSOR_BITS, /* extension privates */ - PRIVATE_DBE_WINDOW, PRIVATE_DAMAGE, PRIVATE_GLYPH, PRIVATE_GLYPHSET, -- cgit v1.2.3