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

diff --git a/libX11/src/SetRGBCMap.c b/libX11/src/SetRGBCMap.c
index 8acf98d6f..d2cbb5b5b 100644
--- a/libX11/src/SetRGBCMap.c
+++ b/libX11/src/SetRGBCMap.c
@@ -1,100 +1,100 @@
-/*

-

-Copyright 1989, 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 <X11/Xlibint.h>

-#include <X11/Xutil.h>

-#include "Xatomtype.h"

-#include <X11/Xatom.h>

-

-void XSetRGBColormaps (

-    Display *dpy,

-    Window w,

-    XStandardColormap *cmaps,

-    int count,

-    Atom property)			/* XA_RGB_BEST_MAP, etc. */

-{

-    register int i;			/* iterator variable */

-    register xPropStandardColormap *map;  /* tmp variable, data in prop */

-    register XStandardColormap *cmap;	/* tmp variable, user data */

-    xPropStandardColormap *data, tmpdata;  /* scratch data */

-    int mode = PropModeReplace;		/* for partial writes */

-    Bool alloced_scratch_space;		/* do we need to free? */

-

-

-    if (count < 1) return;

-

-    /*

-     * if doing more than one, allocate scratch space for it

-     */

-    if ((count > 1) && ((data = ((xPropStandardColormap *)

-				 Xmalloc(count*sizeof(xPropStandardColormap))))

-			 != NULL)) {

-	alloced_scratch_space = True;

-    } else {

-	data = &tmpdata;

-	alloced_scratch_space = False;

-    }

-

-

-    /*

-     * Do the iteration.  If using temp space put out each part of the prop;

-     * otherwise, wait until the end and blast it all at once.

-     */

-    for (i = count, map = data, cmap = cmaps; i > 0; i--, cmap++) {

-	map->colormap	= cmap->colormap;

-	map->red_max	= cmap->red_max;

-	map->red_mult	= cmap->red_mult;

-	map->green_max	= cmap->green_max;

-	map->green_mult	= cmap->green_mult;

-	map->blue_max	= cmap->blue_max;

-	map->blue_mult	= cmap->blue_mult;

-	map->base_pixel	= cmap->base_pixel;

-	map->visualid	= cmap->visualid;

-	map->killid	= cmap->killid;

-

-	if (alloced_scratch_space) {

-	    map++;

-	} else {

-	    XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32, mode,

-			     (unsigned char *) data,

-			     NumPropStandardColormapElements);

-	    mode = PropModeAppend;

-	}

-    }

-

-    if (alloced_scratch_space) {

-	XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32,

-			 PropModeReplace, (unsigned char *) data,

-			 (int) (count * NumPropStandardColormapElements));

-	Xfree ((char *) data);

-    }

-}

+/*
+
+Copyright 1989, 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 <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include "Xatomtype.h"
+#include <X11/Xatom.h>
+
+void XSetRGBColormaps (
+    Display *dpy,
+    Window w,
+    XStandardColormap *cmaps,
+    int count,
+    Atom property)			/* XA_RGB_BEST_MAP, etc. */
+{
+    register int i;			/* iterator variable */
+    register xPropStandardColormap *map;  /* tmp variable, data in prop */
+    register XStandardColormap *cmap;	/* tmp variable, user data */
+    xPropStandardColormap *data, tmpdata;  /* scratch data */
+    int mode = PropModeReplace;		/* for partial writes */
+    Bool alloced_scratch_space;		/* do we need to free? */
+
+
+    if (count < 1) return;
+
+    /*
+     * if doing more than one, allocate scratch space for it
+     */
+    if ((count > 1) && ((data = ((xPropStandardColormap *)
+				 Xmalloc(count*sizeof(xPropStandardColormap))))
+			 != NULL)) {
+	alloced_scratch_space = True;
+    } else {
+	data = &tmpdata;
+	alloced_scratch_space = False;
+    }
+
+
+    /*
+     * Do the iteration.  If using temp space put out each part of the prop;
+     * otherwise, wait until the end and blast it all at once.
+     */
+    for (i = count, map = data, cmap = cmaps; i > 0; i--, cmap++) {
+	map->colormap	= cmap->colormap;
+	map->red_max	= cmap->red_max;
+	map->red_mult	= cmap->red_mult;
+	map->green_max	= cmap->green_max;
+	map->green_mult	= cmap->green_mult;
+	map->blue_max	= cmap->blue_max;
+	map->blue_mult	= cmap->blue_mult;
+	map->base_pixel	= cmap->base_pixel;
+	map->visualid	= cmap->visualid;
+	map->killid	= cmap->killid;
+
+	if (alloced_scratch_space) {
+	    map++;
+	} else {
+	    XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32, mode,
+			     (unsigned char *) data,
+			     NumPropStandardColormapElements);
+	    mode = PropModeAppend;
+	}
+    }
+
+    if (alloced_scratch_space) {
+	XChangeProperty (dpy, w, property, XA_RGB_COLOR_MAP, 32,
+			 PropModeReplace, (unsigned char *) data,
+			 (int) (count * NumPropStandardColormapElements));
+	Xfree ((char *) data);
+    }
+}