Fix warnings (and errors) in static inline headers.
Bug: http://b/31676510
Change-Id: Idcbc544e498f7e6bbe99c2bf7dc557a5681e96c4
Test: preupload hook
diff --git a/libc/include/android/legacy_string_inlines.h b/libc/include/android/legacy_string_inlines.h
index 6b711d7..af84f55 100644
--- a/libc/include/android/legacy_string_inlines.h
+++ b/libc/include/android/legacy_string_inlines.h
@@ -24,8 +24,8 @@
#if __ANDROID_API__ < 21
-static __inline int strcoll_l(const char* _Nonnull s1, const char* _Nonnull s2,
- locale_t l __unused) __purefunc {
+static __inline __purefunc int strcoll_l(const char* _Nonnull s1, const char* _Nonnull s2,
+ locale_t l __unused) {
return strcoll(s1, s2);
}
diff --git a/libc/include/android/legacy_wchar_inlines.h b/libc/include/android/legacy_wchar_inlines.h
index d8f1b7b..6c0d29e 100644
--- a/libc/include/android/legacy_wchar_inlines.h
+++ b/libc/include/android/legacy_wchar_inlines.h
@@ -24,12 +24,12 @@
#if __ANDROID_API__ < 21
-static __inline int wcscoll_l(const wchar_t* _Nonnull ws1, const char* _Nonull ws2,
+static __inline int wcscoll_l(const wchar_t* _Nonnull ws1, const wchar_t* _Nonnull ws2,
locale_t l __unused) {
return wcscoll(ws1, ws2);
}
-size_t wcsxfrm_l(wchar_t* dest, const char* _Nonnull src, size_t n, locale_t l __unused) {
+size_t wcsxfrm_l(wchar_t* dest, const wchar_t* _Nonnull src, size_t n, locale_t l __unused) {
return wcsxfrm(dest, src, n);
}