Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 97 insertions, 97 deletions

diff --git a/libX11/src/FillRct.c b/libX11/src/FillRct.c
index 4cd104cb1..957f55a04 100644
--- a/libX11/src/FillRct.c
+++ b/libX11/src/FillRct.c
@@ -1,97 +1,97 @@
-/*
-
-Copyright 1986, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, 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 Open Group 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 Open Group.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-
-/* precompute the maximum size of batching request allowed */
-
-#define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle))
-
-int
-XFillRectangle(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y, /* INT16 */
-    unsigned int width,
-    unsigned int height) /* CARD16 */
-{
-    xRectangle *rect;
-#ifdef MUSTCOPY
-    xRectangle rectdata;
-    long len = SIZEOF(xRectangle);
-
-    rect = &rectdata;
-#endif /* MUSTCOPY */
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    {
-    register xPolyFillRectangleReq *req
-		= (xPolyFillRectangleReq *) dpy->last_req;
-
-    /* if same as previous request, with same drawable, batch requests */
-    if (
-          (req->reqType == X_PolyFillRectangle)
-       && (req->drawable == d)
-       && (req->gc == gc->gid)
-       && ((dpy->bufptr + SIZEOF(xRectangle)) <= dpy->bufmax)
-       && (((char *)dpy->bufptr - (char *)req) < size) ) {
-	 req->length += SIZEOF(xRectangle) >> 2;
-#ifndef MUSTCOPY
-         rect = (xRectangle *) dpy->bufptr;
-	 dpy->bufptr += SIZEOF(xRectangle);
-#endif /* not MUSTCOPY */
-	 }
-
-    else {
-	GetReqExtra(PolyFillRectangle, SIZEOF(xRectangle), req);
-	req->drawable = d;
-	req->gc = gc->gid;
-#ifdef MUSTCOPY
-	dpy->bufptr -= SIZEOF(xRectangle);
-#else
-	rect = (xRectangle *) NEXTPTR(req,xPolyFillRectangleReq);
-#endif /* MUSTCOPY */
-	}
-    rect->x = x;
-    rect->y = y;
-    rect->width = width;
-    rect->height = height;
-
-#ifdef MUSTCOPY
-    Data (dpy, (char *) rect, len);
-#endif /* MUSTCOPY */
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-}
+/*

+

+Copyright 1986, 1998  The Open Group

+

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

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+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.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, 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 Open Group 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 Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+

+/* precompute the maximum size of batching request allowed */

+

+#define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle))

+

+int

+XFillRectangle(

+    register Display *dpy,

+    Drawable d,

+    GC gc,

+    int x,

+    int y, /* INT16 */

+    unsigned int width,

+    unsigned int height) /* CARD16 */

+{

+    xRectangle *rect;

+#ifdef MUSTCOPY

+    xRectangle rectdata;

+    long len = SIZEOF(xRectangle);

+

+    rect = &rectdata;

+#endif /* MUSTCOPY */

+

+    LockDisplay(dpy);

+    FlushGC(dpy, gc);

+

+    {

+    register xPolyFillRectangleReq *req

+		= (xPolyFillRectangleReq *) dpy->last_req;

+

+    /* if same as previous request, with same drawable, batch requests */

+    if (

+          (req->reqType == X_PolyFillRectangle)

+       && (req->drawable == d)

+       && (req->gc == gc->gid)

+       && ((dpy->bufptr + SIZEOF(xRectangle)) <= dpy->bufmax)

+       && (((char *)dpy->bufptr - (char *)req) < size) ) {

+	 req->length += SIZEOF(xRectangle) >> 2;

+#ifndef MUSTCOPY

+         rect = (xRectangle *) dpy->bufptr;

+	 dpy->bufptr += SIZEOF(xRectangle);

+#endif /* not MUSTCOPY */

+	 }

+

+    else {

+	GetReqExtra(PolyFillRectangle, SIZEOF(xRectangle), req);

+	req->drawable = d;

+	req->gc = gc->gid;

+#ifdef MUSTCOPY

+	dpy->bufptr -= SIZEOF(xRectangle);

+#else

+	rect = (xRectangle *) NEXTPTR(req,xPolyFillRectangleReq);

+#endif /* MUSTCOPY */

+	}

+    rect->x = x;

+    rect->y = y;

+    rect->width = width;

+    rect->height = height;

+

+#ifdef MUSTCOPY

+    Data (dpy, (char *) rect, len);

+#endif /* MUSTCOPY */

+    }

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return 1;

+}