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

diff --git a/libXau/AuGetAddr.c b/libXau/AuGetAddr.c
index f26c58ba4..897d8b565 100644
--- a/libXau/AuGetAddr.c
+++ b/libXau/AuGetAddr.c
@@ -1,109 +1,109 @@
-/*

-

-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 <X11/Xos.h>

-

-static int

-binaryEqual (_Xconst char *a, _Xconst char *b, int len)

-{

-    while (len--)

-	if (*a++ != *b++)

-	    return 0;

-    return 1;

-}

-

-Xauth *

-XauGetAuthByAddr (

-#if NeedWidePrototypes

-unsigned int	family,

-unsigned int	address_length,

-#else

-unsigned short	family,

-unsigned short	address_length,

-#endif

-_Xconst char*	address,

-#if NeedWidePrototypes

-unsigned int	number_length,

-#else

-unsigned short	number_length,

-#endif

-_Xconst char*	number,

-#if NeedWidePrototypes

-unsigned int	name_length,

-#else

-unsigned short	name_length,

-#endif

-_Xconst char*	name)

-{

-    FILE    *auth_file;

-    char    *auth_name;

-    Xauth   *entry;

-

-    auth_name = XauFileName ();

-    if (!auth_name)

-	return NULL;

-    if (access (auth_name, R_OK) != 0)		/* checks REAL id */

-	return NULL;

-    auth_file = fopen (auth_name, "rb");

-    if (!auth_file)

-	return NULL;

-    for (;;) {

-	entry = XauReadAuth (auth_file);

-	if (!entry)

-	    break;

-	/*

-	 * Match when:

-	 *   either family or entry->family are FamilyWild or

-	 *    family and entry->family are the same and

-	 *     address and entry->address are the same

-	 *  and

-	 *   either number or entry->number are empty or

-	 *    number and entry->number are the same

-	 *  and

-	 *   either name or entry->name are empty or

-	 *    name and entry->name are the same

-	 */

-

-	if ((family == FamilyWild || entry->family == FamilyWild ||

-	     (entry->family == family &&

-	      address_length == entry->address_length &&

-	      binaryEqual (entry->address, address, (int)address_length))) &&

-	    (number_length == 0 || entry->number_length == 0 ||

-	     (number_length == entry->number_length &&

-	      binaryEqual (entry->number, number, (int)number_length))) &&

-	    (name_length == 0 || entry->name_length == 0 ||

-	     (entry->name_length == name_length &&

- 	      binaryEqual (entry->name, name, (int)name_length))))

-	    break;

-	XauDisposeAuth (entry);

-    }

-    (void) fclose (auth_file);

-    return entry;

-}

+/*
+
+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 <X11/Xos.h>
+
+static int
+binaryEqual (_Xconst char *a, _Xconst char *b, int len)
+{
+    while (len--)
+	if (*a++ != *b++)
+	    return 0;
+    return 1;
+}
+
+Xauth *
+XauGetAuthByAddr (
+#if NeedWidePrototypes
+unsigned int	family,
+unsigned int	address_length,
+#else
+unsigned short	family,
+unsigned short	address_length,
+#endif
+_Xconst char*	address,
+#if NeedWidePrototypes
+unsigned int	number_length,
+#else
+unsigned short	number_length,
+#endif
+_Xconst char*	number,
+#if NeedWidePrototypes
+unsigned int	name_length,
+#else
+unsigned short	name_length,
+#endif
+_Xconst char*	name)
+{
+    FILE    *auth_file;
+    char    *auth_name;
+    Xauth   *entry;
+
+    auth_name = XauFileName ();
+    if (!auth_name)
+	return NULL;
+    if (access (auth_name, R_OK) != 0)		/* checks REAL id */
+	return NULL;
+    auth_file = fopen (auth_name, "rb");
+    if (!auth_file)
+	return NULL;
+    for (;;) {
+	entry = XauReadAuth (auth_file);
+	if (!entry)
+	    break;
+	/*
+	 * Match when:
+	 *   either family or entry->family are FamilyWild or
+	 *    family and entry->family are the same and
+	 *     address and entry->address are the same
+	 *  and
+	 *   either number or entry->number are empty or
+	 *    number and entry->number are the same
+	 *  and
+	 *   either name or entry->name are empty or
+	 *    name and entry->name are the same
+	 */
+
+	if ((family == FamilyWild || entry->family == FamilyWild ||
+	     (entry->family == family &&
+	      address_length == entry->address_length &&
+	      binaryEqual (entry->address, address, (int)address_length))) &&
+	    (number_length == 0 || entry->number_length == 0 ||
+	     (number_length == entry->number_length &&
+	      binaryEqual (entry->number, number, (int)number_length))) &&
+	    (name_length == 0 || entry->name_length == 0 ||
+	     (entry->name_length == name_length &&
+ 	      binaryEqual (entry->name, name, (int)name_length))))
+	    break;
+	XauDisposeAuth (entry);
+    }
+    (void) fclose (auth_file);
+    return entry;
+}