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

diff --git a/libXau/Autest.c b/libXau/Autest.c
index 966e0d13f..efb3da8c6 100644
--- a/libXau/Autest.c
+++ b/libXau/Autest.c
@@ -1,74 +1,74 @@
-/*

-

-Copyright 1988, 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/Xauth.h>

-#include <stdio.h>

-#include <stdlib.h>

-

-int

-main (int argc, char **argv)

-{

-    Xauth   test_data;

-    char    *name = "XAU-TEST-1";

-    char    *data = "Do not begin the test until instructed to do so.";

-    char    *file = NULL;

-    int	    state = 0;

-    FILE    *output;

-

-    while (*++argv) {

-	if (!strcmp (*argv, "-file"))

-	    file = *++argv;

-	else if (state == 0) {

-	    name = *argv;

-	    ++state;

-	} else if (state == 1) {

-	    data = *argv;

-	    ++state;

-	}

-    }

-    test_data.family = 0;

-    test_data.address_length = 0;

-    test_data.address = "";

-    test_data.number_length = 0;

-    test_data.number = "";

-    test_data.name_length = strlen (name);

-    test_data.name = name;

-    test_data.data_length = strlen (data);

-    test_data.data = data;

-    if (!file) {

-	output = tmpfile();

-    } else {

-	output = fopen (file, "w");

-    }

-    if (output) {

-	state = XauWriteAuth (output, &test_data);

-	fclose (output);

-    }

-    return (state = 1) ? 0 : 1;

-}

+/*
+
+Copyright 1988, 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/Xauth.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (int argc, char **argv)
+{
+    Xauth   test_data;
+    char    *name = "XAU-TEST-1";
+    char    *data = "Do not begin the test until instructed to do so.";
+    char    *file = NULL;
+    int	    state = 0;
+    FILE    *output;
+
+    while (*++argv) {
+	if (!strcmp (*argv, "-file"))
+	    file = *++argv;
+	else if (state == 0) {
+	    name = *argv;
+	    ++state;
+	} else if (state == 1) {
+	    data = *argv;
+	    ++state;
+	}
+    }
+    test_data.family = 0;
+    test_data.address_length = 0;
+    test_data.address = "";
+    test_data.number_length = 0;
+    test_data.number = "";
+    test_data.name_length = strlen (name);
+    test_data.name = name;
+    test_data.data_length = strlen (data);
+    test_data.data = data;
+    if (!file) {
+	output = tmpfile();
+    } else {
+	output = fopen (file, "w");
+    }
+    if (output) {
+	state = XauWriteAuth (output, &test_data);
+	fclose (output);
+    }
+    return (state = 1) ? 0 : 1;
+}