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

diff --git a/libX11/src/GetPntMap.c b/libX11/src/GetPntMap.c
index a89d28aed..0fcdb6696 100644
--- a/libX11/src/GetPntMap.c
+++ b/libX11/src/GetPntMap.c
@@ -1,123 +1,123 @@
-/*

-

-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"

-

-#ifdef MIN		/* some systems define this in <sys/param.h> */

-#undef MIN

-#endif

-#define MIN(a, b) ((a) < (b) ? (a) : (b))

-

-int XGetPointerMapping (

-    register Display *dpy,

-    unsigned char *map,	/* RETURN */

-    int nmaps)

-

-{

-    unsigned char mapping[256];	/* known fixed size */

-    long nbytes, remainder = 0;

-    xGetPointerMappingReply rep;

-    register xReq *req;

-

-    LockDisplay(dpy);

-    GetEmptyReq(GetPointerMapping, req);

-    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return 0;

-    }

-

-    nbytes = (long)rep.length << 2;

-

-    /* Don't count on the server returning a valid value */

-    if (nbytes > sizeof mapping) {

-	remainder = nbytes - sizeof mapping;

-	nbytes = sizeof mapping;

-    }

-    _XRead (dpy, (char *)mapping, nbytes);

-    /* don't return more data than the user asked for. */

-    if (rep.nElts) {

-	    memcpy ((char *) map, (char *) mapping,

-		MIN((int)rep.nElts, nmaps) );

-	}

-

-    if (remainder)

-	_XEatData(dpy, (unsigned long)remainder);

-

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return ((int) rep.nElts);

-}

-

-KeySym *

-XGetKeyboardMapping (Display *dpy,

-#if NeedWidePrototypes

-			     unsigned int first_keycode,

-#else

-			     KeyCode first_keycode,

-#endif

-			     int count,

-			     int *keysyms_per_keycode)

-{

-    long nbytes;

-    unsigned long nkeysyms;

-    register KeySym *mapping = NULL;

-    xGetKeyboardMappingReply rep;

-    register xGetKeyboardMappingReq *req;

-

-    LockDisplay(dpy);

-    GetReq(GetKeyboardMapping, req);

-    req->firstKeyCode = first_keycode;

-    req->count = count;

-    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return (KeySym *) NULL;

-    }

-

-    nkeysyms = (unsigned long) rep.length;

-    if (nkeysyms > 0) {

-	nbytes = nkeysyms * sizeof (KeySym);

-	mapping = (KeySym *) Xmalloc ((unsigned) nbytes);

-	nbytes = nkeysyms << 2;

-	if (! mapping) {

-	    _XEatData(dpy, (unsigned long) nbytes);

-	    UnlockDisplay(dpy);

-	    SyncHandle();

-	    return (KeySym *) NULL;

-	}

-	_XRead32 (dpy, (long *) mapping, nbytes);

-    }

-    *keysyms_per_keycode = rep.keySymsPerKeyCode;

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return (mapping);

-}

-

+/*
+
+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"
+
+#ifdef MIN		/* some systems define this in <sys/param.h> */
+#undef MIN
+#endif
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+int XGetPointerMapping (
+    register Display *dpy,
+    unsigned char *map,	/* RETURN */
+    int nmaps)
+
+{
+    unsigned char mapping[256];	/* known fixed size */
+    long nbytes, remainder = 0;
+    xGetPointerMappingReply rep;
+    register xReq *req;
+
+    LockDisplay(dpy);
+    GetEmptyReq(GetPointerMapping, req);
+    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return 0;
+    }
+
+    nbytes = (long)rep.length << 2;
+
+    /* Don't count on the server returning a valid value */
+    if (nbytes > sizeof mapping) {
+	remainder = nbytes - sizeof mapping;
+	nbytes = sizeof mapping;
+    }
+    _XRead (dpy, (char *)mapping, nbytes);
+    /* don't return more data than the user asked for. */
+    if (rep.nElts) {
+	    memcpy ((char *) map, (char *) mapping,
+		MIN((int)rep.nElts, nmaps) );
+	}
+
+    if (remainder)
+	_XEatData(dpy, (unsigned long)remainder);
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return ((int) rep.nElts);
+}
+
+KeySym *
+XGetKeyboardMapping (Display *dpy,
+#if NeedWidePrototypes
+			     unsigned int first_keycode,
+#else
+			     KeyCode first_keycode,
+#endif
+			     int count,
+			     int *keysyms_per_keycode)
+{
+    long nbytes;
+    unsigned long nkeysyms;
+    register KeySym *mapping = NULL;
+    xGetKeyboardMappingReply rep;
+    register xGetKeyboardMappingReq *req;
+
+    LockDisplay(dpy);
+    GetReq(GetKeyboardMapping, req);
+    req->firstKeyCode = first_keycode;
+    req->count = count;
+    if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return (KeySym *) NULL;
+    }
+
+    nkeysyms = (unsigned long) rep.length;
+    if (nkeysyms > 0) {
+	nbytes = nkeysyms * sizeof (KeySym);
+	mapping = (KeySym *) Xmalloc ((unsigned) nbytes);
+	nbytes = nkeysyms << 2;
+	if (! mapping) {
+	    _XEatData(dpy, (unsigned long) nbytes);
+	    UnlockDisplay(dpy);
+	    SyncHandle();
+	    return (KeySym *) NULL;
+	}
+	_XRead32 (dpy, (long *) mapping, nbytes);
+    }
+    *keysyms_per_keycode = rep.keySymsPerKeyCode;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return (mapping);
+}
+