Synchronised line endinge with release branch

1 files changed, 105 insertions, 105 deletions

diff --git a/libXaw/src/XawI18n.c b/libXaw/src/XawI18n.c
index 38483f40e..9a49521a9 100644
--- a/libXaw/src/XawI18n.c
+++ b/libXaw/src/XawI18n.c
@@ -1,105 +1,105 @@
-/* Copyright 1991 NCR Corporation - Dayton, Ohio, USA */

-

-/*

- * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,

- *                      and Nippon Telegraph and Telephone Corporation

- *

- * 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, and that the names of OMRON, NTT Software, and NTT

- * not be used in advertising or publicity pertaining to distribution of the

- * software without specific, written prior permission. OMRON, NTT Software,

- * and NTT make no representations about the suitability of this

- * software for any purpose.  It is provided "as is" without express or

- * implied warranty.

- *

- * OMRON, NTT SOFTWARE, AND NTT, DISCLAIM ALL WARRANTIES WITH REGARD

- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

- * AND FITNESS, IN NO EVENT SHALL OMRON, NTT SOFTWARE, OR NTT 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.

- *

- *	Author: Li Yuhong	OMRON Corporation

- */

-

-/*

-

-Copyright 1991, 1994, 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.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/IntrinsicP.h>

-#include "XawI18n.h"

-

-wchar_t

-#if NeedWidePrototypes

-_Xaw_atowc(int c)

-#else

-_Xaw_atowc(unsigned char c)

-#endif

-{

-    wchar_t  wc;

-    char str[2];

-

-    str[0] = c;

-    str[1] = '\0';

-

-    mbtowc(&wc, str, 1);

-

-    return (wc);

-}

-

-#ifdef NCR

-int

-_Xaw_iswspace(wchar_t w)

-{

-    int ret = 0;

-    wchar_t s = _Xaw_atowc(' ');

-

-    if (s == w)

-	ret = 1;

-

-  return (ret);

-}

-#endif

-

-int

-_Xaw_iswalnum(wchar_t ch)

-{

-#ifdef HAVE_ISWALNUM

-    return iswalnum(ch);

-#else

-    unsigned char mb[MB_LEN_MAX];

-

-    wctomb((char*)mb, ch);

-

-    return (isalnum(*mb));

-#endif    

-}

+/* Copyright 1991 NCR Corporation - Dayton, Ohio, USA */
+
+/*
+ * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
+ *                      and Nippon Telegraph and Telephone Corporation
+ *
+ * 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, and that the names of OMRON, NTT Software, and NTT
+ * not be used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission. OMRON, NTT Software,
+ * and NTT make no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+ *
+ * OMRON, NTT SOFTWARE, AND NTT, DISCLAIM ALL WARRANTIES WITH REGARD
+ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL OMRON, NTT SOFTWARE, OR NTT 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.
+ *
+ *	Author: Li Yuhong	OMRON Corporation
+ */
+
+/*
+
+Copyright 1991, 1994, 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.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/IntrinsicP.h>
+#include "XawI18n.h"
+
+wchar_t
+#if NeedWidePrototypes
+_Xaw_atowc(int c)
+#else
+_Xaw_atowc(unsigned char c)
+#endif
+{
+    wchar_t  wc;
+    char str[2];
+
+    str[0] = c;
+    str[1] = '\0';
+
+    mbtowc(&wc, str, 1);
+
+    return (wc);
+}
+
+#ifdef NCR
+int
+_Xaw_iswspace(wchar_t w)
+{
+    int ret = 0;
+    wchar_t s = _Xaw_atowc(' ');
+
+    if (s == w)
+	ret = 1;
+
+  return (ret);
+}
+#endif
+
+int
+_Xaw_iswalnum(wchar_t ch)
+{
+#ifdef HAVE_ISWALNUM
+    return iswalnum(ch);
+#else
+    unsigned char mb[MB_LEN_MAX];
+
+    wctomb((char*)mb, ch);
+
+    return (isalnum(*mb));
+#endif    
+}