Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 101 insertions, 101 deletions

diff --git a/libX11/src/DrLine.c b/libX11/src/DrLine.c
index c25efad9e..3786f5933 100644
--- a/libX11/src/DrLine.c
+++ b/libX11/src/DrLine.c
@@ -1,101 +1,101 @@
-/*

-

-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 wsize (SIZEOF(xPolySegmentReq) + WLNSPERBATCH * SIZEOF(xSegment))

-#define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment))

-

-int

-XDrawLine (

-    register Display *dpy,

-    Drawable d,

-    GC gc,

-    int x1,

-    int y1,

-    int x2,

-    int y2)

-{

-    register xSegment *segment;

-#ifdef MUSTCOPY

-    xSegment segmentdata;

-    long len = SIZEOF(xSegment);

-

-    segment = &segmentdata;

-#endif /* not MUSTCOPY */

-

-    LockDisplay(dpy);

-    FlushGC(dpy, gc);

-

-    {

-    register xPolySegmentReq *req = (xPolySegmentReq *) dpy->last_req;

-

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

-    if (

-          (req->reqType == X_PolySegment)

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

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

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

-       && (((char *)dpy->bufptr - (char *)req) < (gc->values.line_width ?

-						  wsize : zsize)) ) {

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

-#ifndef MUSTCOPY

-         segment = (xSegment *) dpy->bufptr;

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

-#endif /* not MUSTCOPY */

-	 }

-

-    else {

-	GetReqExtra (PolySegment, SIZEOF(xSegment), req);

-	req->drawable = d;

-	req->gc = gc->gid;

-#ifdef MUSTCOPY

-	dpy->bufptr -= SIZEOF(xSegment);

-#else

-	segment = (xSegment *) NEXTPTR(req,xPolySegmentReq);

-#endif /* MUSTCOPY */

-	}

-

-    segment->x1 = x1;

-    segment->y1 = y1;

-    segment->x2 = x2;

-    segment->y2 = y2;

-

-#ifdef MUSTCOPY

-    Data (dpy, (char *) &segmentdata, 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 wsize (SIZEOF(xPolySegmentReq) + WLNSPERBATCH * SIZEOF(xSegment))
+#define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment))
+
+int
+XDrawLine (
+    register Display *dpy,
+    Drawable d,
+    GC gc,
+    int x1,
+    int y1,
+    int x2,
+    int y2)
+{
+    register xSegment *segment;
+#ifdef MUSTCOPY
+    xSegment segmentdata;
+    long len = SIZEOF(xSegment);
+
+    segment = &segmentdata;
+#endif /* not MUSTCOPY */
+
+    LockDisplay(dpy);
+    FlushGC(dpy, gc);
+
+    {
+    register xPolySegmentReq *req = (xPolySegmentReq *) dpy->last_req;
+
+    /* if same as previous request, with same drawable, batch requests */
+    if (
+          (req->reqType == X_PolySegment)
+       && (req->drawable == d)
+       && (req->gc == gc->gid)
+       && ((dpy->bufptr + SIZEOF(xSegment)) <= dpy->bufmax)
+       && (((char *)dpy->bufptr - (char *)req) < (gc->values.line_width ?
+						  wsize : zsize)) ) {
+	 req->length += SIZEOF(xSegment) >> 2;
+#ifndef MUSTCOPY
+         segment = (xSegment *) dpy->bufptr;
+	 dpy->bufptr += SIZEOF(xSegment);
+#endif /* not MUSTCOPY */
+	 }
+
+    else {
+	GetReqExtra (PolySegment, SIZEOF(xSegment), req);
+	req->drawable = d;
+	req->gc = gc->gid;
+#ifdef MUSTCOPY
+	dpy->bufptr -= SIZEOF(xSegment);
+#else
+	segment = (xSegment *) NEXTPTR(req,xPolySegmentReq);
+#endif /* MUSTCOPY */
+	}
+
+    segment->x1 = x1;
+    segment->y1 = y1;
+    segment->x2 = x2;
+    segment->y2 = y2;
+
+#ifdef MUSTCOPY
+    Data (dpy, (char *) &segmentdata, len);
+#endif /* MUSTCOPY */
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    }
+    return 1;
+}
+