Print this page
remove support for non-ANSI compilation

Split Close
Expand all
Collapse all
          --- old/usr/src/head/iso/wchar_iso.h
          +++ new/usr/src/head/iso/wchar_iso.h
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
       23 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
       24 + *
  23   25   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  24   26   * Use is subject to license terms.
  25   27   */
  26   28  
  27   29  /*
  28      - * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  29      - */
  30      -
  31      -/*
  32   30   * An application should not include this header directly.  Instead it
  33   31   * should be included only through the inclusion of other Sun headers.
  34   32   *
  35   33   * The contents of this header is limited to identifiers specified in the
  36   34   * C Standard.  Any new identifiers specified in future amendments to the
  37   35   * C Standard must be placed in this header.  If these new identifiers
  38   36   * are required to also be in the C++ Standard "std" namespace, then for
  39   37   * anything other than macro definitions, corresponding "using" directives
  40   38   * must also be added to <wchar.h>.
  41   39   */
↓ open down ↓ 138 lines elided ↑ open up ↑
 180  178  #pragma redefine_extname fgetwc __fgetwc_xpg5
 181  179  #pragma redefine_extname getwc  __getwc_xpg5
 182  180  #pragma redefine_extname getwchar       __getwchar_xpg5
 183  181  #pragma redefine_extname fputwc __fputwc_xpg5
 184  182  #pragma redefine_extname putwc  __putwc_xpg5
 185  183  #pragma redefine_extname putwchar       __putwchar_xpg5
 186  184  #pragma redefine_extname fgetws __fgetws_xpg5
 187  185  #pragma redefine_extname fputws __fputws_xpg5
 188  186  #pragma redefine_extname ungetwc        __ungetwc_xpg5
 189  187  #else   /* __PRAGMA_REDEFINE_EXTNAME */
 190      -#ifdef __STDC__
 191  188  extern wint_t __fgetwc_xpg5(__FILE *);
 192  189  extern wint_t __getwc_xpg5(__FILE *);
 193  190  extern wint_t __getwchar_xpg5(void);
 194  191  extern wint_t __fputwc_xpg5(wint_t, __FILE *);
 195  192  extern wint_t __putwc_xpg5(wint_t, __FILE *);
 196  193  extern wint_t __putwchar_xpg5(wint_t);
 197  194  extern wchar_t *__fgetws_xpg5(wchar_t *_RESTRICT_KYWD, int,
 198  195                          __FILE *_RESTRICT_KYWD);
 199  196  extern int __fputws_xpg5(const wchar_t *_RESTRICT_KYWD, __FILE *_RESTRICT_KYWD);
 200  197  extern wint_t __ungetwc_xpg5(wint_t, __FILE *);
 201      -#else
 202      -extern wint_t __fgetwc_xpg5();
 203      -extern wint_t __getwc_xpg5();
 204      -extern wint_t __getwchar_xpg5();
 205      -extern wint_t __fputwc_xpg5();
 206      -extern wint_t __putwc_xpg5();
 207      -extern wint_t __putwchar_xpg5();
 208      -extern wchar_t *__fgetws_xpg5();
 209      -extern int __fputws_xpg5();
 210      -extern wint_t __ungetwc_xpg5();
 211      -#endif  /* __STDC__ */
 212  198  #define fgetwc  __fgetwc_xpg5
 213  199  #define getwc   __getwc_xpg5
 214  200  #define getwchar        __getwchar_xpg5
 215  201  #define fputwc  __fputwc_xpg5
 216  202  #define putwc   __putwc_xpg5
 217  203  #define putwchar        __putwchar_xpg5
 218  204  #define fgetws  __fgetws_xpg5
 219  205  #define fputws  __fputws_xpg5
 220  206  #define ungetwc __ungetwc_xpg5
 221  207  #endif  /* __PRAGMA_REDEFINE_EXTNAME */
 222  208  #endif /* not XPG4 and not XPG4v2 */
 223  209  #endif /* defined(_MSE_INT_H) */
 224  210  
 225      -#ifdef __STDC__
 226      -
 227  211  extern wint_t fgetwc(__FILE *);
 228  212  extern wchar_t *fgetws(wchar_t *_RESTRICT_KYWD, int, __FILE *_RESTRICT_KYWD);
 229  213  extern wint_t fputwc(wint_t, __FILE *);
 230  214  extern int fputws(const wchar_t *_RESTRICT_KYWD, __FILE *_RESTRICT_KYWD);
 231  215  extern wint_t ungetwc(wint_t, __FILE *);
 232  216  extern wint_t getwc(__FILE *);
 233  217  extern wint_t getwchar(void);
 234  218  extern wint_t putwc(wint_t, __FILE *);
 235  219  extern wint_t putwchar(wint_t);
 236  220  extern double wcstod(const wchar_t *_RESTRICT_KYWD, wchar_t **_RESTRICT_KYWD);
↓ open down ↓ 116 lines elided ↑ open up ↑
 353  337                  return (wchar_t *)wmemchr((const wchar_t *)__ws, __wc, __n);
 354  338          }
 355  339  }
 356  340  #else /* __cplusplus >= 199711L */
 357  341  extern wchar_t  *wcsstr(const wchar_t *_RESTRICT_KYWD,
 358  342          const wchar_t *_RESTRICT_KYWD);
 359  343  extern wchar_t  *wmemchr(const wchar_t *, wchar_t, size_t);
 360  344  #endif /* __cplusplus >= 199711L */
 361  345  #endif /* not XPG4 and not XPG4v2 */
 362  346  
 363      -#else /* __STDC__ */
 364      -
 365      -extern  wint_t fgetwc();
 366      -extern  wchar_t *fgetws();
 367      -extern  wint_t fputwc();
 368      -extern  int fputws();
 369      -extern  wint_t  ungetwc();
 370      -extern wint_t getwc();
 371      -extern wint_t getwchar();
 372      -extern wint_t putwc();
 373      -extern wint_t putwchar();
 374      -extern wint_t ungetwc();
 375      -extern double wcstod();
 376      -extern long wcstol();
 377      -extern unsigned long wcstoul();
 378      -extern wchar_t *wcscat();
 379      -extern wchar_t *wcschr();
 380      -extern int wcscmp();
 381      -extern int wcscoll();
 382      -extern wchar_t *wcscpy();
 383      -extern size_t wcscspn();
 384      -extern size_t wcslen();
 385      -extern wchar_t *wcsncat();
 386      -extern int wcsncmp();
 387      -extern wchar_t *wcsncpy();
 388      -extern wchar_t *wcspbrk();
 389      -extern wchar_t *wcsrchr();
 390      -extern size_t wcsspn();
 391      -extern size_t wcsxfrm();
 392      -
 393      -#if (!defined(_MSE_INT_H))
 394      -#if defined(_XPG4) && !defined(_XPG5) /* XPG4 or XPG4v2 */
 395      -extern wchar_t *wcstok();
 396      -extern size_t wcsftime();
 397      -#else   /* XPG4 or XPG4v2 */
 398      -#ifdef __PRAGMA_REDEFINE_EXTNAME
 399      -#pragma redefine_extname wcstok __wcstok_xpg5
 400      -#pragma redefine_extname wcsftime       __wcsftime_xpg5
 401      -extern wchar_t *wcstok();
 402      -extern size_t wcsftime();
 403      -#else   /* __PRAGMA_REDEFINE_EXTNAME */
 404      -extern wchar_t *__wcstok_xpg5();
 405      -extern size_t __wcsftime_xpg5();
 406      -#define wcstok  __wcstok_xpg5
 407      -#define wcsftime        __wcsftime_xpg5
 408      -#endif  /* __PRAGMA_REDEFINE_EXTNAME */
 409      -#endif  /* XPG4 or XPG4v2 */
 410      -#endif  /* defined(_MSE_INT_H) */
 411      -
 412      -/* not XPG4 and not XPG4v2 */
 413      -#if (!defined(_XPG4) && !defined(_XPG4_2) || defined(_XPG5))
 414      -extern wint_t   btowc();
 415      -extern int      fwprintf();
 416      -extern int      fwscanf();
 417      -extern int      fwide();
 418      -extern int      mbsinit();
 419      -extern size_t   mbrlen();
 420      -extern size_t   mbrtowc();
 421      -extern size_t   mbsrtowcs();
 422      -extern int      swprintf();
 423      -extern int      swscanf();
 424      -extern int      vfwprintf();
 425      -extern int      vwprintf();
 426      -extern int      vswprintf();
 427      -extern size_t   wcrtomb();
 428      -extern size_t   wcsrtombs();
 429      -#if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
 430      -extern size_t   wcsnrtombs();
 431      -#endif
 432      -
 433      -extern wchar_t  *wcsstr();
 434      -extern int      wctob();
 435      -extern wchar_t  *wmemchr();
 436      -extern int      wmemcmp();
 437      -extern wchar_t  *wmemcpy();
 438      -extern wchar_t  *wmemmove();
 439      -extern wchar_t  *wmemset();
 440      -extern int      wprintf();
 441      -extern int      wscanf();
 442      -#endif /* not XPG4 and not XPG4v2 */
 443      -
 444      -#endif /* __STDC__ */
 445      -
 446  347  #if __cplusplus >= 199711L
 447  348  }
 448  349  #endif /* end of namespace std */
 449  350  
 450  351  #ifdef  __cplusplus
 451  352  }
 452  353  #endif
 453  354  
 454  355  #endif  /* _ISO_WCHAR_ISO_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX