[BACK]Return to wchar.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/include/wchar.h between version 1.18 and 1.30.4.1

version 1.18, 2003/04/28 23:16:15 version 1.30.4.1, 2015/01/16 09:36:12
Line 41 
Line 41 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *        This product includes software developed by the NetBSD  
  *        Foundation, Inc. and its contributors.  
  * 4. Neither the name of The NetBSD Foundation nor the names of its  
  *    contributors may be used to endorse or promote products derived  
  *    from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS   * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Line 67 
Line 60 
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
 #include <sys/featuretest.h>  #include <sys/featuretest.h>
 #include <machine/ansi.h>  #include <machine/wchar_limits.h>
   #include <sys/ansi.h>
 #include <sys/null.h>  #include <sys/null.h>
   
 #include <stdio.h> /* for FILE* */  #include <stdio.h> /* for FILE* */
   
 #ifdef  _BSD_WCHAR_T_  #if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
 typedef _BSD_WCHAR_T_   wchar_t;  typedef _BSD_WCHAR_T_   wchar_t;
 #undef  _BSD_WCHAR_T_  #undef  _BSD_WCHAR_T_
 #endif  #endif
Line 92  typedef _BSD_SIZE_T_ size_t;
Line 86  typedef _BSD_SIZE_T_ size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   
 #ifndef WEOF  #if defined(_POSIX_C_SOURCE)
 #define WEOF    ((wint_t)-1)  #ifndef __VA_LIST_DECLARED
   typedef __va_list va_list;
   #define __VA_LIST_DECLARED
   #endif
 #endif  #endif
   
 #define getwc(f) fgetwc(f)  struct tm;
 #define getwchar() getwc(stdin)  
 #define putwc(wc, f) fputwc((wc), (f))  
 #define putwchar(wc) putwc((wc), stdout)  
   
 __BEGIN_DECLS  __BEGIN_DECLS
 wint_t  btowc __P((int));  wint_t  btowc(int);
 size_t  mbrlen __P((const char * __restrict, size_t, mbstate_t * __restrict));  size_t  mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
 size_t  mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t,  size_t  mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
             mbstate_t * __restrict));              mbstate_t * __restrict);
 int     mbsinit __P((const mbstate_t *));  int     mbsinit(const mbstate_t *);
 size_t  mbsrtowcs __P((wchar_t * __restrict, const char ** __restrict, size_t,  size_t  mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
             mbstate_t * __restrict));              mbstate_t * __restrict);
 size_t  wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict));  size_t  wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
 wchar_t *wcscat __P((wchar_t * __restrict, const wchar_t * __restrict));  wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict);
 wchar_t *wcschr __P((const wchar_t *, wchar_t));  wchar_t *wcschr(const wchar_t *, wchar_t);
 int     wcscmp __P((const wchar_t *, const wchar_t *));  int     wcscmp(const wchar_t *, const wchar_t *);
 int     wcscoll __P((const wchar_t *, const wchar_t *));  int     wcscoll(const wchar_t *, const wchar_t *);
 wchar_t *wcscpy __P((wchar_t * __restrict, const wchar_t * __restrict));  wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
 size_t  wcscspn __P((const wchar_t *, const wchar_t *));  size_t  wcscspn(const wchar_t *, const wchar_t *);
 size_t  wcslen __P((const wchar_t *));  size_t  wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
 wchar_t *wcsncat __P((wchar_t * __restrict, const wchar_t * __restrict,              const struct tm * __restrict);
             size_t));  size_t  wcslen(const wchar_t *);
 int     wcsncmp __P((const wchar_t *, const wchar_t *, size_t));  wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 wchar_t *wcsncpy __P((wchar_t * __restrict , const wchar_t * __restrict,  int     wcsncmp(const wchar_t *, const wchar_t *, size_t);
             size_t));  wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
 wchar_t *wcspbrk __P((const wchar_t *, const wchar_t *));  wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
 wchar_t *wcsrchr __P((const wchar_t *, wchar_t));  wchar_t *wcsrchr(const wchar_t *, wchar_t);
 size_t  wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t,  size_t  wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
             mbstate_t * __restrict));              mbstate_t * __restrict);
 size_t  wcsspn __P((const wchar_t *, const wchar_t *));  size_t  wcsspn(const wchar_t *, const wchar_t *);
 wchar_t *wcsstr __P((const wchar_t *, const wchar_t *));  wchar_t *wcsstr(const wchar_t *, const wchar_t *);
 wchar_t *wcstok __P((wchar_t * __restrict, const wchar_t * __restrict,  wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict,
                      wchar_t ** __restrict));                       wchar_t ** __restrict);
 size_t  wcsxfrm __P((wchar_t *, const wchar_t *, size_t));  size_t  wcsxfrm(wchar_t *, const wchar_t *, size_t);
 wchar_t *wcswcs __P((const wchar_t *, const wchar_t *));  wchar_t *wcswcs(const wchar_t *, const wchar_t *);
 wchar_t *wmemchr __P((const wchar_t *, wchar_t, size_t));  wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
 int     wmemcmp __P((const wchar_t *, const wchar_t *, size_t));  int     wmemcmp(const wchar_t *, const wchar_t *, size_t);
 wchar_t *wmemcpy __P((wchar_t * __restrict, const wchar_t * __restrict,  wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
             size_t));  wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
 wchar_t *wmemmove __P((wchar_t *, const wchar_t *, size_t));  wchar_t *wmemset(wchar_t *, wchar_t, size_t);
 wchar_t *wmemset __P((wchar_t *, wchar_t, size_t));  
   size_t  wcslcat(wchar_t *, const wchar_t *, size_t);
 size_t  wcslcat __P((wchar_t *, const wchar_t *, size_t));  size_t  wcslcpy(wchar_t *, const wchar_t *, size_t);
 size_t  wcslcpy __P((wchar_t *, const wchar_t *, size_t));  int     wcswidth(const wchar_t *, size_t);
 int     wcswidth __P((const wchar_t *, size_t));  int     wctob(wint_t);
 int     wctob __P((wint_t));  int     wcwidth(wchar_t);
 int     wcwidth __P((wchar_t));  
   unsigned long int wcstoul(const wchar_t * __restrict,
 unsigned long int wcstoul __P((const wchar_t * __restrict,          wchar_t ** __restrict, int);
         wchar_t ** __restrict, int base));  long int wcstol(const wchar_t * __restrict,
 long int wcstol __P((const wchar_t * __restrict,          wchar_t ** __restrict, int);
         wchar_t ** __restrict, int base));  double wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
 double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));  
   
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \  #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \
     defined(_NETBSD_SOURCE)      defined(_NETBSD_SOURCE) || \
           (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 600
   float wcstof(const wchar_t * __restrict, wchar_t ** __restrict);
   long double wcstold(const wchar_t * __restrict, wchar_t ** __restrict);
   
 /* LONGLONG */  /* LONGLONG */
 long long int wcstoll __P((const wchar_t * __restrict,  long long int wcstoll(const wchar_t * __restrict,
         wchar_t ** __restrict, int base));          wchar_t ** __restrict, int);
 /* LONGLONG */  /* LONGLONG */
 unsigned long long int wcstoull __P((const wchar_t * __restrict,  unsigned long long int wcstoull(const wchar_t * __restrict,
         wchar_t ** __restrict, int base));          wchar_t ** __restrict, int);
 #endif  #endif
   
 wint_t ungetwc __P((wint_t, FILE *));  wint_t ungetwc(wint_t, FILE *);
 wint_t fgetwc __P((FILE *));  wint_t fgetwc(FILE *);
 wchar_t *fgetws __P((wchar_t * __restrict, int, FILE * __restrict));  wchar_t *fgetws(wchar_t * __restrict, int, FILE * __restrict);
 wint_t getwc __P((FILE *));  wint_t getwc(FILE *);
 wint_t getwchar __P((void));  wint_t getwchar(void);
 wint_t fputwc __P((wchar_t, FILE *));  wint_t fputwc(wchar_t, FILE *);
 int fputws __P((const wchar_t * __restrict, FILE * __restrict));  int fputws(const wchar_t * __restrict, FILE * __restrict);
 wint_t putwc __P((wchar_t, FILE *));  wint_t putwc(wchar_t, FILE *);
 wint_t putwchar __P((wchar_t));  wint_t putwchar(wchar_t);
   
 int fwide __P((FILE *, int));  int fwide(FILE *, int);
   
   wchar_t *fgetwln(FILE * __restrict, size_t * __restrict);
   int fwprintf(FILE * __restrict, const wchar_t * __restrict, ...);
   int fwscanf(FILE * __restrict, const wchar_t * __restrict, ...);
   int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, ...);
   int swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...);
   int vfwprintf(FILE * __restrict, const wchar_t * __restrict, __va_list);
   int vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,
       __va_list);
   int vwprintf(const wchar_t * __restrict, __va_list);
   int wprintf(const wchar_t * __restrict, ...);
   int wscanf(const wchar_t * __restrict, ...);
   #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \
       defined(_NETBSD_SOURCE) || \
           (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 600
   int vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list);
   int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
       __va_list);
   int vwscanf(const wchar_t * __restrict, __va_list);
   #endif
   #if defined(_NETBSD_SOURCE)
   struct tinfo;
   int t_putws(struct tinfo *, const wchar_t *, int, void (*)(wchar_t, void *),
       void *);
   wchar_t *wcsdup (const wchar_t *);
   int wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
   int wcscasecmp(const wchar_t *, const wchar_t *);
   #endif
 __END_DECLS  __END_DECLS
   
   #ifndef WEOF
   #define WEOF    ((wint_t)-1)
   #endif
   
   #define getwc(f) fgetwc(f)
   #define getwchar() getwc(stdin)
   #define putwc(wc, f) fputwc((wc), (f))
   #define putwchar(wc) putwc((wc), stdout)
   
 #endif /* !_WCHAR_H_ */  #endif /* !_WCHAR_H_ */
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.30.4.1
CVSweb <webmaster@jp.NetBSD.org>