diff options
| author | tjr <tjr@FreeBSD.org> | 2002-10-27 11:30:36 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2002-10-27 11:30:36 +0000 |
| commit | f51c6e7d5d9eab00abaf5baeab43252925996751 (patch) | |
| tree | 07f0cd45449d263118549ac8a6559a0351b1ea19 /include | |
| parent | 4a5e62a6e71f30d5c39185e90a68408ba9fc2deb (diff) | |
| download | FreeBSD-src-f51c6e7d5d9eab00abaf5baeab43252925996751.zip FreeBSD-src-f51c6e7d5d9eab00abaf5baeab43252925996751.tar.gz | |
Correct visibility for v*wscanf(), wcstoll() and wcstoull(). These functions
did not exist in ISO C Amd. 1. Add #ifdef __LONG_LONG_SUPPORTED and lint
comments around wcstoll() and wcstoull().
Diffstat (limited to 'include')
| -rw-r--r-- | include/wchar.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/include/wchar.h b/include/wchar.h index b62eb19..3ed992c 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -129,14 +129,9 @@ int swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...); wint_t ungetwc(wint_t, struct __sFILE *); int vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, __va_list); -int vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, - __va_list); int vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, __va_list); -int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict, - __va_list); int vwprintf(const wchar_t * __restrict, __va_list); -int vwscanf(const wchar_t * __restrict, __va_list); 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); @@ -163,12 +158,8 @@ double wcstod(const wchar_t * __restrict, wchar_t ** __restrict); wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t ** __restrict); long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); -long long - wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int); unsigned long wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); -unsigned long long - wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int); 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); @@ -177,6 +168,22 @@ wchar_t *wmemset(wchar_t *, wchar_t, size_t); int wprintf(const wchar_t * __restrict, ...); int wscanf(const wchar_t * __restrict, ...); +#if __ISO_C_VISIBLE >= 1999 +int vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, + __va_list); +int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict, + __va_list); +int vwscanf(const wchar_t * __restrict, __va_list); +#ifdef __LONG_LONG_SUPPORTED +/* LONGLONG */ +long long + wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int); +/* LONGLONG */ +unsigned long long + wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int); +#endif +#endif /* __ISO_C_VISIBLE >= 1999 */ + #if __XSI_VISIBLE int wcswidth(const wchar_t *, size_t); int wcwidth(wchar_t); |
