pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove <sys/socket.h> inlines for obsolete API levels. 

The next NDK to take these headers only supports API 21 and later.

Test: treehugger
Change-Id: I445eb6ea2d42c3c8a4beb12ef88ba423cfb64f20
This commit is contained in:
Elliott Hughes 2023-02-24 00:46:48 +00:00
parent b890ff36d1
commit 82b0d52cb0
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libc/include/sys/socket.h
View File

@ -116,22 +116,7 @@ struct cmsghdr {
? (struct cmsghdr*) (msg)->msg_control : (struct cmsghdr*) NULL) ? (struct cmsghdr*) (msg)->msg_control : (struct cmsghdr*) NULL)
#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && (cmsg)->cmsg_len <= (unsigned long) ((mhdr)->msg_controllen - ((char*)(cmsg) - (char*)(mhdr)->msg_control))) #define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && (cmsg)->cmsg_len <= (unsigned long) ((mhdr)->msg_controllen - ((char*)(cmsg) - (char*)(mhdr)->msg_control)))
#if __ANDROID_API__ >= 21
struct cmsghdr* __cmsg_nxthdr(struct msghdr* __msg, struct cmsghdr* __cmsg) __INTRODUCED_IN(21); struct cmsghdr* __cmsg_nxthdr(struct msghdr* __msg, struct cmsghdr* __cmsg) __INTRODUCED_IN(21);
#else
/* TODO(danalbert): Move this into libandroid_support. */
static inline struct cmsghdr* __cmsg_nxthdr(struct msghdr* msg, struct cmsghdr* cmsg) {
struct cmsghdr* ptr =
__BIONIC_CAST(reinterpret_cast, struct cmsghdr*,
(__BIONIC_CAST(reinterpret_cast, char*, cmsg) + CMSG_ALIGN(cmsg->cmsg_len)));
size_t len = __BIONIC_CAST(reinterpret_cast, char*, ptr + 1) -
__BIONIC_CAST(reinterpret_cast, char*, msg->msg_control);
if (len > msg->msg_controllen) {
return NULL;
}
return ptr;
}
#endif
#define SCM_RIGHTS 0x01 #define SCM_RIGHTS 0x01
#define SCM_CREDENTIALS 0x02 #define SCM_CREDENTIALS 0x02