diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-09 13:07:25 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-09 13:07:25 -0800 |
| commit | 0b113f7cdf5228dccd51a749a339c8669e3f20ff (patch) | |
| tree | 5fe6eb1f0b7b79194e6c5f7fdb9604b5a948068b /include | |
| parent | 0b2c6491c5e5e1c9ba067299f3de61f5acee263b (diff) | |
| parent | 777bf90abeac37087a3d0538b847742523d5acf2 (diff) | |
Merge commit '777bf90abeac37087a3d0538b847742523d5acf2'
Diffstat (limited to 'include')
| -rw-r--r-- | include/dixstruct.h | 30 | ||||
| -rw-r--r-- | include/os.h | 2 | ||||
| -rw-r--r-- | include/windowstr.h | 4 |
3 files changed, 17 insertions, 19 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h index 0a85f40b6..cb370519e 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -90,23 +90,23 @@ typedef struct _Client { Mask clientAsMask; pointer requestBuffer; pointer osPrivate; /* for OS layer, including scheduler */ - Bool swapped; + char swapped; + char local; + char big_requests; + char closeDownMode; + char clientGone; + char noClientException; /* this client died or needs to be + * killed */ + char clientState; ReplySwapPtr pSwapReplyFunc; XID errorValue; int sequence; - int closeDownMode; - int clientGone; - int noClientException; /* this client died or needs to be - * killed */ int ignoreCount; /* count for Attend/IgnoreClient */ - SaveSetElt *saveSet; int numSaved; - int (**requestVector) ( - ClientPtr /* pClient */); + SaveSetElt *saveSet; + int (**requestVector) (ClientPtr /* pClient */); CARD32 req_len; /* length of current request */ - Bool big_requests; /* supports large requests */ int priority; - ClientState clientState; PrivateRec *devPrivates; unsigned short xkbClientFlags; unsigned short mapNotifyMask; @@ -114,16 +114,16 @@ typedef struct _Client { unsigned short vMajor,vMinor; KeyCode minKC,maxKC; - unsigned long replyBytesRemaining; + unsigned int replyBytesRemaining; int smart_priority; - long smart_start_tick; - long smart_stop_tick; - long smart_check_tick; + int smart_start_tick; + int smart_stop_tick; + int smart_check_tick; DeviceIntPtr clientPtr; ClientIdPtr clientIds; unsigned short majorOp, minorOp; -} ClientRec; +} ClientRec; /* * Scheduling interface diff --git a/include/os.h b/include/os.h index 48ce32962..84dedd5cb 100644 --- a/include/os.h +++ b/include/os.h @@ -353,8 +353,6 @@ typedef struct sockaddr * sockaddrPtr; extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client); -extern _X_EXPORT int LocalClient(ClientPtr /* client */); - extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *); #define LCC_UID_SET (1 << 0) diff --git a/include/windowstr.h b/include/windowstr.h index 222de31dc..1124dfc4c 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -87,8 +87,8 @@ typedef struct _WindowOpt { struct _OtherClients *otherClients; /* default: NULL */ struct _GrabRec *passiveGrabs; /* default: NULL */ PropertyPtr userProps; /* default: NULL */ - unsigned long backingBitPlanes; /* default: ~0L */ - unsigned long backingPixel; /* default: 0 */ + CARD32 backingBitPlanes; /* default: ~0L */ + CARD32 backingPixel; /* default: 0 */ RegionPtr boundingShape; /* default: NULL */ RegionPtr clipShape; /* default: NULL */ RegionPtr inputShape; /* default: NULL */ |