Merge remote-tracking branch 'alanc/master'

This commit is contained in:
Keith Packard
2011-09-21 14:30:19 -07:00
12 changed files with 621 additions and 543 deletions

View File

@@ -57,12 +57,11 @@ extern _X_EXPORT void ReplyNotSwappd (
void * /* pbuf */) _X_NORETURN;
typedef enum {ClientStateInitial,
ClientStateAuthenticating,
ClientStateRunning,
/* 1 is unused now, was ClientStateAuthenticating */
ClientStateRunning = 2,
ClientStateRetained,
ClientStateGone,
ClientStateCheckingSecurity,
ClientStateCheckedSecurity} ClientState;
ClientStateGone
} ClientState;
#ifdef XFIXES
typedef struct _saveSet {