| commit | 9cb8639b18bc90dab461b4709607083301c9f6fc | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Tue Oct 17 08:41:23 2017 +0000 |
| committer | Orion Hodson <oth@google.com> | Tue Oct 17 08:41:23 2017 +0000 |
| tree | 36a2c69a6fdca4c4da71da08cfc08e5e4cfcf395 | |
| parent | 43df953502c9615781e73ac3cc0db2a711a86998 [diff] [blame] |
Revert "Cleanup transitive includes in the legacy inlines." This reverts commit 43df953502c9615781e73ac3cc0db2a711a86998. Reason for revert: Breaks most AOSP builds. https://android-build.googleplex.com/builds/branch-dashboard/aosp-master?build_id=4399910 Change-Id: I53459f97b7dffb1f7f602db03893564dd3cfe6bf
diff --git a/libc/include/android/legacy_strings_inlines.h b/libc/include/android/legacy_strings_inlines.h index 5d63c5a..6679c30 100644 --- a/libc/include/android/legacy_strings_inlines.h +++ b/libc/include/android/legacy_strings_inlines.h
@@ -29,19 +29,16 @@ #ifndef _ANDROID_LEGACY_STRINGS_INLINES_H_ #define _ANDROID_LEGACY_STRINGS_INLINES_H_ -#include <sys/cdefs.h> - -#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__ - #include <strings.h> +#include <sys/cdefs.h> __BEGIN_DECLS +#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__ /* Everyone except x86 had ffs since the beginning. */ static __inline int ffs(int __n) { return __builtin_ffs(__n); } +#endif __END_DECLS #endif - -#endif