commit a074ac79d7ac0be5537a8a5bcc1ac15c57d4c22b
author Dan Albert <danalbert@google.com> Tue Oct 24 21:52:16 2017 +0000
committer Dan Albert <danalbert@google.com> Thu Jan 11 09:43:23 2018 -0800
tree c237d742b2d1136ff551f48c3bc63fb1ccc48c6d
parent 25a3087d6dde58e126c5ecb1033319ff333fcc59

Revert "Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines.""""

This reverts commit b37e9aa9a63b7b703b5a03347555b1df9ac98ab3.

Reason for revert: trying again
Test: make native
Change-Id: Ide23f0a752fd6ca88e44449e996eb5809db6712d

libc/include/android/legacy_signal_inlines.h

diff --git a/libc/include/android/legacy_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index 4d474b0..44c2f4f 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -29,16 +29,16 @@
 #ifndef _ANDROID_LEGACY_SIGNAL_INLINES_H_
 #define _ANDROID_LEGACY_SIGNAL_INLINES_H_
 
+#include <sys/cdefs.h>
+
+#if __ANDROID_API__ < __ANDROID_API_L__
+
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
-#include <sys/cdefs.h>
-
 
 __BEGIN_DECLS
 
-#if __ANDROID_API__ < __ANDROID_API_L__
-
 sighandler_t bsd_signal(int __signal, sighandler_t __handler) __REMOVED_IN(21);
 
 /* These weren't introduced until L. */
@@ -117,8 +117,8 @@
   return bsd_signal(s, f);
 }
 
-#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
-
 __END_DECLS
 
+#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
+
 #endif /* _ANDROID_LEGACY_SIGNAL_INLINES_H_ */