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

diff --git a/libX11/src/Xprivate.h b/libX11/src/Xprivate.h
index 5e31befcc..006b1705e 100644
--- a/libX11/src/Xprivate.h
+++ b/libX11/src/Xprivate.h
@@ -1,28 +1,28 @@
-/* Copyright (C) 2008 Jamey Sharp, Josh Triplett

- * This file is licensed under the MIT license. See the file COPYING.

- *

- * As Xlibint.h has long become effectively public API, this header exists

- * for new private functions that nothing outside of libX11 should call.

- */

-

-#ifndef XPRIVATE_H

-#define XPRIVATE_H

-

-extern _X_HIDDEN void _XIDHandler(Display *dpy);

-extern _X_HIDDEN void _XSeqSyncFunction(Display *dpy);

-extern _X_HIDDEN void _XSetPrivSyncFunction(Display *dpy);

-extern _X_HIDDEN void _XSetSeqSyncFunction(Display *dpy);

-

-#ifdef XTHREADS

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

-#define InternalLockDisplay(d,wskip) if ((d)->lock) \

-    (*(d)->lock->internal_lock_display)(d,wskip,__FILE__,__LINE__)

-#else

-#define InternalLockDisplay(d,wskip) if ((d)->lock) \

-    (*(d)->lock->internal_lock_display)(d,wskip)

-#endif

-#else /* XTHREADS else */

-#define InternalLockDisplay(d,wskip)

-#endif /* XTHREADS else */

-

-#endif /* XPRIVATE_H */

+/* Copyright (C) 2008 Jamey Sharp, Josh Triplett
+ * This file is licensed under the MIT license. See the file COPYING.
+ *
+ * As Xlibint.h has long become effectively public API, this header exists
+ * for new private functions that nothing outside of libX11 should call.
+ */
+
+#ifndef XPRIVATE_H
+#define XPRIVATE_H
+
+extern _X_HIDDEN void _XIDHandler(Display *dpy);
+extern _X_HIDDEN void _XSeqSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetPrivSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetSeqSyncFunction(Display *dpy);
+
+#ifdef XTHREADS
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+#define InternalLockDisplay(d,wskip) if ((d)->lock) \
+    (*(d)->lock->internal_lock_display)(d,wskip,__FILE__,__LINE__)
+#else
+#define InternalLockDisplay(d,wskip) if ((d)->lock) \
+    (*(d)->lock->internal_lock_display)(d,wskip)
+#endif
+#else /* XTHREADS else */
+#define InternalLockDisplay(d,wskip)
+#endif /* XTHREADS else */
+
+#endif /* XPRIVATE_H */