[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.27.18.1 and 1.31

version 1.27.18.1, 2011/05/20 19:18:44 version 1.31, 2013/04/16 11:55:02
Line 60 
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 <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* */
Line 86  typedef _BSD_SIZE_T_ size_t;
Line 86  typedef _BSD_SIZE_T_ size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   
   #if defined(_POSIX_C_SOURCE)
   #ifndef __VA_LIST_DECLARED
   typedef __va_list va_list;
   #define __VA_LIST_DECLARED
   #endif
   #endif
   
 struct tm;  struct tm;
   
 __BEGIN_DECLS  __BEGIN_DECLS
Line 167  int fwprintf(FILE * __restrict, const wc
Line 174  int fwprintf(FILE * __restrict, const wc
 int fwscanf(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 swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, ...);
 int swscanf(const wchar_t * __restrict, 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 vfwprintf(FILE * __restrict, const wchar_t * __restrict, __va_list);
 int vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,  int vswprintf(wchar_t * __restrict, size_t, const wchar_t * __restrict,
     _BSD_VA_LIST_);      __va_list);
 int vwprintf(const wchar_t * __restrict, _BSD_VA_LIST_);  int vwprintf(const wchar_t * __restrict, __va_list);
 int wprintf(const wchar_t * __restrict, ...);  int wprintf(const wchar_t * __restrict, ...);
 int wscanf(const wchar_t * __restrict, ...);  int wscanf(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)
 int vfwscanf(FILE * __restrict, const wchar_t * __restrict, _BSD_VA_LIST_);  int vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list);
 int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,  int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
     _BSD_VA_LIST_);      __va_list);
 int vwscanf(const wchar_t * __restrict, _BSD_VA_LIST_);  int vwscanf(const wchar_t * __restrict, __va_list);
 #endif  #endif
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 struct tinfo;  struct tinfo;
Line 199  __END_DECLS
Line 206  __END_DECLS
 #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)
   
   #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
   #  ifndef __LOCALE_T_DECLARED
   typedef struct _locale          *locale_t;
   #  define __LOCALE_T_DECLARED
   #  endif
   int     wcwidth_l(wchar_t, locale_t);
   int     wcswidth_l(const wchar_t *, size_t, locale_t);
   #endif
   
 #endif /* !_WCHAR_H_ */  #endif /* !_WCHAR_H_ */

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

CVSweb <webmaster@jp.NetBSD.org>