API guard every post-21 API.
This was generated mechanically by reverting my recent re-hide commits
(except for mempcpy, but versioner cleaned that up for me anyway),
reverting the commits which removed versioner, then:
```
m out/soong/ndk_headers.timestamp
cp -r out/soong/ndk/sysroot/usr/include/* bionic/libc/include
git -C bionic clean -df
```
Effectively, this has restored the `versioner` processed headers, but
I'm checking the results of that in so we don't have to keep
`versioner` around.
For the NDK, this restores r27 behavior by default. Anyone that's
opted into weak APIs will get the new behavior. I think this is our
best option. Anyone writing code with Android in mind should be using
weak APIs, but any code being lightly ported (and thus using the
default configuration) should not be, and it's those ports where we're
having trouble with collisions.
Bug: https://github.com/android/ndk/issues/2081
Test: None
Change-Id: I370079d27566b0c1543fb5890c958c8d09b05006
diff --git a/libc/include/error.h b/libc/include/error.h
index 4d6a965..a9bdc24 100644
--- a/libc/include/error.h
+++ b/libc/include/error.h
@@ -37,9 +37,6 @@
__BEGIN_DECLS
-// These cause issues with gnulib's polyfill
-// https://github.com/android/ndk/issues/2081
-#if __ANDROID_API__ >= 23
/**
* [error_print_progname(3)](https://man7.org/linux/man-pages/man3/error_print_progname.3.html) is
* a function pointer that, if non-null, is called by error() instead of prefixing errors with the
@@ -47,10 +44,10 @@
*
* Available since API level 23.
*/
-extern void (* _Nullable error_print_progname)(void) __INTRODUCED_IN(23);
-#endif
-#if __ANDROID_API__ >= 23
+#if __BIONIC_AVAILABILITY_GUARD(23)
+extern void (* _Nullable error_print_progname)(void) __INTRODUCED_IN(23);
+
/**
* [error_message_count(3)](https://man7.org/linux/man-pages/man3/error_message_count.3.html) is
* a global count of the number of calls to error() and error_at_line().
@@ -58,7 +55,6 @@
* Available since API level 23.
*/
extern unsigned int error_message_count __INTRODUCED_IN(23);
-#endif
/**
* [error_one_per_line(3)](https://man7.org/linux/man-pages/man3/error_one_per_line.3.html) is
@@ -87,5 +83,7 @@
* Available since API level 23.
*/
void error_at_line(int __status, int __errno, const char* _Nonnull __filename, unsigned int __line_number, const char* _Nonnull __fmt, ...) __printflike(5, 6) __INTRODUCED_IN(23);
+#endif /* __BIONIC_AVAILABILITY_GUARD(23) */
+
__END_DECLS