diff options
| author | Elliott Hughes <enh@google.com> | 2019-12-23 03:26:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-23 03:26:37 +0000 |
| commit | 5e2ac29165a5ecdff9be1e8b3aa0c0f968abf539 (patch) | |
| tree | cd633b203cc758ce1d4fcf95330d47166ed8250c /libc/include/sys/socket.h | |
| parent | 8cdacf9760ed7d4a5b3218f0342344261ab6f8aa (diff) | |
| parent | 95c6cd753f028b1afc0c6a800a3dd6bd85a5a6a0 (diff) | |
Merge "Stop using the __ANDROID_API_x__ constants."
Diffstat (limited to 'libc/include/sys/socket.h')
| -rw-r--r-- | libc/include/sys/socket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h index e54dd65be..e2acab734 100644 --- a/libc/include/sys/socket.h +++ b/libc/include/sys/socket.h @@ -112,7 +112,7 @@ struct cmsghdr { ? (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))) -#if __ANDROID_API__ >= __ANDROID_API_L__ +#if __ANDROID_API__ >= 21 struct cmsghdr* __cmsg_nxthdr(struct msghdr* __msg, struct cmsghdr* __cmsg) __INTRODUCED_IN(21); #else /* TODO(danalbert): Move this into libandroid_support. */ @@ -127,7 +127,7 @@ static inline struct cmsghdr* __cmsg_nxthdr(struct msghdr* msg, struct cmsghdr* } return ptr; } -#endif /* __ANDROID_API__ >= __ANDROID_API_L__ */ +#endif #define SCM_RIGHTS 0x01 #define SCM_CREDENTIALS 0x02 |