diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-23 15:32:24 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-24 09:00:42 -0700 |
| commit | 086bb382db3de7459bc5fad6bb1c257ca331b0e8 (patch) | |
| tree | c31b0c477d55662b8be8e8669aa92a3c986a63d9 /libc/include | |
| parent | 027d2717d067c3706f22bf84dc1226ede7c1566d (diff) | |
| download | bionic-086bb382db3de7459bc5fad6bb1c257ca331b0e8.zip bionic-086bb382db3de7459bc5fad6bb1c257ca331b0e8.tar.gz bionic-086bb382db3de7459bc5fad6bb1c257ca331b0e8.tar.bz2 | |
Fix incorrect parameter types for locale funcs.
strtoll(3), strtoull(3), wcstoll(3), and wcstoull(3) all take an _int_
as a base, not a size_t. This is an ABI compatibility issue.
Bug: 17628622
Change-Id: I17f8eead34ce2112005899fc30162067573023ec
(cherry picked from commit 3c5037f1b3b747e79d17a5f717d9f9c365132d33)
Diffstat (limited to 'libc/include')
| -rw-r--r-- | libc/include/stdlib.h | 4 | ||||
| -rw-r--r-- | libc/include/wchar.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index 52f71dd..52f371b 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -76,8 +76,8 @@ extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__; extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__; extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__; -extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__; -extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__; +extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__; +extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__; extern int atoi(const char*) __purefunc; extern long atol(const char*) __purefunc; diff --git a/libc/include/wchar.h b/libc/include/wchar.h index 1898c7e..e0e5c82 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -151,8 +151,8 @@ extern wchar_t *wmemset(wchar_t *, wchar_t, size_t); extern int wprintf(const wchar_t *, ...); extern int wscanf(const wchar_t *, ...); -extern long long wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t); -extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t); +extern long long wcstoll_l(const wchar_t *, wchar_t **, int, locale_t); +extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t); extern long double wcstold_l(const wchar_t *, wchar_t **, locale_t ); extern int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); |