diff options
Diffstat (limited to 'libc/include/android')
-rw-r--r-- | libc/include/android/api-level.h | 2 | ||||
-rw-r--r-- | libc/include/android/legacy_stdlib_inlines.h | 6 | ||||
-rw-r--r-- | libc/include/android/legacy_termios_inlines.h | 4 | ||||
-rw-r--r-- | libc/include/android/legacy_threads_inlines.h | 2 | ||||
-rw-r--r-- | libc/include/android/legacy_unistd_inlines.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/libc/include/android/api-level.h b/libc/include/android/api-level.h index 77ec6530b..113897c97 100644 --- a/libc/include/android/api-level.h +++ b/libc/include/android/api-level.h @@ -191,7 +191,7 @@ int android_get_application_target_sdk_version() __INTRODUCED_IN(24); #if __ANDROID_API__ < 29 /* android_get_device_api_level is a static inline before API level 29. */ -#define __BIONIC_GET_DEVICE_API_LEVEL_INLINE static __inline +#define __BIONIC_GET_DEVICE_API_LEVEL_INLINE static inline #include <bits/get_device_api_level_inlines.h> #undef __BIONIC_GET_DEVICE_API_LEVEL_INLINE diff --git a/libc/include/android/legacy_stdlib_inlines.h b/libc/include/android/legacy_stdlib_inlines.h index f0985fe61..0ca1022e8 100644 --- a/libc/include/android/legacy_stdlib_inlines.h +++ b/libc/include/android/legacy_stdlib_inlines.h @@ -38,15 +38,15 @@ __BEGIN_DECLS -static __inline double strtod_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) { +static inline double strtod_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) { return strtod(__s, __end_ptr); } -static __inline float strtof_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) { +static inline float strtof_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, locale_t _Nonnull __l) { return strtof(__s, __end_ptr); } -static __inline long strtol_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) { +static inline long strtol_l(const char* _Nonnull __s, char* _Nullable * _Nullable __end_ptr, int __base, locale_t _Nonnull __l) { return strtol(__s, __end_ptr, __base); } diff --git a/libc/include/android/legacy_termios_inlines.h b/libc/include/android/legacy_termios_inlines.h index a816b4048..e557525ab 100644 --- a/libc/include/android/legacy_termios_inlines.h +++ b/libc/include/android/legacy_termios_inlines.h @@ -39,14 +39,14 @@ #include <sys/ioctl.h> #include <sys/types.h> -#define __BIONIC_TERMIOS_INLINE static __inline +#define __BIONIC_TERMIOS_INLINE static inline #include <bits/termios_inlines.h> #endif #if __ANDROID_API__ < 35 -#define __BIONIC_TERMIOS_WINSIZE_INLINE static __inline +#define __BIONIC_TERMIOS_WINSIZE_INLINE static inline #include <bits/termios_winsize_inlines.h> #endif diff --git a/libc/include/android/legacy_threads_inlines.h b/libc/include/android/legacy_threads_inlines.h index c614cd01a..06e743813 100644 --- a/libc/include/android/legacy_threads_inlines.h +++ b/libc/include/android/legacy_threads_inlines.h @@ -32,7 +32,7 @@ #if __ANDROID_API__ < 30 -#define __BIONIC_THREADS_INLINE static __inline +#define __BIONIC_THREADS_INLINE static inline #include <bits/threads_inlines.h> #endif diff --git a/libc/include/android/legacy_unistd_inlines.h b/libc/include/android/legacy_unistd_inlines.h index 4a5206b88..ac9f3b354 100644 --- a/libc/include/android/legacy_unistd_inlines.h +++ b/libc/include/android/legacy_unistd_inlines.h @@ -32,7 +32,7 @@ #if __ANDROID_API__ < 28 -#define __BIONIC_SWAB_INLINE static __inline +#define __BIONIC_SWAB_INLINE static inline #include <bits/swab.h> #endif |