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

diff --git a/libX11/src/ErrDes.c b/libX11/src/ErrDes.c
index 9a5b1805f..7dde06136 100644
--- a/libX11/src/ErrDes.c
+++ b/libX11/src/ErrDes.c
@@ -1,211 +1,211 @@
-/*
- */
-
-/***********************************************************
-
-Copyright 1987, 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.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include "Xresource.h"
-#include <stdio.h>
-
-#ifndef ERRORDB
-#ifndef XERRORDB
-#define ERRORDB "/usr/lib/X11/XErrorDB"
-#else
-#define ERRORDB XERRORDB
-#endif
-#endif
-
-/*
- * descriptions of errors in Section 4 of Protocol doc (pp. 350-351); more
- * verbose descriptions are given in the error database
- */
-static const char _XErrorList[] =
-    /* No error */          "no error\0"
-    /* BadRequest */        "BadRequest\0"
-    /* BadValue */          "BadValue\0"
-    /* BadWindow */         "BadWindow\0"
-    /* BadPixmap */         "BadPixmap\0"
-    /* BadAtom */           "BadAtom\0"
-    /* BadCursor */         "BadCursor\0"
-    /* BadFont */           "BadFont\0"
-    /* BadMatch */          "BadMatch\0"
-    /* BadDrawable */       "BadDrawable\0"
-    /* BadAccess */         "BadAccess\0"
-    /* BadAlloc */          "BadAlloc\0"
-    /* BadColor */          "BadColor\0"
-    /* BadGC */             "BadGC\0"
-    /* BadIDChoice */       "BadIDChoice\0"
-    /* BadName */           "BadName\0"
-    /* BadLength */         "BadLength\0"
-    /* BadImplementation */ "BadImplementation"
-;
-
-/* offsets into _XErrorList */
-static const unsigned char _XErrorOffsets[] = {
-    0, 9, 20, 29, 39, 49, 57, 67, 75, 84, 96,
-    106, 115, 124, 130, 142, 150, 160
-};
-
-
-int
-XGetErrorText(
-    register Display *dpy,
-    register int code,
-    char *buffer,
-    int nbytes)
-{
-    char buf[150];
-    register _XExtension *ext;
-    _XExtension *bext = (_XExtension *)NULL;
-
-    if (nbytes == 0) return 0;
-    if (code <= BadImplementation && code > 0) {
-	sprintf(buf, "%d", code);
-        (void) XGetErrorDatabaseText(dpy, "XProtoError", buf,
-                                     _XErrorList + _XErrorOffsets[code],
-				     buffer, nbytes);
-    } else
-	buffer[0] = '\0';
-    /* call out to any extensions interested */
-    for (ext = dpy->ext_procs; ext; ext = ext->next) {
- 	if (ext->error_string)
- 	    (*ext->error_string)(dpy, code, &ext->codes, buffer, nbytes);
-	if (ext->codes.first_error &&
-	    ext->codes.first_error <= code &&
-	    (!bext || ext->codes.first_error > bext->codes.first_error))
-	    bext = ext;
-    }
-    if (!buffer[0] && bext) {
-	sprintf(buf, "%s.%d", bext->name, code - bext->codes.first_error);
-	(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, "", buffer, nbytes);
-    }
-    if (!buffer[0])
-	sprintf(buffer, "%d", code);
-    return 0;
-}
-
-int
-/*ARGSUSED*/
-XGetErrorDatabaseText(
-    Display *dpy,
-    register _Xconst char *name,
-    register _Xconst char *type,
-    _Xconst char *defaultp,
-    char *buffer,
-    int nbytes)
-{
-
-    static XrmDatabase db = NULL;
-    XrmString type_str;
-    XrmValue result;
-    char temp[BUFSIZ];
-    char* tptr;
-    unsigned long tlen;
-
-    if (nbytes == 0) return 0;
-
-    if (!db) {
-	/* the Xrm routines expect to be called with the global
-	   mutex unlocked. */
-	XrmDatabase temp_db;
-	int do_destroy;
-	const char *dbname;
-
-	XrmInitialize();
-#ifdef WIN32
-	dbname = getenv("XERRORDB");
-	if (!dbname)
-	    dbname = ERRORDB;
-#else
-    dbname = ERRORDB;
-#endif
-	temp_db = XrmGetFileDatabase(dbname);
-
-	_XLockMutex(_Xglobal_lock);
-	if (!db) {
-	    db = temp_db;
-	    do_destroy = 0;
-	} else
-	    do_destroy = 1;	/* we didn't need to get it after all */
-	_XUnlockMutex(_Xglobal_lock);
-
-	if (do_destroy)
-	    XrmDestroyDatabase(temp_db);
-    }
-
-    if (db)
-    {
-	tlen = strlen (name) + strlen (type) + 2;
-	if (tlen <= sizeof(temp))
-	    tptr = temp;
-	else
-	    tptr = Xmalloc (tlen);
-	if (tptr) {
-	    sprintf(tptr, "%s.%s", name, type);
-	    XrmGetResource(db, tptr, "ErrorType.ErrorNumber",
-	      &type_str, &result);
-	    if (tptr != temp)
-		Xfree (tptr);
-	} else {
-	    result.addr = (XPointer) NULL;
-	}
-    }
-    else
-	result.addr = (XPointer)NULL;
-    if (!result.addr) {
-	result.addr = (XPointer) defaultp;
-	result.size = strlen(defaultp) + 1;
-    }
-    (void) strncpy (buffer, (char *) result.addr, nbytes);
-    if (result.size > nbytes) buffer[nbytes-1] = '\0';
-    return 0;
-}
+/*

+ */

+

+/***********************************************************

+

+Copyright 1987, 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.

+

+

+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+******************************************************************/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include <X11/Xos.h>

+#include "Xresource.h"

+#include <stdio.h>

+

+#ifndef ERRORDB

+#ifndef XERRORDB

+#define ERRORDB "/usr/lib/X11/XErrorDB"

+#else

+#define ERRORDB XERRORDB

+#endif

+#endif

+

+/*

+ * descriptions of errors in Section 4 of Protocol doc (pp. 350-351); more

+ * verbose descriptions are given in the error database

+ */

+static const char _XErrorList[] =

+    /* No error */          "no error\0"

+    /* BadRequest */        "BadRequest\0"

+    /* BadValue */          "BadValue\0"

+    /* BadWindow */         "BadWindow\0"

+    /* BadPixmap */         "BadPixmap\0"

+    /* BadAtom */           "BadAtom\0"

+    /* BadCursor */         "BadCursor\0"

+    /* BadFont */           "BadFont\0"

+    /* BadMatch */          "BadMatch\0"

+    /* BadDrawable */       "BadDrawable\0"

+    /* BadAccess */         "BadAccess\0"

+    /* BadAlloc */          "BadAlloc\0"

+    /* BadColor */          "BadColor\0"

+    /* BadGC */             "BadGC\0"

+    /* BadIDChoice */       "BadIDChoice\0"

+    /* BadName */           "BadName\0"

+    /* BadLength */         "BadLength\0"

+    /* BadImplementation */ "BadImplementation"

+;

+

+/* offsets into _XErrorList */

+static const unsigned char _XErrorOffsets[] = {

+    0, 9, 20, 29, 39, 49, 57, 67, 75, 84, 96,

+    106, 115, 124, 130, 142, 150, 160

+};

+

+

+int

+XGetErrorText(

+    register Display *dpy,

+    register int code,

+    char *buffer,

+    int nbytes)

+{

+    char buf[150];

+    register _XExtension *ext;

+    _XExtension *bext = (_XExtension *)NULL;

+

+    if (nbytes == 0) return 0;

+    if (code <= BadImplementation && code > 0) {

+	sprintf(buf, "%d", code);

+        (void) XGetErrorDatabaseText(dpy, "XProtoError", buf,

+                                     _XErrorList + _XErrorOffsets[code],

+				     buffer, nbytes);

+    } else

+	buffer[0] = '\0';

+    /* call out to any extensions interested */

+    for (ext = dpy->ext_procs; ext; ext = ext->next) {

+ 	if (ext->error_string)

+ 	    (*ext->error_string)(dpy, code, &ext->codes, buffer, nbytes);

+	if (ext->codes.first_error &&

+	    ext->codes.first_error <= code &&

+	    (!bext || ext->codes.first_error > bext->codes.first_error))

+	    bext = ext;

+    }

+    if (!buffer[0] && bext) {

+	sprintf(buf, "%s.%d", bext->name, code - bext->codes.first_error);

+	(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, "", buffer, nbytes);

+    }

+    if (!buffer[0])

+	sprintf(buffer, "%d", code);

+    return 0;

+}

+

+int

+/*ARGSUSED*/

+XGetErrorDatabaseText(

+    Display *dpy,

+    register _Xconst char *name,

+    register _Xconst char *type,

+    _Xconst char *defaultp,

+    char *buffer,

+    int nbytes)

+{

+

+    static XrmDatabase db = NULL;

+    XrmString type_str;

+    XrmValue result;

+    char temp[BUFSIZ];

+    char* tptr;

+    unsigned long tlen;

+

+    if (nbytes == 0) return 0;

+

+    if (!db) {

+	/* the Xrm routines expect to be called with the global

+	   mutex unlocked. */

+	XrmDatabase temp_db;

+	int do_destroy;

+	const char *dbname;

+

+	XrmInitialize();

+#ifdef WIN32

+	dbname = getenv("XERRORDB");

+	if (!dbname)

+	    dbname = ERRORDB;

+#else

+    dbname = ERRORDB;

+#endif

+	temp_db = XrmGetFileDatabase(dbname);

+

+	_XLockMutex(_Xglobal_lock);

+	if (!db) {

+	    db = temp_db;

+	    do_destroy = 0;

+	} else

+	    do_destroy = 1;	/* we didn't need to get it after all */

+	_XUnlockMutex(_Xglobal_lock);

+

+	if (do_destroy)

+	    XrmDestroyDatabase(temp_db);

+    }

+

+    if (db)

+    {

+	tlen = strlen (name) + strlen (type) + 2;

+	if (tlen <= sizeof(temp))

+	    tptr = temp;

+	else

+	    tptr = Xmalloc (tlen);

+	if (tptr) {

+	    sprintf(tptr, "%s.%s", name, type);

+	    XrmGetResource(db, tptr, "ErrorType.ErrorNumber",

+	      &type_str, &result);

+	    if (tptr != temp)

+		Xfree (tptr);

+	} else {

+	    result.addr = (XPointer) NULL;

+	}

+    }

+    else

+	result.addr = (XPointer)NULL;

+    if (!result.addr) {

+	result.addr = (XPointer) defaultp;

+	result.size = strlen(defaultp) + 1;

+    }

+    (void) strncpy (buffer, (char *) result.addr, nbytes);

+    if (result.size > nbytes) buffer[nbytes-1] = '\0';

+    return 0;

+}