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, 85 insertions, 85 deletions

diff --git a/libX11/src/DrPoints.c b/libX11/src/DrPoints.c
index 287fa057d..e8b092555 100644
--- a/libX11/src/DrPoints.c
+++ b/libX11/src/DrPoints.c
@@ -1,85 +1,85 @@
-/*
-
-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"
-
-int
-XDrawPoints(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    XPoint *points,
-    int n_points,
-    int mode) /* CoordMode */
-{
-    register xPolyPointReq *req;
-    register long nbytes;
-    int n;
-    int xoff, yoff;
-    XPoint pt;
-
-    xoff = yoff = 0;
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    while (n_points) {
-	GetReq(PolyPoint, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	req->coordMode = mode;
-	n = n_points;
-	if (!dpy->bigreq_size && n > (dpy->max_request_size - req->length))
-	    n = dpy->max_request_size - req->length;
-	SetReqLen(req, n, n);
-	nbytes = ((long)n) << 2; /* watch out for macros... */
-	if (xoff || yoff) {
-	    pt.x = xoff + points->x;
-	    pt.y = yoff + points->y;
-	    Data16 (dpy, (short *) &pt, 4);
-	    if (nbytes > 4) {
-		Data16 (dpy, (short *) (points + 1), nbytes - 4);
-	    }
-	} else {
-	    Data16 (dpy, (short *) points, nbytes);
-	}
-	n_points -= n;
-	if (n_points && (mode == CoordModePrevious)) {
-	    register XPoint *pptr = points;
-	    points += n;
-	    while (pptr != points) {
-		xoff += pptr->x;
-		yoff += pptr->y;
-		pptr++;
-	    }
-	} else
-	    points += n;
-    }
-    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"

+

+int

+XDrawPoints(

+    register Display *dpy,

+    Drawable d,

+    GC gc,

+    XPoint *points,

+    int n_points,

+    int mode) /* CoordMode */

+{

+    register xPolyPointReq *req;

+    register long nbytes;

+    int n;

+    int xoff, yoff;

+    XPoint pt;

+

+    xoff = yoff = 0;

+    LockDisplay(dpy);

+    FlushGC(dpy, gc);

+    while (n_points) {

+	GetReq(PolyPoint, req);

+	req->drawable = d;

+	req->gc = gc->gid;

+	req->coordMode = mode;

+	n = n_points;

+	if (!dpy->bigreq_size && n > (dpy->max_request_size - req->length))

+	    n = dpy->max_request_size - req->length;

+	SetReqLen(req, n, n);

+	nbytes = ((long)n) << 2; /* watch out for macros... */

+	if (xoff || yoff) {

+	    pt.x = xoff + points->x;

+	    pt.y = yoff + points->y;

+	    Data16 (dpy, (short *) &pt, 4);

+	    if (nbytes > 4) {

+		Data16 (dpy, (short *) (points + 1), nbytes - 4);

+	    }

+	} else {

+	    Data16 (dpy, (short *) points, nbytes);

+	}

+	n_points -= n;

+	if (n_points && (mode == CoordModePrevious)) {

+	    register XPoint *pptr = points;

+	    points += n;

+	    while (pptr != points) {

+		xoff += pptr->x;

+		yoff += pptr->y;

+		pptr++;

+	    }

+	} else

+	    points += n;

+    }

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return 1;

+}