commit 6cd9fb080caca2d0d8fcb8f400c1ec466e7b2466
author Josh Gao <jmgao@google.com> Fri Sep 23 14:06:05 2016 -0700
committer Josh Gao <jmgao@google.com> Fri Sep 23 14:34:03 2016 -0700
tree 100dbbffe89a02329ac0effd96ea3c322a2b9a77
parent 01733796100d63baf0b27f647fed98894e05a29a

Fix warnings (and errors) in static inline headers.

Bug: http://b/31676510
Change-Id: Idcbc544e498f7e6bbe99c2bf7dc557a5681e96c4
Test: preupload hook

libc/include/time.h

diff --git a/libc/include/time.h b/libc/include/time.h
index 691aa06..898b816 100644
--- a/libc/include/time.h
+++ b/libc/include/time.h
@@ -76,7 +76,12 @@
 
 char* strptime(const char*, const char*, struct tm*);
 size_t strftime(char*, size_t, const char*, const struct tm*);
+
+#if __ANDROID_API__ >= 21
 size_t strftime_l(char*, size_t, const char*, const struct tm*, locale_t) __INTRODUCED_IN(21);
+#else
+// Implemented as static inline before 21.
+#endif
 
 char* ctime(const time_t*);
 char* ctime_r(const time_t*, char*);