[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.21 and 1.27.18.1

version 1.21, 2005/02/03 04:39:32 version 1.27.18.1, 2011/05/20 19:18:44
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 73 
Line 66 
   
 #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 93  typedef _BSD_SIZE_T_ size_t;
Line 86  typedef _BSD_SIZE_T_ size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   
   struct tm;
   
 __BEGIN_DECLS  __BEGIN_DECLS
 wint_t  btowc(int);  wint_t  btowc(int);
 size_t  mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);  size_t  mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
Line 108  int wcscmp(const wchar_t *, const wchar_
Line 103  int wcscmp(const wchar_t *, const wchar_
 int     wcscoll(const wchar_t *, const wchar_t *);  int     wcscoll(const wchar_t *, const wchar_t *);
 wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);  wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
 size_t  wcscspn(const wchar_t *, const wchar_t *);  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 *);  size_t  wcslen(const wchar_t *);
 wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t);  wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 int     wcsncmp(const wchar_t *, const wchar_t *, size_t);  int     wcsncmp(const wchar_t *, const wchar_t *, size_t);
Line 142  double wcstod(const wchar_t * __restrict
Line 139  double wcstod(const 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)
   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(const wchar_t * __restrict,  long long int wcstoll(const wchar_t * __restrict,
         wchar_t ** __restrict, int);          wchar_t ** __restrict, int);
Line 161  wint_t putwc(wchar_t, FILE *);
Line 161  wint_t putwc(wchar_t, FILE *);
 wint_t putwchar(wchar_t);  wint_t putwchar(wchar_t);
   
 int fwide(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, _BSD_VA_LIST_);
   int vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,
       _BSD_VA_LIST_);
   int vwprintf(const wchar_t * __restrict, _BSD_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)
   int vfwscanf(FILE * __restrict, const wchar_t * __restrict, _BSD_VA_LIST_);
   int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
       _BSD_VA_LIST_);
   int vwscanf(const wchar_t * __restrict, _BSD_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  #ifndef WEOF

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.27.18.1

CVSweb <webmaster@jp.NetBSD.org>