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

diff --git a/libxcb/src/xcb_xid.c b/libxcb/src/xcb_xid.c
index b0de73f21..e32306157 100644
--- a/libxcb/src/xcb_xid.c
+++ b/libxcb/src/xcb_xid.c
@@ -1,99 +1,99 @@
-/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * 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
- * AUTHORS 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 names of the authors or their
- * institutions 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 authors.
- */
-
-/* XID allocators. */
-
-#include <assert.h>
-#include <stdlib.h>
-#include "xcb.h"
-#include "xcbext.h"
-#include "xcbint.h"
-#include "xc_misc.h"
-
-/* Public interface */
-
-uint32_t xcb_generate_id(xcb_connection_t *c)
-{
-    uint32_t ret;
-    if(c->has_error)
-        return -1;
-    pthread_mutex_lock(&c->xid.lock);
-    if(c->xid.last >= c->xid.max - c->xid.inc + 1)
-    {
-        xcb_xc_misc_get_xid_range_reply_t *range;
-        assert(c->xid.last == c->xid.max);
-        if (c->xid.last == 0) {
-            /* finish setting up initial range */
-            c->xid.max = c->setup->resource_id_mask;
-        } else {
-            /* check for extension */
-            const xcb_query_extension_reply_t *xc_misc_reply =
-              xcb_get_extension_data(c, &xcb_xc_misc_id);
-            if (!xc_misc_reply) {
-                pthread_mutex_unlock(&c->xid.lock);
-                return -1;
-            }
-            /* get new range */
-            range = xcb_xc_misc_get_xid_range_reply(c,
-                      xcb_xc_misc_get_xid_range(c), 0);
-            /* XXX The latter disjunct is what the server returns
-               when it is out of XIDs.  Sweet. */
-            if(!range || (range->start_id == 0 && range->count == 1))
-            {
-                pthread_mutex_unlock(&c->xid.lock);
-                return -1;
-            }
-            assert(range->count > 0 && range->start_id > 0);
-            c->xid.last = range->start_id;
-            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;
-            free(range);
-        }
-    } else {
-        c->xid.last += c->xid.inc;
-    }
-    ret = c->xid.last | c->xid.base;
-    pthread_mutex_unlock(&c->xid.lock);
-    return ret;
-}
-
-/* Private interface */
-
-int _xcb_xid_init(xcb_connection_t *c)
-{
-    if(pthread_mutex_init(&c->xid.lock, 0))
-        return 0;
-    c->xid.last = 0;
-    c->xid.max = 0;
-    c->xid.base = c->setup->resource_id_base;
-    c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);
-    return 1;
-}
-
-void _xcb_xid_destroy(xcb_connection_t *c)
-{
-    if (!c->xid.lock)
-      return; /* mutex was not initialised yet */
-    pthread_mutex_destroy(&c->xid.lock);
-}
+/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ * 

+ * 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

+ * AUTHORS 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 names of the authors or their

+ * institutions 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 authors.

+ */

+

+/* XID allocators. */

+

+#include <assert.h>

+#include <stdlib.h>

+#include "xcb.h"

+#include "xcbext.h"

+#include "xcbint.h"

+#include "xc_misc.h"

+

+/* Public interface */

+

+uint32_t xcb_generate_id(xcb_connection_t *c)

+{

+    uint32_t ret;

+    if(c->has_error)

+        return -1;

+    pthread_mutex_lock(&c->xid.lock);

+    if(c->xid.last >= c->xid.max - c->xid.inc + 1)

+    {

+        xcb_xc_misc_get_xid_range_reply_t *range;

+        assert(c->xid.last == c->xid.max);

+        if (c->xid.last == 0) {

+            /* finish setting up initial range */

+            c->xid.max = c->setup->resource_id_mask;

+        } else {

+            /* check for extension */

+            const xcb_query_extension_reply_t *xc_misc_reply =

+              xcb_get_extension_data(c, &xcb_xc_misc_id);

+            if (!xc_misc_reply) {

+                pthread_mutex_unlock(&c->xid.lock);

+                return -1;

+            }

+            /* get new range */

+            range = xcb_xc_misc_get_xid_range_reply(c,

+                      xcb_xc_misc_get_xid_range(c), 0);

+            /* XXX The latter disjunct is what the server returns

+               when it is out of XIDs.  Sweet. */

+            if(!range || (range->start_id == 0 && range->count == 1))

+            {

+                pthread_mutex_unlock(&c->xid.lock);

+                return -1;

+            }

+            assert(range->count > 0 && range->start_id > 0);

+            c->xid.last = range->start_id;

+            c->xid.max = range->start_id + (range->count - 1) * c->xid.inc;

+            free(range);

+        }

+    } else {

+        c->xid.last += c->xid.inc;

+    }

+    ret = c->xid.last | c->xid.base;

+    pthread_mutex_unlock(&c->xid.lock);

+    return ret;

+}

+

+/* Private interface */

+

+int _xcb_xid_init(xcb_connection_t *c)

+{

+    if(pthread_mutex_init(&c->xid.lock, 0))

+        return 0;

+    c->xid.last = 0;

+    c->xid.max = 0;

+    c->xid.base = c->setup->resource_id_base;

+    c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask);

+    return 1;

+}

+

+void _xcb_xid_destroy(xcb_connection_t *c)

+{

+    if (!c->xid.lock)

+      return; /* mutex was not initialised yet */

+    pthread_mutex_destroy(&c->xid.lock);

+}