summaryrefslogtreecommitdiffstats
path: root/libc/include
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-03-03 10:51:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-03-03 10:51:34 -0800
commit71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb (patch)
tree614c8284cd1c609dcc2ebc540ccd77b2a7ff5481 /libc/include
parentf197147a787d7415e6e0a1bad15566836c55befb (diff)
parentfd5b1bb85d0a971fd8469112a157380c4d3a146f (diff)
downloadbionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.zip
bionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.tar.gz
bionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.tar.bz2
am fd5b1bb8: Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.
Merge commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f' into eclair-mr2-plus-aosp * commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f': Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.
Diffstat (limited to 'libc/include')
-rw-r--r--libc/include/wchar.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index e2feb60..97e1b5c 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -100,6 +100,7 @@ extern int mbsinit(const mbstate_t *);
extern size_t mbrlen(const char *, size_t, mbstate_t *);
extern size_t mbrtowc(wchar_t *, const char *, size_t, mbstate_t *);
extern size_t mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *);
+extern size_t mbstowcs(wchar_t *, const char *, size_t);
extern wint_t putwc(wchar_t, FILE *);
extern wint_t putwchar(wchar_t);
extern int swprintf(wchar_t *, size_t, const wchar_t *, ...);
@@ -130,6 +131,7 @@ extern wchar_t *wcsstr(const wchar_t *, const wchar_t *);
extern double wcstod(const wchar_t *, wchar_t **);
extern wchar_t *wcstok(wchar_t *, const wchar_t *, wchar_t **);
extern long int wcstol(const wchar_t *, wchar_t **, int);
+extern size_t wcstombs(char *, const wchar_t *, size_t);
extern unsigned long int wcstoul(const wchar_t *, wchar_t **, int);
extern wchar_t *wcswcs(const wchar_t *, const wchar_t *);
extern int wcswidth(const wchar_t *, size_t);