Synchronised files

32 files changed, 161 insertions, 159 deletions

diff --git a/X11/Xdmcp.h b/X11/Xdmcp.h
index b01c03e81..7148c7afb 100644
--- a/X11/Xdmcp.h
+++ b/X11/Xdmcp.h
@@ -25,7 +25,7 @@ _XFUNCPROTOBEGIN
 #define XDM_PROTOCOL_VERSION	1

 #define XDM_UDP_PORT		177

 

-/* IANA has assigned FF0X:0:0:0:0:0:0:12B as the permanently assigned 

+/* IANA has assigned FF0X:0:0:0:0:0:0:12B as the permanently assigned

  * multicast addresses for XDMCP, where X in the prefix may be replaced

  * by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local,

  * 5 for Site-Local, and so on.  We set the default here to the Link-Local

diff --git a/X11/Xlib.h b/X11/Xlib.h
index b32390894..3a73d7b83 100644
--- a/X11/Xlib.h
+++ b/X11/Xlib.h
@@ -1691,6 +1691,7 @@ extern XHostAddress *XListHosts(
     int*		/* nhosts_return */,
     Bool*		/* state_return */
 );
+_X_DEPRECATED
 extern KeySym XKeycodeToKeysym(
     Display*		/* display */,
 #if NeedWidePrototypes
diff --git a/X11/Xlibint.h b/X11/Xlibint.h
index a55938b5b..9cc1f0d1b 100644
--- a/X11/Xlibint.h
+++ b/X11/Xlibint.h
@@ -420,6 +420,30 @@ extern LockInfoPtr _Xglobal_lock;
 #define WORD64ALIGN

 #endif /* WORD64 */

 

+/**

+ * Return a len-sized request buffer for the request type. This function may

+ * flush the output queue.

+ *

+ * @param dpy The display connection

+ * @param type The request type

+ * @param len Length of the request in bytes

+ *

+ * @returns A pointer to the request buffer with a few default values

+ * initialized.

+ */

+extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);

+

+/* GetReqSized is the same as GetReq but allows the caller to specify the

+ * size in bytes. 'sz' must be a multiple of 4! */

+

+#if !defined(UNIXCPP) || defined(ANSICPP)

+#define GetReqSized(name, sz, req) \

+	req = (x##name##Req *) _XGetRequest(dpy, X_##name, sz)

+#else

+#define GetReqSized(name, sz, req) \

+	req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, sz)

+#endif

+

 

 /*

  * GetReq - Get the next available X request packet in the buffer and

@@ -432,25 +456,10 @@ extern LockInfoPtr _Xglobal_lock;
 

 #if !defined(UNIXCPP) || defined(ANSICPP)

 #define GetReq(name, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\

-		_XFlush(dpy);\

-	req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\

-	req->reqType = X_##name;\

-	req->length = (SIZEOF(x##name##Req))>>2;\

-	dpy->bufptr += SIZEOF(x##name##Req);\

-	dpy->request++

-

+	GetReqSized(name, SIZEOF(x##name##Req), req)

 #else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */

 #define GetReq(name, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\

-		_XFlush(dpy);\

-	req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\

-	req->reqType = X_/**/name;\

-	req->length = (SIZEOF(x/**/name/**/Req))>>2;\

-	dpy->bufptr += SIZEOF(x/**/name/**/Req);\

-	dpy->request++

+	GetReqSized(name, SIZEOF(x/**/name/**/Req), req)

 #endif

 

 /* GetReqExtra is the same as GetReq, but allocates "n" additional

@@ -458,24 +467,10 @@ extern LockInfoPtr _Xglobal_lock;
 

 #if !defined(UNIXCPP) || defined(ANSICPP)

 #define GetReqExtra(name, n, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\

-		_XFlush(dpy);\

-	req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\

-	req->reqType = X_##name;\

-	req->length = (SIZEOF(x##name##Req) + n)>>2;\

-	dpy->bufptr += SIZEOF(x##name##Req) + n;\

-	dpy->request++

+        GetReqSized(name, SIZEOF(x##name##Req) + n, req)

 #else

 #define GetReqExtra(name, n, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(x/**/name/**/Req) + n) > dpy->bufmax)\

-		_XFlush(dpy);\

-	req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\

-	req->reqType = X_/**/name;\

-	req->length = (SIZEOF(x/**/name/**/Req) + n)>>2;\

-	dpy->bufptr += SIZEOF(x/**/name/**/Req) + n;\

-	dpy->request++

+        GetReqSized(name, SIZEOF(x/**/name/**/Req) + n, req)

 #endif

 

 

@@ -487,26 +482,12 @@ extern LockInfoPtr _Xglobal_lock;
 

 #if !defined(UNIXCPP) || defined(ANSICPP)

 #define GetResReq(name, rid, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\

-	    _XFlush(dpy);\

-	req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\

-	req->reqType = X_##name;\

-	req->length = 2;\

-	req->id = (rid);\

-	dpy->bufptr += SIZEOF(xResourceReq);\

-	dpy->request++

+	req = (xResourceReq *) _XGetRequest(dpy, X_##name, SIZEOF(xResourceReq)); \

+	req->id = (rid)

 #else

 #define GetResReq(name, rid, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\

-	    _XFlush(dpy);\

-	req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\

-	req->reqType = X_/**/name;\

-	req->length = 2;\

-	req->id = (rid);\

-	dpy->bufptr += SIZEOF(xResourceReq);\

-	dpy->request++

+	req = (xResourceReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xResourceReq)); \

+	req->id = (rid)

 #endif

 

 /*

@@ -515,24 +496,10 @@ extern LockInfoPtr _Xglobal_lock;
  */

 #if !defined(UNIXCPP) || defined(ANSICPP)

 #define GetEmptyReq(name, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\

-	    _XFlush(dpy);\

-	req = (xReq *) (dpy->last_req = dpy->bufptr);\

-	req->reqType = X_##name;\

-	req->length = 1;\

-	dpy->bufptr += SIZEOF(xReq);\

-	dpy->request++

+	req = (xReq *) _XGetRequest(dpy, X_##name, SIZEOF(xReq))

 #else

 #define GetEmptyReq(name, req) \

-        WORD64ALIGN\

-	if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\

-	    _XFlush(dpy);\

-	req = (xReq *) (dpy->last_req = dpy->bufptr);\

-	req->reqType = X_/**/name;\

-	req->length = 1;\

-	dpy->bufptr += SIZEOF(xReq);\

-	dpy->request++

+	req = (xReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xReq))

 #endif

 

 #ifdef WORD64

diff --git a/X11/Xmu/Atoms.h b/X11/Xmu/Atoms.h
index 2292edb4a..1d0228338 100644
--- a/X11/Xmu/Atoms.h
+++ b/X11/Xmu/Atoms.h
@@ -1,4 +1,4 @@
-/* 

+/*

 

 Copyright 1988, 1998  The Open Group

 

diff --git a/X11/Xmu/CharSet.h b/X11/Xmu/CharSet.h
index 8bf4b7b4c..36f76a75e 100644
--- a/X11/Xmu/CharSet.h
+++ b/X11/Xmu/CharSet.h
@@ -1,4 +1,4 @@
-/* 

+/*

 

 Copyright 1988, 1998  The Open Group

 

diff --git a/X11/Xmu/CloseHook.h b/X11/Xmu/CloseHook.h
index cbe1857bb..50552f68c 100644
--- a/X11/Xmu/CloseHook.h
+++ b/X11/Xmu/CloseHook.h
@@ -1,4 +1,4 @@
-/* 

+/*

 

 Copyright 1988, 1998  The Open Group

 

diff --git a/X11/Xmu/Converters.h b/X11/Xmu/Converters.h
index 083fdebbf..1947e382e 100644
--- a/X11/Xmu/Converters.h
+++ b/X11/Xmu/Converters.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/CurUtil.h b/X11/Xmu/CurUtil.h
index ce3d344c8..0e79d2159 100644
--- a/X11/Xmu/CurUtil.h
+++ b/X11/Xmu/CurUtil.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/CvtCache.h b/X11/Xmu/CvtCache.h
index 8ebec3722..794367ba1 100644
--- a/X11/Xmu/CvtCache.h
+++ b/X11/Xmu/CvtCache.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1989, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 

 /*

  *			       Public Interfaces

- * 

+ *

  * XmuCvtCache *XmuCvtCacheLookupDisplay (dpy)

  *     Display *dpy;

  */

diff --git a/X11/Xmu/DisplayQue.h b/X11/Xmu/DisplayQue.h
index 099844f59..5eb9191be 100644
--- a/X11/Xmu/DisplayQue.h
+++ b/X11/Xmu/DisplayQue.h
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The Open Group.
 

 /*

  *			      Public Entry Points

- * 

- * 

+ *

+ *

  * XmuDisplayQueue *XmuDQCreate (closefunc, freefunc, data)

  *     XmuCloseDisplayQueueProc closefunc;

  *     XmuFreeDisplayQueueProc freefunc;

  *     XPointer data;

- * 

+ *

  *         Creates and returns a queue into which displays may be placed.  When

  *         the display is closed, the closefunc (if non-NULL) is upcalled with

  *         as follows:

@@ -53,12 +53,12 @@ in this Software without prior written authorization from The Open Group.
  * Bool XmuDQDestroy (q, docallbacks)

  *     XmuDisplayQueue *q;

  *     Bool docallbacks;

- * 

+ *

  *         Releases all memory for the indicated display queue.  If docallbacks

- *         is true, then the closefunc (if non-NULL) is called for each 

+ *         is true, then the closefunc (if non-NULL) is called for each

  *         display.

- * 

- * 

+ *

+ *

  * XmuDisplayQueueEntry *XmuDQLookupDisplay (q, dpy)

  *     XmuDisplayQueue *q;

  *     Display *dpy;

@@ -66,7 +66,7 @@ in this Software without prior written authorization from The Open Group.
  *         Returns the queue entry for the specified display or NULL if the

  *         display is not in the queue.

  *

- * 

+ *

  * XmuDisplayQueueEntry *XmuDQAddDisplay (q, dpy, data)

  *     XmuDisplayQueue *q;

  *     Display *dpy;

@@ -77,13 +77,13 @@ in this Software without prior written authorization from The Open Group.
  *         caller to attach arbitrary data to this display in this queue.  The

  *         caller should use XmuDQLookupDisplay to make sure that the display

  *         hasn't already been added.

- * 

- * 

+ *

+ *

  * Bool XmuDQRemoveDisplay (q, dpy)

  *     XmuDisplayQueue *q;

  *     Display *dpy;

  *

- *         Removes the specified display from the given queue.  If the 

+ *         Removes the specified display from the given queue.  If the

  *         indicated display is not found on this queue, False is returned,

  *         otherwise True is returned.

  */

diff --git a/X11/Xmu/Drawing.h b/X11/Xmu/Drawing.h
index a99b4c1c4..bfb1c3c90 100644
--- a/X11/Xmu/Drawing.h
+++ b/X11/Xmu/Drawing.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/EditresP.h b/X11/Xmu/EditresP.h
index 0f1dd1260..d87f9464d 100644
--- a/X11/Xmu/EditresP.h
+++ b/X11/Xmu/EditresP.h
@@ -55,22 +55,22 @@ in this Software without prior written authorization from The Open Group.
 	Window:		32-bit value

 	Widget:		32-bit value

 	String8:        ListOfCard8

-	

+

 	[a][b][c] represent an exclusive list of choices.

 

-	All widgets are passed as a list of widgets, containing the 

+	All widgets are passed as a list of widgets, containing the

 	full instance heirarch of this widget.  The hierarchy is ordered

 	from parent to child.  Thus the first element of each list is

 	the root of the widget tree (this makes verifying that the widget

 	still exists, MUCH faster).

 

 	ListOfFoo comprises a list of things in the following format:

-	

+

 	number:			Card16

 	<number> things:	????

-	

+

   This is a synchronous protocol, every request MUST be followed by a

-  reply.  

+  reply.

 

   Request:

 

@@ -82,7 +82,7 @@ in this Software without prior written authorization from The Open Group.
 				  FindChild = 4,

 				  GetValues = 5 }

 	Length:		Card32

-	Data:		

+	Data:

 

    Reply:

 

@@ -132,7 +132,7 @@ in this Software without prior written authorization from The Open Group.
         of widgets for each widget in the tree.  This is enough information

         to completely reconstruct the entire widget heirarchy.

 

-	The window return value contains the Xid of the window currently 

+	The window return value contains the Xid of the window currently

 	used by this widget.  If the widget is unrealized then 0 is returned,

 	and if widget is a non-windowed object a value of 2 is returned.

 

@@ -152,20 +152,20 @@ in this Software without prior written authorization from The Open Group.
 		widget:		ListOfWidgets

 		message:	String8

 

-	SetValues will allow the same resource to be set on a number of 

+	SetValues will allow the same resource to be set on a number of

 	widgets.  This function will return an error message if the SetValues

 	request caused an Xt error.

-	

+

   GetValues:

 

-        names:                ListOfString8       

+        names:                ListOfString8

         widget:               Widget

 

         --->

 	novalues:             ListOfCard16

 	values:               ListOfString8

-                   

-        GetValues will allow a number of resource values to be read 

+

+        GetValues will allow a number of resource values to be read

         on a particular widget.  The request specifies the names of

 	the resources wanted and the widget id these resources are

 	from.  The reply returns a list of indices from the requests

@@ -191,10 +191,10 @@ in this Software without prior written authorization from The Open Group.
 		Resource:

 			Kind:	{normal, constraint}

 			Name:	String8

-			Class:	String8	

+			Class:	String8

 			Type:	String8 ]

 

-	GetResource retrieves the kind, name, class and type for every 

+	GetResource retrieves the kind, name, class and type for every

 	widget passed to it.  If an error occured with the resource fetch

 	Error will be set to True for the given widget and a message

 	is returned rather than the resource info.

@@ -221,23 +221,23 @@ in this Software without prior written authorization from The Open Group.
 		  BorderWidth:	Card16 ]

 

 	GetGeometry retreives the mapping state, x, y, width, height

-	and border width for each widget specified.  If an error occured 

-	with the geometry fetch "Error" will be set to True for the given 

-	widget and a message is returned rather than the geometry info.  

+	and border width for each widget specified.  If an error occured

+	with the geometry fetch "Error" will be set to True for the given

+	widget and a message is returned rather than the geometry info.

 	X an Y corrospond to the root coordinates of the upper left corner

 	of the widget (outside the window border).

-	

+

   FindChild:

 

 	Widget:		ListOfWidgets

 	X:		Int16

 	Y:		Int16

-	

+

 	--->

 

 	Widget:		ListOfWidgets

 

-	Find Child returns a descendent of the widget specified that 

+	Find Child returns a descendent of the widget specified that

 	is at the root coordinates specified.

 

 	NOTE:

@@ -247,20 +247,20 @@ in this Software without prior written authorization from The Open Group.
 

   GetValues:

 

-        names:                ListOfString8       

+        names:                ListOfString8

         widget:               Widget

 

         --->

-	

+

 	values:               ListOfString8

 

-        GetValues will allow a number of resource values to be read 

-        on a particular widget.  Currently only InterViews 3.0.1 Styles 

+        GetValues will allow a number of resource values to be read

+        on a particular widget.  Currently only InterViews 3.0.1 Styles

 	and their attributes are supported.  In addition, the current

 	user interface  only supports the return of 1 resource.  The ability

 	to specify and return multiple resources is defined for future editres

 	interfaces where some or all of a widgets resource values are returned

-	and displayed at once. 

+	and displayed at once.

 

 

 ************************************************************/

@@ -295,7 +295,7 @@ typedef enum {
   SendWidgetTree = 0,

 	       SetValues      = 1,

 	       GetResources   = 2,

-	       GetGeometry    = 3, 

+	       GetGeometry    = 3,

 	       FindChild      = 4,

 	       GetValues      = 5

 } EditresCommand;

@@ -335,7 +335,7 @@ _XFUNCPROTOBEGIN
 void _XEditResPutString8

 (

  ProtocolStream		*stream,

- char			*str

+ _Xconst char		*str

  );

 

 void _XEditResPut8

diff --git a/X11/Xmu/Error.h b/X11/Xmu/Error.h
index f0f26f0d4..5b459cb90 100644
--- a/X11/Xmu/Error.h
+++ b/X11/Xmu/Error.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/Initer.h b/X11/Xmu/Initer.h
index a952ce8f0..b7925bb0e 100644
--- a/X11/Xmu/Initer.h
+++ b/X11/Xmu/Initer.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/Misc.h b/X11/Xmu/Misc.h
index 9d70ae15b..039f51dde 100644
--- a/X11/Xmu/Misc.h
+++ b/X11/Xmu/Misc.h
@@ -30,13 +30,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 

                         All Rights Reserved

 

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

 provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

+both that copyright notice and this permission notice appear in

 supporting documentation, and that the name of Digital not be

 used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

+software without specific, written prior permission.

 

 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

diff --git a/X11/Xmu/StdCmap.h b/X11/Xmu/StdCmap.h
index 885c0f484..62eb0e8a0 100644
--- a/X11/Xmu/StdCmap.h
+++ b/X11/Xmu/StdCmap.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/StdSel.h b/X11/Xmu/StdSel.h
index 97d6d01fc..9c1663074 100644
--- a/X11/Xmu/StdSel.h
+++ b/X11/Xmu/StdSel.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/WinUtil.h b/X11/Xmu/WinUtil.h
index de1d0acaf..8bfaac3cd 100644
--- a/X11/Xmu/WinUtil.h
+++ b/X11/Xmu/WinUtil.h
@@ -1,5 +1,5 @@
 /*

- 

+

 Copyright 1988, 1998  The Open Group

 

 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/X11/Xmu/Xmu.h b/X11/Xmu/Xmu.h
index 8ab9d7913..7bcc1aa1a 100644
--- a/X11/Xmu/Xmu.h
+++ b/X11/Xmu/Xmu.h
@@ -1,4 +1,4 @@
-/* 

+/*

 

 Copyright 1988, 1998  The Open Group

 

@@ -49,14 +49,14 @@ typedef struct _XmuSegment {
   struct _XmuSegment *next;

 } XmuSegment;

 

-typedef struct _XmuScanline {   

+typedef struct _XmuScanline {

   int y;

   XmuSegment *segment;

   struct _XmuScanline *next;

 } XmuScanline;

-                              

+

 typedef struct _XmuArea {

-  XmuScanline *scanline;     

+  XmuScanline *scanline;

 } XmuArea;

 

 #define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)

diff --git a/X11/Xutil.h b/X11/Xutil.h
index a97f489f1..134b4058c 100644
--- a/X11/Xutil.h
+++ b/X11/Xutil.h
@@ -250,7 +250,7 @@ typedef struct _XComposeStatus {
 #define IsModifierKey(keysym) \

   ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \

    || (((KeySym)(keysym) >= XK_ISO_Lock) && \

-       ((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \

+       ((KeySym)(keysym) <= XK_ISO_Level5_Lock)) \

    || ((KeySym)(keysym) == XK_Mode_switch) \

    || ((KeySym)(keysym) == XK_Num_Lock))

 #else

diff --git a/X11/extensions/XLbx.h b/X11/extensions/XLbx.h
index ce8c835bf..1af4f9ce2 100644
--- a/X11/extensions/XLbx.h
+++ b/X11/extensions/XLbx.h
@@ -15,11 +15,11 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
- 
+
 #ifndef _XLBX_H_
 #define _XLBX_H_
 
diff --git a/X11/extensions/Xdbe.h b/X11/extensions/Xdbe.h
index 14ce53d35..5c842a445 100644
--- a/X11/extensions/Xdbe.h
+++ b/X11/extensions/Xdbe.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * 
+ *
  * Copyright (c) 1994, 1995  Hewlett-Packard Company
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -9,10 +9,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -20,12 +20,12 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  * Except as contained in this notice, the name of the Hewlett-Packard
  * Company shall not be used in advertising or otherwise to promote the
  * sale, use or other dealings in this Software without prior written
  * authorization from the Hewlett-Packard Company.
- * 
+ *
  *     Header file for Xlib-related DBE
  *
  *****************************************************************************/
diff --git a/X11/extensions/Xge.h b/X11/extensions/Xge.h
index 51382ffd0..76b5a6a01 100644
--- a/X11/extensions/Xge.h
+++ b/X11/extensions/Xge.h
@@ -36,7 +36,7 @@
 _XFUNCPROTOBEGIN
 
 /**
- * Generic Event mask. 
+ * Generic Event mask.
  * To be used whenever a list of masks per extension has to be provided.
  *
  * But, don't actually use the CARD{8,16,32} types.  We can't get them them
diff --git a/X11/extensions/dpms.h b/X11/extensions/dpms.h
index 57e98f8ee..f85e6a725 100644
--- a/X11/extensions/dpms.h
+++ b/X11/extensions/dpms.h
@@ -14,14 +14,14 @@ all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, 
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of Digital Equipment Corporation 
+Except as contained in this notice, the name of Digital Equipment Corporation
 shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital 
+dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
diff --git a/X11/extensions/extutil.h b/X11/extensions/extutil.h
index 031c520ae..29404d5ae 100644
--- a/X11/extensions/extutil.h
+++ b/X11/extensions/extutil.h
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  * Author:  Jim Fulton, MIT The Open Group
- * 
+ *
  *                     Xlib Extension-Writing Utilities
  *
  * This package contains utilities for writing the client API for various
@@ -123,7 +123,7 @@ extern void XextDestroyExtension(
 extern XExtDisplayInfo *XextAddDisplay(
     XExtensionInfo*	/* extinfo */,
     Display*		/* dpy */,
-    char*		/* ext_name */,
+    _Xconst char*	/* ext_name */,
     XExtensionHooks*	/* hooks */,
     int			/* nevents */,
     XPointer		/* data */
@@ -147,7 +147,7 @@ extern XExtDisplayInfo *XextFindDisplay(
 /*
  * helper macros to generate code that is common to all extensions; caller
  * should prefix it with static if extension source is in one file; this
- * could be a utility function, but have to stack 6 unused arguments for 
+ * could be a utility function, but have to stack 6 unused arguments for
  * something that is called many, many times would be bad.
  */
 #define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
diff --git a/X11/extensions/sync.h b/X11/extensions/sync.h
index a00d9c58a..d3a239f66 100644
--- a/X11/extensions/sync.h
+++ b/X11/extensions/sync.h
@@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or Olivetti
 not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
 SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -215,11 +215,11 @@ typedef struct {
 } XSyncAlarmNotifyEvent;
 
 /*
- *  Errors 
+ *  Errors
  */
 
 typedef struct {
-    int type;			
+    int type;
     Display *display;		/* Display the event was read from */
     XSyncAlarm alarm;		/* resource id */
     unsigned long serial;	/* serial number of failed request */
@@ -229,7 +229,7 @@ typedef struct {
 } XSyncAlarmError;
 
 typedef struct {
-    int type;			
+    int type;
     Display *display;		/* Display the event was read from */
     XSyncCounter counter;	/* resource id */
     unsigned long serial;	/* serial number of failed request */
@@ -238,7 +238,7 @@ typedef struct {
     unsigned char minor_code;	/* Minor op-code of failed request */
 } XSyncCounterError;
 
-/* 
+/*
  *  Prototypes
  */
 
diff --git a/X11/extensions/xtestext1.h b/X11/extensions/xtestext1.h
index 59cdd151d..67d015bb0 100644
--- a/X11/extensions/xtestext1.h
+++ b/X11/extensions/xtestext1.h
@@ -41,8 +41,8 @@ documentation, and that the name of Hewlett-Packard not be used in
 advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
 
-Hewlett-Packard makes no representations about the 
-suitability of this software for any purpose.  It is provided 
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.
 
 This software is not subject to any license of the American
diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h
index 09b2f2c8a..7de74edb4 100644
--- a/gl/internal/dri_interface.h
+++ b/gl/internal/dri_interface.h
@@ -84,6 +84,7 @@ typedef struct __DRIbufferRec			__DRIbuffer;
 typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;

 typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;

 typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;

+typedef struct __DRI2throttleExtensionRec	__DRI2throttleExtension;

 

 /*@}*/

 

@@ -284,6 +285,27 @@ struct __DRI2flushExtensionRec {
 

 

 /**

+ * Extension that the driver uses to request

+ * throttle callbacks.

+ */

+

+#define __DRI2_THROTTLE "DRI2_Throttle"

+#define __DRI2_THROTTLE_VERSION 1

+

+enum __DRI2throttleReason {

+   __DRI2_THROTTLE_SWAPBUFFER,

+   __DRI2_THROTTLE_COPYSUBBUFFER,

+   __DRI2_THROTTLE_FLUSHFRONT

+};

+

+struct __DRI2throttleExtensionRec {

+   __DRIextension base;

+   void (*throttle)(__DRIcontext *ctx,

+		    __DRIdrawable *drawable,

+		    enum __DRI2throttleReason reason);

+};

+

+/**

  * XML document describing the configuration options supported by the

  * driver.

  */

@@ -819,6 +841,7 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FORMAT_RGB565       0x1001

 #define __DRI_IMAGE_FORMAT_XRGB8888     0x1002

 #define __DRI_IMAGE_FORMAT_ARGB8888     0x1003

+#define __DRI_IMAGE_FORMAT_ABGR8888     0x1004

 

 #define __DRI_IMAGE_USE_SHARE		0x0001

 #define __DRI_IMAGE_USE_SCANOUT		0x0002

diff --git a/include/xcb/xproto.h b/include/xcb/xproto.h
index 9f7b2c6a9..2872c8c75 100644
--- a/include/xcb/xproto.h
+++ b/include/xcb/xproto.h
@@ -3863,6 +3863,7 @@ typedef struct xcb_change_keyboard_mapping_request_t {
     uint16_t      length; /**<  */

     xcb_keycode_t first_keycode; /**<  */

     uint8_t       keysyms_per_keycode; /**<  */

+    uint8_t       pad0[2]; /**<  */

 } xcb_change_keyboard_mapping_request_t;

 

 /**

diff --git a/libX11/src/QuColors.c b/libX11/src/QuColors.c
index 237b8bf03..d02958eca 100644
--- a/libX11/src/QuColors.c
+++ b/libX11/src/QuColors.c
@@ -73,8 +73,8 @@ _XQueryColors(
 
 int
 XQueryColors(
-    register Display * const dpy,
-    const Colormap cmap,
+    register Display * dpy,
+    Colormap cmap,
     XColor *defs, 		/* RETURN */
     int ncolors)
 {
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index aa2edf3e8..319973920 100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
@@ -204,7 +204,7 @@ RegisterResourceName(RESTYPE resource, const char *name)
     resource &= TypeMask;
 
     while (resource >= nresource) {
-	if (!double_size(&resources, nresource, sizeof(char *)))
+	if (!double_size((void*)&resources, nresource, sizeof(char *)))
 	    return;
 	nresource = nresource ? nresource * 2 : BASE_SIZE;
     }
@@ -300,7 +300,7 @@ dixResetRegistry(void)
 	free(errors[nerror]);
     free(errors);
 
-    free(resources);
+    free((void*)resources);
 
     requests = NULL;
     nminor = NULL;
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 39b209fe1..f0955fce4 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -44,6 +44,13 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
+#include "glapi/glthread.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef _GLAPI_NO_EXPORTS
 #  define _GLAPI_EXPORT
 #else /* _GLAPI_NO_EXPORTS */
@@ -81,7 +88,6 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 #define _glapi_Dispatch _mglapi_Dispatch
 #endif
 
-
 /*
  * Number of extension functions which we can dynamically add at runtime.
  */
@@ -178,3 +184,7 @@ extern struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 #endif
+
+#ifdef __cplusplus
+}
+#endif