Module Name:    src
Committed By:   maya
Date:           Fri Dec 28 13:11:46 UTC 2018

Modified Files:
        src/include: wchar.h

Log Message:
Limit wcslcat, wcslcpy visibility to _NETBSD_SOURCE
wcswidth, wcwidth to POSIX.1-2001 or _NETBSD_SOURCE

Updated patch from kretschm in PR standards/39422


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/include/wchar.h

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

Modified files:

Index: src/include/wchar.h
diff -u src/include/wchar.h:1.42 src/include/wchar.h:1.43
--- src/include/wchar.h:1.42	Sat Oct 15 14:22:00 2016
+++ src/include/wchar.h	Fri Dec 28 13:11:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.42 2016/10/15 14:22:00 kamil Exp $	*/
+/*	$NetBSD: wchar.h,v 1.43 2018/12/28 13:11:46 maya Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -133,12 +133,18 @@ wchar_t	*wmemcpy(wchar_t * __restrict, c
 wchar_t	*wmemmove(wchar_t *, const wchar_t *, size_t);
 wchar_t	*wmemset(wchar_t *, wchar_t, size_t);
 
+#if defined(_NETBSD_SOURCE)
 size_t	wcslcat(wchar_t *, const wchar_t *, size_t);
 size_t	wcslcpy(wchar_t *, const wchar_t *, size_t);
+#endif
+
+#if defined(_NETBSD_SOURCE) || \
+    (_POSIX_C_SOURCE - 0 >= 200112L) || (_XOPEN_SOURCE - 0) >= 600
 int	wcswidth(const wchar_t *, size_t);
-int	wctob(wint_t);
 int	wcwidth(wchar_t);
+#endif
 
+int	wctob(wint_t);
 unsigned long int wcstoul(const wchar_t * __restrict,
 	wchar_t ** __restrict, int);
 long int wcstol(const wchar_t * __restrict,

Reply via email to