aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTim J. Robbins <tjr@FreeBSD.org>2002-09-22 08:06:45 +0000
committerTim J. Robbins <tjr@FreeBSD.org>2002-09-22 08:06:45 +0000
commit1302dabd28a369708901ba5eb79d0646cc544644 (patch)
tree5ee7bfdb36ea94c32bdd040617940cdebb4326a1 /include
parent04a42d5ee0a27708c0b934aca0a1cddcc7743487 (diff)
downloadsrc-1302dabd28a369708901ba5eb79d0646cc544644.tar.gz
src-1302dabd28a369708901ba5eb79d0646cc544644.zip
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.
Notes
Notes: svn path=/head/; revision=103793
Diffstat (limited to 'include')
-rw-r--r--include/inttypes.h14
-rw-r--r--include/wchar.h4
2 files changed, 8 insertions, 10 deletions
diff --git a/include/inttypes.h b/include/inttypes.h
index 99841b8f957d..05171a6c9d42 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_ */
diff --git a/include/wchar.h b/include/wchar.h
index e490242c2d93..f322614352f4 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -154,8 +154,12 @@ 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);