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

diff --git a/libX11/src/xlibi18n/lcUniConv/ucs2be.h b/libX11/src/xlibi18n/lcUniConv/ucs2be.h
index 958d25051..20a8b27bd 100644
--- a/libX11/src/xlibi18n/lcUniConv/ucs2be.h
+++ b/libX11/src/xlibi18n/lcUniConv/ucs2be.h
@@ -1,31 +1,31 @@
-/*

- * UCS-2BE = UCS-2 big endian

- */

-

-static int

-ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)

-{

-  if (n >= 2) {

-    if (s[0] >= 0xd8 && s[0] < 0xe0) {

-      return RET_ILSEQ;

-    } else {

-      *pwc = (s[0] << 8) + s[1];

-      return 2;

-    }

-  }

-  return RET_TOOFEW(0);

-}

-

-static int

-ucs2be_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)

-{

-  if (wc < 0x10000 && !(wc >= 0xd800 && wc < 0xe000)) {

-    if (n >= 2) {

-      r[0] = (unsigned char) (wc >> 8);

-      r[1] = (unsigned char) wc;

-      return 2;

-    } else

-      return RET_TOOSMALL;

-  }

-  return RET_ILSEQ;

-}

+/*
+ * UCS-2BE = UCS-2 big endian
+ */
+
+static int
+ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
+{
+  if (n >= 2) {
+    if (s[0] >= 0xd8 && s[0] < 0xe0) {
+      return RET_ILSEQ;
+    } else {
+      *pwc = (s[0] << 8) + s[1];
+      return 2;
+    }
+  }
+  return RET_TOOFEW(0);
+}
+
+static int
+ucs2be_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
+{
+  if (wc < 0x10000 && !(wc >= 0xd800 && wc < 0xe000)) {
+    if (n >= 2) {
+      r[0] = (unsigned char) (wc >> 8);
+      r[1] = (unsigned char) wc;
+      return 2;
+    } else
+      return RET_TOOSMALL;
+  }
+  return RET_ILSEQ;
+}