diff options
author | tjr <tjr@FreeBSD.org> | 2002-09-22 08:06:45 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2002-09-22 08:06:45 +0000 |
commit | 491569a0a72f41a57e60f55bdf7a63bbe3bd6726 (patch) | |
tree | 5ee7bfdb36ea94c32bdd040617940cdebb4326a1 /include/inttypes.h | |
parent | 4a0f4fc5b5b2985b80e2014040f5d55be76d8e96 (diff) | |
download | FreeBSD-src-491569a0a72f41a57e60f55bdf7a63bbe3bd6726.zip FreeBSD-src-491569a0a72f41a57e60f55bdf7a63bbe3bd6726.tar.gz |
Add the remaining C99 wide character string to integer conversion functions.
Restrict qualifiers were added to the existing prototypes in <inttypes.h>
and the typedef for wchar_t was removed.
Diffstat (limited to 'include/inttypes.h')
-rw-r--r-- | include/inttypes.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/inttypes.h b/include/inttypes.h index 99841b8..05171a6 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -32,13 +32,6 @@ #include <machine/_inttypes.h> #include <sys/stdint.h> -#ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; -#define _WCHAR_T_DECLARED -#endif -#endif - typedef struct { intmax_t quot; /* Quotient. */ intmax_t rem; /* Remainder. */ @@ -50,9 +43,10 @@ imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; intmax_t strtoimax(const char * __restrict, char ** __restrict, int); uintmax_t strtoumax(const char * __restrict, char ** __restrict, int); -/* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t wcstoimax(const wchar_t *, wchar_t **, int); -uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); +intmax_t wcstoimax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); +uintmax_t wcstoumax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); __END_DECLS #endif /* !_INTTYPES_H_ */ |