abis: move cmsghdr to abis/, fix Linux ABI

managarm · Jul 8, 2022 · 785a741 · 785a741
1 parent 6e26abf
commit 785a741
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/abis/linux/socket.h b/abis/linux/socket.h
@@ -18,7 +18,7 @@ struct msghdr {
 	size_t msg_iovlen;
 	void *msg_control;
 	size_t msg_controllen;
-	unsigned int msg_flags;
+	int msg_flags;
 };
 
 struct sockaddr_storage {
@@ -31,6 +31,12 @@ struct mmsghdr {
 	unsigned int  msg_len;
 };
 
+struct cmsghdr {
+	size_t cmsg_len; /* socklen_t in POSIX */
+	int    cmsg_level;
+	int    cmsg_type;
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/abis/mlibc/socket.h b/abis/mlibc/socket.h
@@ -30,6 +30,12 @@ struct mmsghdr {
 	unsigned int  msg_len;
 };
 
+struct cmsghdr {
+	socklen_t cmsg_len;
+	int cmsg_level;
+	int cmsg_type;
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/options/posix/include/sys/socket.h b/options/posix/include/sys/socket.h
@@ -24,12 +24,6 @@ struct sockaddr {
 	char sa_data[14];
 };
 
-struct cmsghdr {
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
-
 // Control message format:
 // The offsets marked with ^ are aligned to alignof(size_t).
 //