diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-29 05:41:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 05:41:59 +0000 |
| commit | b341f1738ddbed5384d87d87b74a531bdf735a6f (patch) | |
| tree | c9d82cac8a4828250f47b0a7dd18bb8da835e555 | |
| parent | 16f8d5f4a3b6d796c0f0baabb33ecbd756c05924 (diff) | |
| parent | d866a2b391ddebe54697a41f84e372332bfcd8ba (diff) | |
| download | prebuilts_ndk-b341f1738ddbed5384d87d87b74a531bdf735a6f.zip prebuilts_ndk-b341f1738ddbed5384d87d87b74a531bdf735a6f.tar.gz prebuilts_ndk-b341f1738ddbed5384d87d87b74a531bdf735a6f.tar.bz2 | |
am d866a2b3: Merge "Fixed the 3rd arg of functions strtoll_l, strtoull_l, wcstoll_l and wcstoull_l"
* commit 'd866a2b391ddebe54697a41f84e372332bfcd8ba':
Fixed the 3rd arg of functions strtoll_l, strtoull_l, wcstoll_l and wcstoull_l
6 files changed, 12 insertions, 12 deletions
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-19/arch-arm64/usr/include/stdlib.h index a0f017c..e04475c 100644 --- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h +++ b/9/platforms/android-19/arch-arm64/usr/include/stdlib.h @@ -76,8 +76,8 @@ extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; -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/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-19/arch-arm64/usr/include/wchar.h index f421d4c..cfa9b74 100644 --- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h +++ b/9/platforms/android-19/arch-arm64/usr/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 ) __NDK_FPABI__; extern int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); diff --git a/9/platforms/android-19/arch-mips64/usr/include/stdlib.h b/9/platforms/android-19/arch-mips64/usr/include/stdlib.h index a0f017c..e04475c 100644 --- a/9/platforms/android-19/arch-mips64/usr/include/stdlib.h +++ b/9/platforms/android-19/arch-mips64/usr/include/stdlib.h @@ -76,8 +76,8 @@ extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; -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/9/platforms/android-19/arch-mips64/usr/include/wchar.h b/9/platforms/android-19/arch-mips64/usr/include/wchar.h index f421d4c..cfa9b74 100644 --- a/9/platforms/android-19/arch-mips64/usr/include/wchar.h +++ b/9/platforms/android-19/arch-mips64/usr/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 ) __NDK_FPABI__; extern int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h b/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h index a0f017c..e04475c 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h @@ -76,8 +76,8 @@ extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__; -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/9/platforms/android-19/arch-x86_64/usr/include/wchar.h b/9/platforms/android-19/arch-x86_64/usr/include/wchar.h index f421d4c..cfa9b74 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/wchar.h +++ b/9/platforms/android-19/arch-x86_64/usr/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 ) __NDK_FPABI__; extern int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); |