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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/wchar.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/wchar.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.36
retrieving revision 1.42.8.1
diff -u -p -r1.36 -r1.42.8.1
--- src/include/wchar.h	2013/04/19 23:32:16	1.36
+++ src/include/wchar.h	2017/07/14 15:53:07	1.42.8.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.36 2013/04/19 23:32:16 joerg Exp $	*/
+/*	$NetBSD: wchar.h,v 1.42.8.1 2017/07/14 15:53:07 perseant Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -66,6 +66,9 @@
 
 #include <stdio.h> /* for FILE* */
 
+/* We use ISO10646 for our wchar represenation */
+#define __STDC_ISO_10646__
+
 #if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
 typedef	_BSD_WCHAR_T_	wchar_t;
 #undef	_BSD_WCHAR_T_
@@ -116,6 +119,7 @@ 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);
+size_t	wcsnlen(const wchar_t *, 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,
@@ -145,7 +149,8 @@ long int wcstol(const wchar_t * __restri
 double wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
 
 #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);
 
@@ -157,6 +162,11 @@ unsigned long long int wcstoull(const wc
 	wchar_t ** __restrict, int);
 #endif
 
+#if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
+    defined(_NETBSD_SOURCE)
+FILE	*open_wmemstream(wchar_t **, size_t *);
+#endif
+
 wint_t ungetwc(wint_t, FILE *);
 wint_t fgetwc(FILE *);
 wchar_t *fgetws(wchar_t * __restrict, int, FILE * __restrict);
@@ -181,7 +191,8 @@ int vwprintf(const wchar_t * __restrict,
 int wprintf(const wchar_t * __restrict, ...);
 int wscanf(const wchar_t * __restrict, ...);
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L || \
-    defined(_NETBSD_SOURCE)
+    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);
@@ -211,11 +222,20 @@ __END_DECLS
 typedef struct _locale		*locale_t;
 #  define __LOCALE_T_DECLARED
 #  endif
+__BEGIN_DECLS
+size_t	mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
+	    size_t, mbstate_t * __restrict);
+size_t	wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
+	    size_t, mbstate_t * __restrict);
+
 int	wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
 size_t	wcsxfrm_l(wchar_t *, const wchar_t *, size_t, locale_t);
 int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t);
 int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t);
 
+size_t	wcsftime_l(wchar_t * __restrict, size_t, const wchar_t * __restrict,
+	    const struct tm * __restrict, locale_t);
+
 float wcstof_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t);
 double wcstod_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t);
 long double wcstold_l(const wchar_t * __restrict, wchar_t ** __restrict,
@@ -232,9 +252,11 @@ unsigned long long int wcstoull_l(const 
 				  wchar_t ** __restrict, int, locale_t);
 int	wcwidth_l(wchar_t, locale_t);
 int	wcswidth_l(const wchar_t *, size_t, locale_t);
+__END_DECLS
 #endif /* _POSIX_C_SOURCE || _NETBSD_SOURCE */
 
 #if defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
 wint_t	btowc_l(int, locale_t);
 size_t	mbrlen_l(const char * __restrict, size_t, mbstate_t * __restrict,
 		locale_t);
@@ -243,9 +265,13 @@ size_t	mbrtowc_l(wchar_t * __restrict, c
 int	mbsinit_l(const mbstate_t *, locale_t);
 size_t	mbsrtowcs_l(wchar_t * __restrict, const char ** __restrict, size_t,
 	    mbstate_t * __restrict, locale_t);
+size_t	mbsnrtowcs_l(wchar_t * __restrict, const char ** __restrict, size_t,
+	    size_t, mbstate_t * __restrict, locale_t);
 size_t	wcrtomb_l(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
 size_t	wcsrtombs_l(char * __restrict, const wchar_t ** __restrict, size_t,
 	    mbstate_t * __restrict, locale_t);
+size_t	wcsnrtombs_l(char * __restrict, const wchar_t ** __restrict, size_t,
+	    size_t, mbstate_t * __restrict, locale_t);
 int	wctob_l(wint_t, locale_t);
 
 int fwprintf_l(FILE * __restrict, locale_t, const wchar_t * __restrict, ...);
@@ -267,6 +293,7 @@ int vfwscanf_l(FILE * __restrict, locale
 int vswscanf_l(const wchar_t * __restrict, locale_t, const wchar_t * __restrict,
     __va_list);
 int vwscanf_l(locale_t, const wchar_t * __restrict, __va_list);
+__END_DECLS
 #endif /* _NETBSD_SOURCE */
 
 #endif /* !_WCHAR_H_ */