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

diff --git a/libX11/src/locking.h b/libX11/src/locking.h
index 0dd3ebb6b..96019fc91 100644
--- a/libX11/src/locking.h
+++ b/libX11/src/locking.h
@@ -1,154 +1,154 @@
-/*

-

-Copyright 1992, 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.

-

-*/

-

-/*

- * Author: Stephen Gildea, MIT X Consortium

- *

- * locking.h - data types for C Threads locking.

- * Used by XlibInt.c, locking.c, LockDis.c

- */

-

-#ifndef _X_locking_H_

-#define _X_locking_H_

-

-#define xmalloc(s) Xmalloc(s)

-#define xfree(s) Xfree(s)

-#include <X11/Xthreads.h>

-

-struct _XCVList {

-    xcondition_t cv;

-    xReply *buf;

-    struct _XCVList *next;

-};

-

-extern xthread_t (*_Xthread_self_fn)( /* in XlibInt.c */

-    void

-);

-

-/* Display->lock is a pointer to one of these */

-

-struct _XLockInfo {

-	xmutex_t mutex;		/* mutex for critical sections */

-	int reply_bytes_left;	/* nbytes of the reply still to read */

-	Bool reply_was_read;	/* _XReadEvents read a reply for _XReply */

-	struct _XCVList *reply_awaiters; /* list of CVs for _XReply */

-	struct _XCVList **reply_awaiters_tail;

-	struct _XCVList *event_awaiters; /* list of CVs for _XReadEvents */

-	struct _XCVList **event_awaiters_tail;

-	Bool reply_first;	/* who may read, reply queue or event queue */

-	/* for XLockDisplay */

-	int locking_level;	/* how many times into XLockDisplay we are */

-	xthread_t locking_thread; /* thread that did XLockDisplay */

-	xcondition_t cv;	/* wait if another thread has XLockDisplay */

-	xthread_t reading_thread; /* cache */

-	xthread_t conni_thread;	/* thread in XProcessInternalConnection */

-	xcondition_t writers;	/* wait for writable */

-	int num_free_cvls;

-	struct _XCVList *free_cvls;

-	/* used only in XlibInt.c */

-	void (*pop_reader)(

-			   Display* /* dpy */,

-			   struct _XCVList** /* list */,

-			   struct _XCVList*** /* tail */

-			   );

-	struct _XCVList *(*push_reader)(

-					Display *	   /* dpy */,

-					struct _XCVList*** /* tail */

-					);

-	void (*condition_wait)(

-			       xcondition_t /* cv */,

-			       xmutex_t /* mutex */

-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

-			       , char* /* file */,

-			       int /* line */

-#endif

-			       );

-	void (*internal_lock_display)(

-				      Display* /* dpy */,

-				      Bool /* wskip */

-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

-				      , char* /* file */,

-				      int /* line */

-#endif

-				      );

-	/* used in XlibInt.c and locking.c */

-	void (*condition_signal)(

-				 xcondition_t /* cv */

-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

-				 , char* /* file */,

-				 int /* line */

-#endif

-				 );

-	void (*condition_broadcast)(

-				 xcondition_t /* cv */

-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

-				 , char* /* file */,

-				 int /* line */

-#endif

-				    );

-	/* used in XlibInt.c and XLockDis.c */

-	void (*lock_wait)(

-			  Display* /* dpy */

-			  );

-	void (*user_lock_display)(

-				  Display* /* dpy */

-				  );

-	void (*user_unlock_display)(

-				    Display* /* dpy */

-				    );

-	struct _XCVList *(*create_cvl)(

-				       Display * /* dpy */

-				       );

-};

-

-#define UnlockNextEventReader(d) if ((d)->lock) \

-    (*(d)->lock->pop_reader)((d),&(d)->lock->event_awaiters,&(d)->lock->event_awaiters_tail)

-

-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

-#define ConditionWait(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_wait)(c, (d)->lock->mutex,__FILE__,__LINE__)

-#define ConditionSignal(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_signal)(c,__FILE__,__LINE__)

-#define ConditionBroadcast(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_broadcast)(c,__FILE__,__LINE__)

-#else

-#define ConditionWait(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_wait)(c, (d)->lock->mutex)

-#define ConditionSignal(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_signal)(c)

-#define ConditionBroadcast(d,c) if ((d)->lock) \

-	(*(d)->lock->condition_broadcast)(c)

-#endif

-

-typedef struct _LockInfoRec {

-	xmutex_t	lock;

-} LockInfoRec;

-

-/* XOpenDis.c */

-extern int (*_XInitDisplayLock_fn)(Display *dpy);

-extern void (*_XFreeDisplayLock_fn)(Display *dpy);

-

-#endif /* _X_locking_H_ */

+/*
+
+Copyright 1992, 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.
+
+*/
+
+/*
+ * Author: Stephen Gildea, MIT X Consortium
+ *
+ * locking.h - data types for C Threads locking.
+ * Used by XlibInt.c, locking.c, LockDis.c
+ */
+
+#ifndef _X_locking_H_
+#define _X_locking_H_
+
+#define xmalloc(s) Xmalloc(s)
+#define xfree(s) Xfree(s)
+#include <X11/Xthreads.h>
+
+struct _XCVList {
+    xcondition_t cv;
+    xReply *buf;
+    struct _XCVList *next;
+};
+
+extern xthread_t (*_Xthread_self_fn)( /* in XlibInt.c */
+    void
+);
+
+/* Display->lock is a pointer to one of these */
+
+struct _XLockInfo {
+	xmutex_t mutex;		/* mutex for critical sections */
+	int reply_bytes_left;	/* nbytes of the reply still to read */
+	Bool reply_was_read;	/* _XReadEvents read a reply for _XReply */
+	struct _XCVList *reply_awaiters; /* list of CVs for _XReply */
+	struct _XCVList **reply_awaiters_tail;
+	struct _XCVList *event_awaiters; /* list of CVs for _XReadEvents */
+	struct _XCVList **event_awaiters_tail;
+	Bool reply_first;	/* who may read, reply queue or event queue */
+	/* for XLockDisplay */
+	int locking_level;	/* how many times into XLockDisplay we are */
+	xthread_t locking_thread; /* thread that did XLockDisplay */
+	xcondition_t cv;	/* wait if another thread has XLockDisplay */
+	xthread_t reading_thread; /* cache */
+	xthread_t conni_thread;	/* thread in XProcessInternalConnection */
+	xcondition_t writers;	/* wait for writable */
+	int num_free_cvls;
+	struct _XCVList *free_cvls;
+	/* used only in XlibInt.c */
+	void (*pop_reader)(
+			   Display* /* dpy */,
+			   struct _XCVList** /* list */,
+			   struct _XCVList*** /* tail */
+			   );
+	struct _XCVList *(*push_reader)(
+					Display *	   /* dpy */,
+					struct _XCVList*** /* tail */
+					);
+	void (*condition_wait)(
+			       xcondition_t /* cv */,
+			       xmutex_t /* mutex */
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+			       , char* /* file */,
+			       int /* line */
+#endif
+			       );
+	void (*internal_lock_display)(
+				      Display* /* dpy */,
+				      Bool /* wskip */
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+				      , char* /* file */,
+				      int /* line */
+#endif
+				      );
+	/* used in XlibInt.c and locking.c */
+	void (*condition_signal)(
+				 xcondition_t /* cv */
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+				 , char* /* file */,
+				 int /* line */
+#endif
+				 );
+	void (*condition_broadcast)(
+				 xcondition_t /* cv */
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+				 , char* /* file */,
+				 int /* line */
+#endif
+				    );
+	/* used in XlibInt.c and XLockDis.c */
+	void (*lock_wait)(
+			  Display* /* dpy */
+			  );
+	void (*user_lock_display)(
+				  Display* /* dpy */
+				  );
+	void (*user_unlock_display)(
+				    Display* /* dpy */
+				    );
+	struct _XCVList *(*create_cvl)(
+				       Display * /* dpy */
+				       );
+};
+
+#define UnlockNextEventReader(d) if ((d)->lock) \
+    (*(d)->lock->pop_reader)((d),&(d)->lock->event_awaiters,&(d)->lock->event_awaiters_tail)
+
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+#define ConditionWait(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_wait)(c, (d)->lock->mutex,__FILE__,__LINE__)
+#define ConditionSignal(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_signal)(c,__FILE__,__LINE__)
+#define ConditionBroadcast(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_broadcast)(c,__FILE__,__LINE__)
+#else
+#define ConditionWait(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_wait)(c, (d)->lock->mutex)
+#define ConditionSignal(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_signal)(c)
+#define ConditionBroadcast(d,c) if ((d)->lock) \
+	(*(d)->lock->condition_broadcast)(c)
+#endif
+
+typedef struct _LockInfoRec {
+	xmutex_t	lock;
+} LockInfoRec;
+
+/* XOpenDis.c */
+extern int (*_XInitDisplayLock_fn)(Display *dpy);
+extern void (*_XFreeDisplayLock_fn)(Display *dpy);
+
+#endif /* _X_locking_H_ */