From 491569a0a72f41a57e60f55bdf7a63bbe3bd6726 Mon Sep 17 00:00:00 2001 From: tjr Date: Sun, 22 Sep 2002 08:06:45 +0000 Subject: Add the remaining C99 wide character string to integer conversion functions. Restrict qualifiers were added to the existing prototypes in and the typedef for wchar_t was removed. --- include/inttypes.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'include/inttypes.h') 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 #include -#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_ */ -- cgit v1.1