--- stdcxx-4.2.1/include/ansi/cwchar	2008-04-24 20:23:56.000000000 -0400

+++ stdcxx-4.2.1/include/ansi/cwchar	2009-03-12 16:35:36.000000000 -0400

@@ -1,1372 +1,34 @@

 // -*- C++ -*-

-/***************************************************************************

+/**

+ * CDDL HEADER START

  *

- * cwchar - C++ Standard library interface to the ANSI C header wchar.h

+ * The contents of this file are subject to the terms of the

+ * Common Development and Distribution License (the "License").

+ * You may not use this file except in compliance with the License.

  *

- * $Id: cwchar 597425 2007-11-22 15:20:29Z faridz $

+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

+ * or http://www.opensolaris.org/os/licensing.

+ * See the License for the specific language governing permissions

+ * and limitations under the License.

  *

- ***************************************************************************

+ * When distributing Covered Code, include this CDDL HEADER in each

+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.

+ * If applicable, add the following below this CDDL HEADER, with the

+ * fields enclosed by brackets "[]" replaced with your own identifying

+ * information: Portions Copyright [yyyy] [name of copyright owner]

  *

- * Licensed to the Apache Software  Foundation (ASF) under one or more

- * contributor  license agreements.  See  the NOTICE  file distributed

- * with  this  work  for  additional information  regarding  copyright

- * ownership.   The ASF  licenses this  file to  you under  the Apache

- * License, Version  2.0 (the  "License"); you may  not use  this file

- * except in  compliance with the License.   You may obtain  a copy of

- * the License at

+ * CDDL HEADER END

  *

- * http://www.apache.org/licenses/LICENSE-2.0

  *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the  License is distributed on an  "AS IS" BASIS,

- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or

- * implied.   See  the License  for  the  specific language  governing

- * permissions and limitations under the License.

+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.

+ * Use is subject to license terms.

  *

- * Copyright 1998-2006 Rogue Wave Software.

- * 

- **************************************************************************/

-

-#include <rw/_defs.h>

-

-#ifndef _RWSTD_NO_PURE_C_HEADERS

-#  include <ansi/_cwchar.h>

-#else

-

-#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS

-

-#ifndef _RWSTD_NAMESPACE_STD_OPEN

-#define _RWSTD_NAMESPACE_STD_OPEN 17

-

-_RWSTD_NAMESPACE (std) { 

-

-#endif   // _RWSTD_NAMESPACE_STD_OPEN

-

-

-#include _RWSTD_ANSI_C_WCHAR_H

-

-

-#ifdef _RWSTD_STRICT_ANSI

-// 17.4.1.2, p6 - masking macros are not allowed

-#  undef getwc

-#  undef putwc

-#endif   // _RWSTD_STRICT_ANSI

-

-

-#if _RWSTD_NAMESPACE_STD_OPEN == 17

-#undef _RWSTD_NAMESPACE_STD_OPEN

-

-}   // namespace std

-

-#endif   // _RWSTD_NAMESPACE_STD_OPEN == 17

-

-#else   // if defined (_RWSTD_NO_DEPRECATED_C_HEADERS)

-

-#ifndef _RWSTD_CWCHAR_INCLUDED

-#define _RWSTD_CWCHAR_INCLUDED

-

-#include _RWSTD_ANSI_C_WCHAR_H

-#include <rw/_mbstate.h>

-

-

-// #define WEOF when not #defined (see also <cwctype>)

-#if !defined WEOF

-#  ifndef _RWSTD_NO_WINT_T

-#    define WEOF _RWSTD_STATIC_CAST (_RWSTD_WINT_T, -1)

-#  else

-#    define WEOF (-1)

-#  endif

-#endif   // WEOF

-

-

-#ifndef NULL

-#  define NULL 0

-#endif   // NULL

-

-

-#if !defined (_RWSTD_NO_NAMESPACE) && !defined (_RWSTD_NO_HONOR_STD)

-

-

-#ifndef WCHAR_MIN

-#  define WCHAR_MIN   _RWSTD_WCHAR_MIN

-#endif   // WCHAR_MIN

-

-#ifndef WCHAR_MAX

-#  define WCHAR_MAX   _RWSTD_WCHAR_MAX

-#endif   // WCHAR_MAX

-

-

-#if !defined (_RWSTD_NO_USING_LIBC_IN_STD)

-

-namespace std {

-

-#ifndef _RWSTD_NO_SIZE_T

-using ::size_t;

-#elif defined (_RWSTD_SIZE_T)

-    typedef _RWSTD_SIZE_T size_t;

-#endif   // _RWSTD_NO_SIZE_T

-

-#ifdef _RWSTD_NO_STD_MBSTATE_T

-

-using ::mbstate_t;

-

-#endif   // _RWSTD_NO_STD_MBSTATE_T

-

-#ifndef _RWSTD_NO_WINT_T

-using ::wint_t;

-#elif defined (_RWSTD_WINT_T)

-    typedef _RWSTD_WINT_T wint_t;

-#endif   // _RWSTD_NO_WINT_T

-

-#ifndef _RWSTD_NO_STRUCT_TM_IN_WCHAR_H

-using ::tm;

-#elif !defined (_RWSTD_NO_STRUCT_TM)

-

-}   // namespace std

-

-#include _RWSTD_ANSI_C_TIME_H

-

-namespace std {

-

-using ::tm;

-

-#endif   // NO_STRUCT_TM

-

-#ifndef _RWSTD_NO_BTOWC

-using ::btowc;

-#elif !defined (_RWSTD_NO_BTOWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t btowc (int);

-

-namespace std {

-

-using ::btowc;

-

-#  undef _RWSTD_NO_BTOWC

-#endif   // _RWSTD_NO_BTOWC

-

-#ifndef _RWSTD_NO_FGETWC

-using ::fgetwc;

-#elif !defined (_RWSTD_NO_FGETWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t fgetwc (FILE*);

-

-namespace std {

-

-using ::fgetwc;

-

-#  undef _RWSTD_NO_FGETWC

-#endif   // _RWSTD_NO_FGETWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FGETWS

-using ::fgetws;

-#elif !defined (_RWSTD_NO_FGETWS_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wchar_t fgetws (wchar_t*, int, FILE*);

-

-namespace std {

-

-using ::fgetws;

-

-#  undef _RWSTD_NO_FGETWS

-#endif   // _RWSTD_NO_FGETWS[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FPUTWC

-using ::fputwc;

-#elif !defined (_RWSTD_NO_FPUTWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t fputwc (wint_t, FILE*);

-

-namespace std {

-

-using ::fputwc;

-

-#  undef _RWSTD_NO_FPUTWC

-#endif   // _RWSTD_NO_FPUTWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FPUTWS

-using ::fputws;

-#elif !defined (_RWSTD_NO_FPUTWS_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int fputws (const wchar_t*, FILE*);

-

-namespace std {

-

-using ::fputws;

-

-#  undef _RWSTD_NO_FPUTWS

-#endif   // _RWSTD_NO_FPUTWS[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FWIDE

-using ::fwide;

-#elif !defined (_RWSTD_NO_FWIDE_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int fwide (FILE*, int);

-

-namespace std {

-

-using ::fwide;

-

-#  undef _RWSTD_NO_FWIDE

-#endif   // _RWSTD_NO_FWIDE[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FWPRINTF

-using ::fwprintf;

-#elif !defined (_RWSTD_NO_FWPRINTF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int fwprintf (FILE*, const wchar_t*, ...);

-

-namespace std {

-

-using ::fwprintf;

-

-#  undef _RWSTD_NO_FWPRINTF

-#endif   // _RWSTD_NO_FWPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_FWSCANF

-using ::fwscanf;

-#elif !defined (_RWSTD_NO_FWSCANF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int fwscanf (FILE*, const wchar_t*, ...);

-

-namespace std {

-

-using ::fwscanf;

-

-#  undef _RWSTD_NO_FWSCANF

-#endif   // _RWSTD_NO_FWSCANF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_GETWC

-using ::getwc;

-#elif !defined (_RWSTD_NO_GETWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t getwc (FILE*);

-

-namespace std {

-

-using ::getwc;

-

-#  undef _RWSTD_NO_GETWC

-#endif   // _RWSTD_NO_GETWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_PUTWC

-using ::putwc;

-#elif !defined (_RWSTD_NO_PUTWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t putwc (wint_t, FILE*);

-

-namespace std {

-

-using ::putwc;

-

-#  undef _RWSTD_NO_PUTWC

-#endif   // _RWSTD_NO_PUTWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_GETWCHAR

-using ::getwchar;

-#elif !defined (_RWSTD_NO_GETWCHAR_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t getwchar ();

-

-namespace std {

-

-using ::getwchar;

-

-#  undef _RWSTD_NO_GETWCHAR

-#endif   // _RWSTD_NO_GETWCHAR[_IN_LIBC]

-

-#ifndef _RWSTD_NO_PUTWCHAR

-using ::putwchar;

-#elif !defined (_RWSTD_NO_PUTWCHAR_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t putwchar (wint_t);

-

-namespace std {

-

-using ::putwchar;

-

-#  undef _RWSTD_NO_PUTWCHAR

-#endif   // _RWSTD_NO_PUTWCHAR[_IN_LIBC]

-

-#ifndef _RWSTD_NO_SWPRINTF

-using ::swprintf;

-#elif !defined (_RWSTD_NO_SWPRINTF_IN_LIBC)

-

-}   // namespace std

-

-#if _MSC_VER < 1310   // MSVC < 7.1 or (better yet) not MSVC

-

-extern "C" {

-

-_RWSTD_DLLIMPORT int

-swprintf (wchar_t*, size_t, const wchar_t*, ...);

-

-}   // extern "C"

-

-#elif _MSC_VER == 1310   // MSVC 7.1

-

-// MSVC 8.0 defines the C++ overload of swprintf() inline

-/* extern "C++" */ _RWSTD_DLLIMPORT int

-swprintf (wchar_t*, size_t, const wchar_t*, ...);

-

-#else   // MSVC 8.0 and above

-

-// MSVC 7.1 declares two overloads of swprintf()

-/* extern "C++" */ int

-swprintf (wchar_t*, size_t, const wchar_t*, ...);

-

-#endif   // MSVC

-

-namespace std {

-

-using ::swprintf;

-

-#  undef _RWSTD_NO_SWPRINTF

-#endif   // _RWSTD_NO_SWPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_SWSCANF

-using ::swscanf;

-#elif !defined (_RWSTD_NO_SWSCANF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int swscanf (const wchar_t*, const wchar_t*, ...);

-

-namespace std {

-

-using ::swscanf;

-

-#  undef _RWSTD_NO_SWSCANF

-#endif   // _RWSTD_NO_SWSCANF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_UNGETWC

-using ::ungetwc;

-#elif !defined (_RWSTD_NO_UNGETWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" wint_t ungetwc (wint_t, FILE*);

-

-namespace std {

-

-using ::ungetwc;

-

-#  undef _RWSTD_NO_UNGETWC

-#endif   // _RWSTD_NO_UNGETWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_VFWPRINTF

-using ::vfwprintf;

-#elif !defined (_RWSTD_NO_VFWPRINTF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int vfwprintf (FILE*, const wchar_t *format, _RWSTD_VA_LIST);

-

-namespace std {

-

-using ::vfwprintf;

-

-#  undef _RWSTD_NO_VFWPRINTF

-#endif   // _RWSTD_NO_VFWPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_VSWPRINTF

-using ::vswprintf;

-#elif !defined (_RWSTD_NO_VSWPRINTF_IN_LIBC)

-

-}   // namespace std

-

-#if _MSC_VER < 1310   // MSVC < 7.1 or (better yet) not MSVC

-

-extern "C" {

-

-_RWSTD_DLLIMPORT int

-vswprintf (wchar_t*, size_t, const wchar_t*, _RWSTD_VA_LIST);

-

-}   // extern "C"

-

-#elif _MSC_VER == 1310   // MSVC 7.1

-

-// MSVC 7.1 declares two overloads of swprintf()

-/* extern "C++" */ _RWSTD_DLLIMPORT int

-swprintf (wchar_t*, size_t, const wchar_t*, ...);

-

-#else   // MSVC 8.0 and above

-

-// MSVC 8.0 defines the C++ overload of vswprintf() inline

-/* extern "C++" */ int

-vswprintf (wchar_t*, size_t, const wchar_t*, _RWSTD_VA_LIST);

-

-#endif   // MSVC

-

-namespace std {

-

-using ::vswprintf;

-

-#  undef _RWSTD_NO_VSWPRINTF

-#endif   // _RWSTD_NO_VSWPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_VWPRINTF

-using ::vwprintf;

-#elif !defined (_RWSTD_NO_VWPRINTF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int vwprintf (const wchar_t*, _RWSTD_VA_LIST);

-

-namespace std {

-

-using ::vwprintf;

-

-#  undef _RWSTD_NO_VWPRINTF

-#endif   // _RWSTD_NO_VWPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_WPRINTF

-using ::wprintf;

-#elif !defined (_RWSTD_NO_WPRINTF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int wprintf (const wchar_t*, ...);

-

-namespace std {

-

-using ::wprintf;

-

-#  undef _RWSTD_NO_WPRINTF

-#endif   // _RWSTD_NO_WPRINTF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_WSCANF

-using ::wscanf;

-#elif !defined (_RWSTD_NO_WSCANF_IN_LIBC)

-

-}   // namespace std

-

-extern "C" int wscanf (const wchar_t*, ...);

-

-namespace std {

-

-using ::wscanf;

-

-#  undef _RWSTD_NO_WSCANF

-#endif   // _RWSTD_NO_WSCANF[_IN_LIBC]

-

-#ifndef _RWSTD_NO_MBRLEN

-using ::mbrlen;

-#elif !defined (_RWSTD_NO_MBRLEN_IN_LIBC)

-

-}   // namespace std

-

-extern "C" size_t mbrlen (const char*, size_t, _RWSTD_MBSTATE_T*);

-

-namespace std {

-

-using ::mbrlen;

-

-#  undef _RWSTD_NO_MBRLEN

-#endif   // _RWSTD_NO_MBRLEN

-

-#ifndef _RWSTD_NO_MBRTOWC

-using ::mbrtowc;

-#elif !defined (_RWSTD_NO_MBRTOWC_IN_LIBC)

-

-}   // namespace std

-

-extern "C" size_t mbrtowc (wchar_t*, const char*, size_t, _RWSTD_MBSTATE_T*);

-

-namespace std {

-

-using ::mbrtowc;

-

-#  undef _RWSTD_MBRTOWC

-#endif   // _RWSTD_MBRTOWC[_IN_LIBC]

-

-#ifndef _RWSTD_NO_MBSINIT

-using ::mbsinit;

-#elif !defined (_RWSTD_NO_MBSINIT_IN_LIBC)