diff --git a/libc/include/ftw.h b/libc/include/ftw.h index c5fa4de1d..ee154f0bb 100644 --- a/libc/include/ftw.h +++ b/libc/include/ftw.h @@ -57,8 +57,8 @@ struct FTW { __BEGIN_DECLS int ftw(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat* _Nonnull, int), int __max_fd_count) __INTRODUCED_IN(17); int nftw(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat* _Nonnull, int, struct FTW* _Nonnull), int __max_fd_count, int __flags) __INTRODUCED_IN(17); -int ftw64(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat64* _Nonnull, int), int __max_fd_count) __RENAME_STAT64(ftw, 17, 21); -int nftw64(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat64* _Nonnull, int, struct FTW* _Nonnull), int __max_fd_count, int __flags) __RENAME_STAT64(nftw, 17, 21); +int ftw64(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat64* _Nonnull, int), int __max_fd_count) __INTRODUCED_IN(21); +int nftw64(const char* _Nonnull __dir_path, int (* _Nonnull __callback)(const char* _Nonnull, const struct stat64* _Nonnull, int, struct FTW* _Nonnull), int __max_fd_count, int __flags) __INTRODUCED_IN(21); __END_DECLS #endif diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h index 8f4310d70..4154e62af 100644 --- a/libc/include/sys/cdefs.h +++ b/libc/include/sys/cdefs.h @@ -201,16 +201,6 @@ # define __RENAME_IF_FILE_OFFSET64(func) #endif -/* - * On all architectures, `struct stat` == `struct stat64`, but LP32 didn't gain the *64 functions - * until API level 21. - */ -#if defined(__LP64__) || defined(__BIONIC_LP32_USE_STAT64) -#define __RENAME_STAT64(rewrite,rewrite_api_level,regular_api_level) __INTRODUCED_IN(regular_api_level) -#else -#define __RENAME_STAT64(rewrite,rewrite_api_level,regular_api_level) __RENAME(rewrite) __INTRODUCED_IN(rewrite_api_level) -#endif - /* glibc compatibility. */ #if defined(__LP64__) #define __WORDSIZE 64 diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h index 54621b7b3..f773ff695 100644 --- a/libc/include/sys/stat.h +++ b/libc/include/sys/stat.h @@ -141,13 +141,13 @@ int fchmod(int __fd, mode_t __mode); int mkdir(const char* _Nonnull __path, mode_t __mode); int fstat(int __fd, struct stat* _Nonnull __buf); -int fstat64(int __fd, struct stat64* _Nonnull __buf) __RENAME_STAT64(fstat, 3, 21); +int fstat64(int __fd, struct stat64* _Nonnull __buf) __INTRODUCED_IN(21); int fstatat(int __dir_fd, const char* _Nonnull __path, struct stat* _Nonnull __buf, int __flags); -int fstatat64(int __dir_fd, const char* _Nonnull __path, struct stat64* _Nonnull __buf, int __flags) __RENAME_STAT64(fstatat, 3, 21); +int fstatat64(int __dir_fd, const char* _Nonnull __path, struct stat64* _Nonnull __buf, int __flags) __INTRODUCED_IN(21); int lstat(const char* _Nonnull __path, struct stat* _Nonnull __buf); -int lstat64(const char* _Nonnull __path, struct stat64* _Nonnull __buf) __RENAME_STAT64(lstat, 3, 21); +int lstat64(const char* _Nonnull __path, struct stat64* _Nonnull __buf) __INTRODUCED_IN(21); int stat(const char* _Nonnull __path, struct stat* _Nonnull __buf); -int stat64(const char* _Nonnull __path, struct stat64* _Nonnull __buf) __RENAME_STAT64(stat, 3, 21); +int stat64(const char* _Nonnull __path, struct stat64* _Nonnull __buf) __INTRODUCED_IN(21); int mknod(const char* _Nonnull __path, mode_t __mode, dev_t __dev); mode_t umask(mode_t __mask);