svn merge ^/branches/released .

1 files changed, 118 insertions, 122 deletions

diff --git a/libXaw/src/XawI18n.h b/libXaw/src/XawI18n.h
index 8f157d19b..6a9064a3a 100644
--- a/libXaw/src/XawI18n.h
+++ b/libXaw/src/XawI18n.h
@@ -1,122 +1,118 @@
-/* $XdotOrg: xc/lib/Xaw/XawI18n.h,v 1.2 2004/04/23 18:43:38 eich Exp $ */
-/* $Xorg: XawI18n.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-
-/************************************************************
-
-Copyright 1993, 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.
-
-********************************************************/
-/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.14 2001/12/14 19:54:46 dawes Exp $ */
-
-#ifdef HAS_WCTYPE_H
-#include <wctype.h>
-#ifndef NO_WIDEC_H
-#include <widec.h>
-#define wcslen(c) wslen(c)
-#define wcscpy(d, s)		wscpy(d, s)
-#define wcsncpy(d, s, l)	wsncpy(d, s, l)
-#endif
-#endif
-
-#ifdef HAS_WCHAR_H
-#include <wchar.h>
-#endif
-
-#if defined(AIXV3) || defined(__SCO__)
-#include <ctype.h>
-#endif
-
-#ifdef NCR
-#define iswspace(c) _Xaw_iswspace(c)
-int _Xaw_iswspace
-(
- wchar_t		c
- );
-#endif
-
-#ifdef sony
-#ifndef SVR4
-#include <jctype.h>
-#define iswspace(c) jisspace(c)
-#endif
-#endif
-
-#ifdef QNX4
-#define toascii( c ) ((unsigned)(c) & 0x007f)
-#endif
-
-#include <stdlib.h>
-
-#ifdef USE_XWCHAR_STRING
-int _Xwcslen
-(
- wchar_t		*wstr
- );
-
-#define wcslen(c) _Xwcslen(c)
-
-wchar_t *_Xwcscpy
-(
- wchar_t		*wstr1,
- wchar_t		*wstr2
- );
-
-#define wcscpy(d,s) _Xwcscpy(d,s)
-
-wchar_t *_Xwcsncpy
-(
- wchar_t		*wstr1,
- wchar_t		*wstr2,
- int			len
- );
-
-#define wcsncpy(d, s, l)	_Xwcsncpy(d, s, l)
-
-#ifdef USE_XMBTOWC
-#define mbtowc(wc, s, l)	_Xmbtowc(wc, s, l)
-#endif
-#endif
-
-wchar_t _Xaw_atowc
-(
-#if NeedWidePrototypes
- int			c
-#else
- unsigned char		c
-#endif
- );
-
-#ifndef HAS_ISW_FUNCS
-#include <ctype.h>
-#ifndef iswspace
-#define iswspace(c) (isascii(c) && isspace(toascii(c)))
-#endif
-#endif
-
-#if !defined(iswalnum) && !defined(HAVE_ISWALNUM)
-#define iswalnum(c) _Xaw_iswalnum(c)
-#endif
-int _Xaw_iswalnum
-(
- wchar_t		c
- );
+/************************************************************

+

+Copyright 1993, 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_WCTYPE_H

+#include <wctype.h>

+#ifdef HAVE_WIDEC_H

+#include <widec.h>

+#define wcslen(c) wslen(c)

+#define wcscpy(d, s)		wscpy(d, s)

+#define wcsncpy(d, s, l)	wsncpy(d, s, l)

+#endif

+#endif

+

+#ifdef HAVE_WCHAR_H

+#include <wchar.h>

+#endif

+

+#if defined(AIXV3) || defined(__SCO__)

+#include <ctype.h>

+#endif

+

+#ifdef NCR

+#define iswspace(c) _Xaw_iswspace(c)

+int _Xaw_iswspace

+(

+ wchar_t		c

+ );

+#endif

+

+#ifdef sony

+#ifndef SVR4

+#include <jctype.h>

+#define iswspace(c) jisspace(c)

+#endif

+#endif

+

+#ifdef QNX4

+#define toascii( c ) ((unsigned)(c) & 0x007f)

+#endif

+

+#include <stdlib.h>

+

+#ifdef USE_XWCHAR_STRING

+int _Xwcslen

+(

+ wchar_t		*wstr

+ );

+

+#define wcslen(c) _Xwcslen(c)

+

+wchar_t *_Xwcscpy

+(

+ wchar_t		*wstr1,

+ wchar_t		*wstr2

+ );

+

+#define wcscpy(d,s) _Xwcscpy(d,s)

+

+wchar_t *_Xwcsncpy

+(

+ wchar_t		*wstr1,

+ wchar_t		*wstr2,

+ int			len

+ );

+

+#define wcsncpy(d, s, l)	_Xwcsncpy(d, s, l)

+

+#ifdef USE_XMBTOWC

+#define mbtowc(wc, s, l)	_Xmbtowc(wc, s, l)

+#endif

+#endif

+

+wchar_t _Xaw_atowc

+(

+#if NeedWidePrototypes

+ int			c

+#else

+ unsigned char		c

+#endif

+ );

+

+#ifndef HAS_ISW_FUNCS

+#include <ctype.h>

+#ifndef iswspace

+#define iswspace(c) (isascii(c) && isspace(toascii(c)))

+#endif

+#endif

+

+#if !defined(iswalnum) && !defined(HAVE_ISWALNUM)

+#define iswalnum(c) _Xaw_iswalnum(c)

+#endif

+int _Xaw_iswalnum

+(

+ wchar_t		c

+ );