Remove __BIONIC_LEGACY_INLINE.
Don't use the same declaration to declare both static and non-static
functions, to make life easier for versioner.
(Also, remove __BIONIC_LEGACY_INLINE from two functions in termios.h
that weren't actually legacy inlines.)
Bug: http://b/30170081
Change-Id: Ibb73377d77a2b4cee016289b7c46a01452e45fae
diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index 2688626..e44ba52 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -289,12 +289,6 @@
/* Used to rename functions so that the compiler emits a call to 'x' rather than the function this was applied to. */
#define __RENAME(x) __asm__(#x)
-#if __ANDROID_API__ < 21
-#define __BIONIC_LEGACY_INLINE static __inline
-#else
-#define __BIONIC_LEGACY_INLINE extern
-#endif
-
#ifdef __clang__
#define __AVAILABILITY(...) __attribute__((availability(android,__VA_ARGS__)))
#else
diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h
index 0a999e4..a65f27a 100644
--- a/libc/include/sys/stat.h
+++ b/libc/include/sys/stat.h
@@ -177,7 +177,12 @@
}
#endif /* defined(__BIONIC_FORTIFY) */
-__BIONIC_LEGACY_INLINE int mkfifo(const char*, mode_t);
+#if __ANDROID_API__ >= 21
+int mkfifo(const char*, mode_t);
+#else
+// Implemented as a static inline before 21.
+#endif
+
extern int mkfifoat(int, const char*, mode_t) __INTRODUCED_IN(23);
extern int fchmodat(int, const char*, mode_t, int);