[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.9.2.2 and 1.21.2.1

version 1.9.2.2, 2002/01/14 21:37:09 version 1.21.2.1, 2005/04/06 13:39:05
Line 66 
Line 66 
 #define _WCHAR_H_  #define _WCHAR_H_
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   #include <sys/featuretest.h>
 #include <machine/ansi.h>  #include <machine/ansi.h>
   #include <machine/wchar_limits.h>
 #include <sys/null.h>  #include <sys/null.h>
   
 #include <stdio.h> /* for FILE* */  #include <stdio.h> /* for FILE* */
Line 91  typedef _BSD_SIZE_T_ size_t;
Line 93  typedef _BSD_SIZE_T_ size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   
   struct tm;
   
   __BEGIN_DECLS
   wint_t  btowc(int);
   size_t  mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
   size_t  mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
               mbstate_t * __restrict);
   int     mbsinit(const mbstate_t *);
   size_t  mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
               mbstate_t * __restrict);
   size_t  wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
   wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict);
   wchar_t *wcschr(const wchar_t *, wchar_t);
   int     wcscmp(const wchar_t *, const wchar_t *);
   int     wcscoll(const wchar_t *, const wchar_t *);
   wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
   size_t  wcscspn(const wchar_t *, const wchar_t *);
   size_t  wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
               const struct tm * __restrict);
   size_t  wcslen(const wchar_t *);
   wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t);
   int     wcsncmp(const wchar_t *, const wchar_t *, size_t);
   wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
   wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
   wchar_t *wcsrchr(const wchar_t *, wchar_t);
   size_t  wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
               mbstate_t * __restrict);
   size_t  wcsspn(const wchar_t *, const wchar_t *);
   wchar_t *wcsstr(const wchar_t *, const wchar_t *);
   wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict,
                        wchar_t ** __restrict);
   size_t  wcsxfrm(wchar_t *, const wchar_t *, size_t);
   wchar_t *wcswcs(const wchar_t *, const wchar_t *);
   wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
   int     wmemcmp(const wchar_t *, const wchar_t *, size_t);
   wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
   wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
   wchar_t *wmemset(wchar_t *, wchar_t, size_t);
   
   size_t  wcslcat(wchar_t *, const wchar_t *, size_t);
   size_t  wcslcpy(wchar_t *, const wchar_t *, size_t);
   int     wcswidth(const wchar_t *, size_t);
   int     wctob(wint_t);
   int     wcwidth(wchar_t);
   
   unsigned long int wcstoul(const wchar_t * __restrict,
           wchar_t ** __restrict, int);
   long int wcstol(const wchar_t * __restrict,
           wchar_t ** __restrict, int);
   double wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
   
   #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \
       defined(_NETBSD_SOURCE)
   /* LONGLONG */
   long long int wcstoll(const wchar_t * __restrict,
           wchar_t ** __restrict, int);
   /* LONGLONG */
   unsigned long long int wcstoull(const wchar_t * __restrict,
           wchar_t ** __restrict, int);
   #endif
   
   wint_t ungetwc(wint_t, FILE *);
   wint_t fgetwc(FILE *);
   wchar_t *fgetws(wchar_t * __restrict, int, FILE * __restrict);
   wint_t getwc(FILE *);
   wint_t getwchar(void);
   wint_t fputwc(wchar_t, FILE *);
   int fputws(const wchar_t * __restrict, FILE * __restrict);
   wint_t putwc(wchar_t, FILE *);
   wint_t putwchar(wchar_t);
   
   int fwide(FILE *, int);
   __END_DECLS
   
 #ifndef WEOF  #ifndef WEOF
 #define WEOF    ((wint_t)-1)  #define WEOF    ((wint_t)-1)
 #endif  #endif
Line 100  typedef _BSD_SIZE_T_ size_t;
Line 176  typedef _BSD_SIZE_T_ size_t;
 #define putwc(wc, f) fputwc((wc), (f))  #define putwc(wc, f) fputwc((wc), (f))
 #define putwchar(wc) putwc((wc), stdout)  #define putwchar(wc) putwc((wc), stdout)
   
 __BEGIN_DECLS  
 size_t  mbrlen __P((const char * __restrict, size_t, mbstate_t * __restrict));  
 size_t  mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t,  
             mbstate_t * __restrict));  
 int     mbsinit __P((const mbstate_t *));  
 size_t  mbsrtowcs __P((wchar_t * __restrict, const char ** __restrict, size_t,  
             mbstate_t * __restrict));  
 size_t  wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict));  
 wchar_t *wcscat __P((wchar_t * __restrict, const wchar_t * __restrict));  
 wchar_t *wcschr __P((const wchar_t *, wchar_t));  
 int     wcscmp __P((const wchar_t *, const wchar_t *));  
 wchar_t *wcscpy __P((wchar_t * __restrict, const wchar_t * __restrict));  
 size_t  wcscspn __P((const wchar_t *, const wchar_t *));  
 size_t  wcslen __P((const wchar_t *));  
 wchar_t *wcsncat __P((wchar_t * __restrict, const wchar_t * __restrict,  
             size_t));  
 int     wcsncmp __P((const wchar_t *, const wchar_t *, size_t));  
 wchar_t *wcsncpy __P((wchar_t * __restrict , const wchar_t * __restrict,  
             size_t));  
 wchar_t *wcspbrk __P((const wchar_t *, const wchar_t *));  
 wchar_t *wcsrchr __P((const wchar_t *, wchar_t));  
 size_t  wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t,  
             mbstate_t * __restrict));  
 size_t  wcsspn __P((const wchar_t *, const wchar_t *));  
 wchar_t *wcsstr __P((const wchar_t *, const wchar_t *));  
 wchar_t *wmemchr __P((const wchar_t *, wchar_t, size_t));  
 int     wmemcmp __P((const wchar_t *, const wchar_t *, size_t));  
 wchar_t *wmemcpy __P((wchar_t * __restrict, const wchar_t * __restrict,  
             size_t));  
 wchar_t *wmemmove __P((wchar_t *, const wchar_t *, size_t));  
 wchar_t *wmemset __P((wchar_t *, wchar_t, size_t));  
   
 size_t  wcslcat __P((wchar_t *, const wchar_t *, size_t));  
 size_t  wcslcpy __P((wchar_t *, const wchar_t *, size_t));  
 int     wcswidth __P((const wchar_t *, size_t));  
 int     wcwidth __P((wchar_t));  
   
 unsigned long int wcstoul __P((const wchar_t * __restrict, wchar_t ** __restrict,  
                 int base));  
 long int wcstol __P((const wchar_t * __restrict, wchar_t ** __restrict, int base));  
 double wcstod __P((const wchar_t * __restrict, wchar_t ** __restrict));  
   
 wint_t ungetwc __P((wint_t, FILE *));  
 wint_t fgetwc __P((FILE *));  
 wint_t getwc __P((FILE *));  
 wint_t getwchar __P((void));  
 wint_t fputwc __P((wint_t, FILE *));  
 wint_t putwc __P((wint_t, FILE *));  
 wint_t putwchar __P((wint_t));  
   
 int fwide __P((FILE *, int));  
 __END_DECLS  
   
 #endif /* !_WCHAR_H_ */  #endif /* !_WCHAR_H_ */

Legend:
Removed from v.1.9.2.2  
changed lines
  Added in v.1.21.2.1

CVSweb <webmaster@jp.NetBSD.org>