Revert "Revert "Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines."""""
This reverts commit a074ac79d7.
Reason for revert: Broke several builds.
Change-Id: I406f0b0aa0c37961ad031d2f6c5ea4241f3f1111
This commit is contained in:
Joachim Sauer
parent
a074ac79d7
commit
54c71521b5
10 changed files with 24 additions and 38 deletions
|
|
@ -29,12 +29,11 @@
|
|||
#ifndef _ANDROID_LEGACY_ERRNO_INLINES_H
|
||||
#define _ANDROID_LEGACY_ERRNO_INLINES_H
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
static __inline int __attribute__((deprecated)) __set_errno(int n) {
|
||||
|
|
|
|||
|
|
@ -29,12 +29,10 @@
|
|||
#ifndef ANDROID_LEGACY_FENV_INLINES_ARM_H
|
||||
#define ANDROID_LEGACY_FENV_INLINES_ARM_H
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <fenv.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__ && defined(__arm__)
|
||||
|
||||
#include <fenv.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define FPSCR_RMODE_SHIFT 22
|
||||
|
|
|
|||
|
|
@ -29,12 +29,10 @@
|
|||
#ifndef ANDROID_LEGACY_FENV_INLINES_MIPS_H
|
||||
#define ANDROID_LEGACY_FENV_INLINES_MIPS_H
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <fenv.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__ && (defined(__mips__) && !defined(__LP64__))
|
||||
|
||||
#include <fenv.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define FCSR_CAUSE_SHIFT 10
|
||||
|
|
|
|||
|
|
@ -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 @@ static __inline sighandler_t signal(int s, sighandler_t f) {
|
|||
return bsd_signal(s, f);
|
||||
}
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _ANDROID_LEGACY_SIGNAL_INLINES_H_ */
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
#ifndef _ANDROID_LEGACY_STDLIB_INLINES_H_
|
||||
#define _ANDROID_LEGACY_STDLIB_INLINES_H_
|
||||
|
||||
#include <errno.h>
|
||||
#include <float.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_K__
|
||||
|
|
@ -49,10 +52,6 @@ __END_DECLS
|
|||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
|
||||
#include <errno.h>
|
||||
#include <float.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
static __inline float strtof(const char* nptr, char** endptr) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -29,13 +29,12 @@
|
|||
#pragma once
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -30,11 +30,10 @@
|
|||
#define _ANDROID_LEGACY_SYS_STAT_INLINES_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
static __inline int mkfifo(const char* __path, mode_t __mode) {
|
||||
|
|
|
|||
|
|
@ -30,13 +30,12 @@
|
|||
#define _ANDROID_LEGACY_SYS_WAIT_INLINES_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_J_MR2__
|
||||
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_J_MR2__
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
static __inline pid_t wait4(pid_t pid, int* status, int options, struct rusage* rusage) {
|
||||
|
|
|
|||
|
|
@ -30,16 +30,14 @@
|
|||
#define _ANDROID_LEGACY_TERMIOS_INLINES_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
|
||||
#include <linux/termios.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <linux/termios.h>
|
||||
|
||||
#if __ANDROID_API__ < __ANDROID_API_L__
|
||||
#define __BIONIC_TERMIOS_INLINE static __inline
|
||||
#include <bits/termios_inlines.h>
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* _ANDROID_LEGACY_TERMIOS_INLINES_H_ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue