From 4b8874ceb9c9b826bc98e1f20f7b3b0cf63462bf Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Fri, 3 Feb 2023 02:09:15 -0800 Subject: [PATCH] Make some simple fixes --- libc/sock/struct/msghdr.h | 7 +++---- libc/sysv/consts/f.h | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libc/sock/struct/msghdr.h b/libc/sock/struct/msghdr.h index a673ba9da..98e64dd34 100644 --- a/libc/sock/struct/msghdr.h +++ b/libc/sock/struct/msghdr.h @@ -8,11 +8,10 @@ struct msghdr { /* Linux+NT ABI */ void *msg_name; /* optional address */ uint32_t msg_namelen; /* size of msg_name */ struct iovec *msg_iov; /* scatter/gather array */ - int msg_iovlen; /* # elements in msg_iov */ + uint64_t msg_iovlen; /* # elements in msg_iov */ void *msg_control; /* ancillary data c. cmsghdr */ - uint32_t msg_controllen; /* ancillary data buffer len */ - uint32_t __pad0; /* reconcile abi */ - int msg_flags; /* MSG_XXX */ + uint64_t msg_controllen; /* ancillary data buffer len */ + uint32_t msg_flags; /* MSG_XXX */ }; ssize_t recvmsg(int, struct msghdr *, int); diff --git a/libc/sysv/consts/f.h b/libc/sysv/consts/f.h index 53ea7bddf..8e2f82d8b 100644 --- a/libc/sysv/consts/f.h +++ b/libc/sysv/consts/f.h @@ -15,7 +15,6 @@ extern const int F_GETLK64; extern const int F_GETLK; extern const int F_GETNOSIGPIPE; extern const int F_GETOWN; -extern const int F_GETOWN_EX; extern const int F_GETPATH; extern const int F_GETPIPE_SZ; extern const int F_GETSIG; @@ -36,7 +35,6 @@ extern const int F_SETLKW64; extern const int F_SETLKW; extern const int F_SETNOSIGPIPE; extern const int F_SETOWN; -extern const int F_SETOWN_EX; extern const int F_SETPIPE_SZ; extern const int F_SETSIG; extern const int F_UNLCK; @@ -56,7 +54,6 @@ COSMOPOLITAN_C_END_ #define F_GETLK SYMBOLIC(F_GETLK) #define F_GETLK64 SYMBOLIC(F_GETLK64) #define F_GETOWN SYMBOLIC(F_GETOWN) -#define F_GETOWN_EX SYMBOLIC(F_GETOWN_EX) #define F_GETPATH SYMBOLIC(F_GETPATH) #define F_GETPIPE_SZ SYMBOLIC(F_GETPIPE_SZ) #define F_GETSIG SYMBOLIC(F_GETSIG) @@ -70,7 +67,6 @@ COSMOPOLITAN_C_END_ #define F_SETLKW SYMBOLIC(F_SETLKW) #define F_SETLKW64 SYMBOLIC(F_SETLKW64) #define F_SETOWN SYMBOLIC(F_SETOWN) -#define F_SETOWN_EX SYMBOLIC(F_SETOWN_EX) #define F_SETPIPE_SZ SYMBOLIC(F_SETPIPE_SZ) #define F_SETSIG SYMBOLIC(F_SETSIG) #define F_UNLCK SYMBOLIC(F_UNLCK)