[PATCH] libc: replace include/api/x64/bits/socket.h with a symlink to musl copy

[Waldemar Kozaczuk]

This file is identical to musl copy except for added
#ifndef OSV_BITS_SOCKET_H ... which may have been necessary
at some point but it is not now.

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>
---
include/api/x64/bits/socket.h | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
mode change 100644 => 120000 include/api/x64/bits/socket.h

diff --git a/include/api/x64/bits/socket.h b/include/api/x64/bits/socket.h
deleted file mode 100644
index bd815994..00000000
--- a/include/api/x64/bits/socket.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef OSV_BITS_SOCKET_H
-#define OSV_BITS_SOCKET_H
-
-struct msghdr
-{
- void *msg_name;
- socklen_t msg_namelen;
- struct iovec *msg_iov;
- int msg_iovlen, __pad1;
- void *msg_control;
- socklen_t msg_controllen, __pad2;
- int msg_flags;
-};
-
-struct cmsghdr
-{
- socklen_t cmsg_len;
- int __pad1;
- int cmsg_level;
- int cmsg_type;
-};
-#endif
diff --git a/include/api/x64/bits/socket.h b/include/api/x64/bits/socket.h
new file mode 120000
index 00000000..495295ab
--- /dev/null
+++ b/include/api/x64/bits/socket.h
@@ -0,0 +1 @@
+../../../../musl/arch/x86_64/bits/socket.h
\ No newline at end of file
--
2.26.2

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master

libc: replace include/api/x64/bits/socket.h with a symlink to musl copy

This file is identical to musl copy except for added
#ifndef OSV_BITS_SOCKET_H ... which may have been necessary
at some point but it is not now.

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

Message-Id: <20200829041929.57...@gmail.com>

---
diff --git a/include/api/x64/bits/socket.h b/include/api/x64/bits/socket.h
--- a/include/api/x64/bits/socket.h
+++ b/include/api/x64/bits/socket.h

@@ -1,22 +0,0 @@
-#ifndef OSV_BITS_SOCKET_H
-#define OSV_BITS_SOCKET_H
-
-struct msghdr
-{
- void *msg_name;
- socklen_t msg_namelen;
- struct iovec *msg_iov;
- int msg_iovlen, __pad1;
- void *msg_control;
- socklen_t msg_controllen, __pad2;
- int msg_flags;
-};
-
-struct cmsghdr
-{
- socklen_t cmsg_len;
- int __pad1;
- int cmsg_level;
- int cmsg_type;
-};
-#endif
diff --git a/include/api/x64/bits/socket.h b/include/api/x64/bits/socket.h

--- a/include/api/x64/bits/socket.h