commit 2f94a29d9cf9574e38e87e7c8f760dd7277ab49a
author Elliott Hughes <enh@google.com> Mon Sep 18 14:40:01 2017 -0700
committer Elliott Hughes <enh@google.com> Tue Sep 19 18:34:40 2017 +0000
tree 0890e98315da47a921bbea2c299deb2fe5239e63
parent 0c9ea17e0c31540cb2caab7ec2149ae40670b2d2

Rename _Exit in a way that works with libandroid_support.

Bug: N/A
Test: builds
Change-Id: I2aeaf9bafe7d51e91b67f22d68f4e52191df062b

libc/include/android/legacy_stdlib_inlines.h

diff --git a/libc/include/android/legacy_stdlib_inlines.h b/libc/include/android/legacy_stdlib_inlines.h
index 0d6f2c2..e26e5f2 100644
--- a/libc/include/android/legacy_stdlib_inlines.h
+++ b/libc/include/android/legacy_stdlib_inlines.h
@@ -38,8 +38,6 @@
 
 __BEGIN_DECLS
 
-__noreturn void _Exit(int) __RENAME(_exit);
-
 static __inline float strtof(const char* nptr, char** endptr) {
   double d = strtod(nptr, endptr);
   if (d > FLT_MAX) {

libc/include/stdlib.h

diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h
index 86336a0..cf0dea8 100644
--- a/libc/include/stdlib.h
+++ b/libc/include/stdlib.h
@@ -43,7 +43,12 @@
 
 __noreturn void abort(void);
 __noreturn void exit(int __status);
+#if __ANDROID_API__ >= __ANDROID_API_L__
 __noreturn void _Exit(int __status) __INTRODUCED_IN(21);
+#else
+__noreturn void _Exit(int) __RENAME(_exit);
+#endif
+
 int atexit(void (*__fn)(void));
 
 int at_quick_exit(void (*__fn)(void)) __INTRODUCED_IN(21);