Merge remote-tracking branch 'origin/released'

Conflicts:
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_conn.c
	libxcb/src/xcb_out.c
	libxcb/src/xcb_util.c
	xorg-server/dix/dispatch.c
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/os/connection.c

4 files changed, 22 insertions, 19 deletions

diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index a9fddfb5a..130549cdf 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -90,23 +90,23 @@ typedef struct _Client {
     Mask        clientAsMask;
     pointer     requestBuffer;
     pointer     osPrivate;	/* for OS layer, including scheduler */
-    char        swapped;
-    char        local;
-    char        big_requests;
-    char        closeDownMode;
-    char        clientGone;
-    char        noClientException;	/* this client died or needs to be
-					 * killed */
-    char	clientState;
+    Bool        swapped;
     ReplySwapPtr pSwapReplyFunc;
     XID         errorValue;
     unsigned short sequence;    //MH
+    int         closeDownMode;
+    int         clientGone;
+    int         noClientException;	/* this client died or needs to be
+					 * killed */
     int         ignoreCount;		/* count for Attend/IgnoreClient */
-    int         numSaved;
     SaveSetElt	*saveSet;
-    int         (**requestVector) (ClientPtr /* pClient */);
+    int         numSaved;
+    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 int replyBytesRemaining;
+    unsigned long replyBytesRemaining;
     int	    smart_priority;
-    int     smart_start_tick;
-    int     smart_stop_tick;
-    int     smart_check_tick;
+    long    smart_start_tick;
+    long    smart_stop_tick;
+    long    smart_check_tick;
     
     DeviceIntPtr clientPtr;
     ClientIdPtr  clientIds;
     unsigned short majorOp, minorOp;
-} ClientRec;
+}           ClientRec;
 
 /*
  * Scheduling interface
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index cc2ac32f3..9dabf1989 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -374,8 +374,9 @@ extern _X_EXPORT unsigned long serverGeneration;
 /* Don't use this directly, use BUG_WARN or BUG_WARN_MSG instead */
 #define __BUG_WARN_MSG(cond, with_msg, ...)                                \
           do { if (cond) {                                                \
-              ErrorF("BUG: triggered 'if (" #cond ")'\nBUG: %s:%d in %s()\n",     \
-                      __FILE__, __LINE__, __FUNCTION__);                      \
+              ErrorF("BUG: triggered 'if (" #cond ")'\n");                \
+              ErrorF("BUG: %s:%d in %s()\n",                              \
+                      __FILE__, __LINE__, __FUNCTION__);                  \
               if (with_msg) ErrorF(__VA_ARGS__);                          \
               xorg_backtrace();                                           \
           } } while(0)
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index b8c0d3b45..f62ada207 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -355,6 +355,8 @@ 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/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index d5640213e..04553f831 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -87,8 +87,8 @@ typedef struct _WindowOpt {
     struct _OtherClients *otherClients;	   /* default: NULL */
     struct _GrabRec	*passiveGrabs;	   /* default: NULL */
     PropertyPtr		userProps;	   /* default: NULL */
-    CARD32		backingBitPlanes;  /* default: ~0L */
-    CARD32		backingPixel;	   /* default: 0 */
+    unsigned long	backingBitPlanes;  /* default: ~0L */
+    unsigned long	backingPixel;	   /* default: 0 */
     RegionPtr		boundingShape;	   /* default: NULL */
     RegionPtr		clipShape;	   /* default: NULL */
     RegionPtr		inputShape;	   /* default: NULL */