diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-07 11:42:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 11:42:29 +0000 |
| commit | 6376b84869141d8fbecc998ab97f6681c9cbefd9 (patch) | |
| tree | 28fcd46702dd2b2921e320a2eb6335e747db211b | |
| parent | 6bd6d75d83ea21f009a889e19529f3e8540072c3 (diff) | |
| parent | 6295547918799d2160d79dc153e06435a8ac6be1 (diff) | |
| download | prebuilts_ndk-6376b84869141d8fbecc998ab97f6681c9cbefd9.zip prebuilts_ndk-6376b84869141d8fbecc998ab97f6681c9cbefd9.tar.gz prebuilts_ndk-6376b84869141d8fbecc998ab97f6681c9cbefd9.tar.bz2 | |
am 62955479: Merge "Fix prototype of strtoll_l, strtoull_l, towlower_l and towupper_l"
* commit '6295547918799d2160d79dc153e06435a8ac6be1':
Fix prototype of strtoll_l, strtoull_l, towlower_l and towupper_l
| -rw-r--r-- | 9/sources/android/support/include/stdlib.h | 4 | ||||
| -rw-r--r-- | 9/sources/android/support/include/wctype.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/9/sources/android/support/include/stdlib.h b/9/sources/android/support/include/stdlib.h index 359a421..f145219 100644 --- a/9/sources/android/support/include/stdlib.h +++ b/9/sources/android/support/include/stdlib.h @@ -44,8 +44,8 @@ void _Exit(int); int mbtowc(wchar_t *pwc, const char *pmb, size_t max); long strtol_l(const char *nptr, char **endptr, int base, locale_t loc); unsigned long strtoul_l(const char *nptr, char **endptr, int base, locale_t loc); -long long strtoll_l(const char *nptr, char **endptr, size_t base, locale_t loc); -unsigned long long strtoull_l(const char *nptr, char **endptr, size_t base, locale_t loc); +long long strtoll_l(const char *nptr, char **endptr, int base, locale_t loc); +unsigned long long strtoull_l(const char *nptr, char **endptr, int base, locale_t loc); long double strtold_l(const char *nptr, char **endptr, locale_t loc); #endif // !__LP64__ diff --git a/9/sources/android/support/include/wctype.h b/9/sources/android/support/include/wctype.h index c0fdebf..6efc58a 100644 --- a/9/sources/android/support/include/wctype.h +++ b/9/sources/android/support/include/wctype.h @@ -84,8 +84,8 @@ int iswspace_l(wint_t, locale_t); int iswupper_l(wint_t, locale_t); int iswxdigit_l(wint_t, locale_t); -wint_t towlower_l(wint_t, locale_t); -wint_t towupper_l(wint_t, locale_t); +int towlower_l(int, locale_t); +int towupper_l(int, locale_t); #endif // !__LP64__ |