projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduce impact of REG_* namespace pollution in x86[_64] signal.h
[musl]
/
include
/
sys
/
socket.h
diff --git
a/include/sys/socket.h
b/include/sys/socket.h
index
2f400ac
..
8664779
100644
(file)
--- a/
include/sys/socket.h
+++ b/
include/sys/socket.h
@@
-20,15
+20,13
@@
extern "C" {
#include <bits/socket.h>
#ifdef _GNU_SOURCE
#include <bits/socket.h>
#ifdef _GNU_SOURCE
-struct ucred
-{
+struct ucred {
pid_t pid;
uid_t uid;
gid_t gid;
};
pid_t pid;
uid_t uid;
gid_t gid;
};
-struct mmsghdr
-{
+struct mmsghdr {
struct msghdr msg_hdr;
unsigned int msg_len;
};
struct msghdr msg_hdr;
unsigned int msg_len;
};
@@
-39,8
+37,7
@@
int sendmmsg (int, struct mmsghdr *, unsigned int, unsigned int);
int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
#endif
int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
#endif
-struct linger
-{
+struct linger {
int l_onoff;
int l_linger;
};
int l_onoff;
int l_linger;
};
@@
-109,7
+106,9
@@
struct linger
#define PF_ALG 38
#define PF_NFC 39
#define PF_VSOCK 40
#define PF_ALG 38
#define PF_NFC 39
#define PF_VSOCK 40
-#define PF_MAX 41
+#define PF_KCM 41
+#define PF_QIPCRTR 42
+#define PF_MAX 43
#define AF_UNSPEC PF_UNSPEC
#define AF_LOCAL PF_LOCAL
#define AF_UNSPEC PF_UNSPEC
#define AF_LOCAL PF_LOCAL
@@
-155,6
+154,8
@@
struct linger
#define AF_ALG PF_ALG
#define AF_NFC PF_NFC
#define AF_VSOCK PF_VSOCK
#define AF_ALG PF_ALG
#define AF_NFC PF_NFC
#define AF_VSOCK PF_VSOCK
+#define AF_KCM PF_KCM
+#define AF_QIPCRTR PF_QIPCRTR
#define AF_MAX PF_MAX
#ifndef SO_DEBUG
#define AF_MAX PF_MAX
#ifndef SO_DEBUG
@@
-239,6
+240,21
@@
struct linger
#define SOL_ATM 264
#define SOL_AAL 265
#define SOL_IRDA 266
#define SOL_ATM 264
#define SOL_AAL 265
#define SOL_IRDA 266
+#define SOL_NETBEUI 267
+#define SOL_LLC 268
+#define SOL_DCCP 269
+#define SOL_NETLINK 270
+#define SOL_TIPC 271
+#define SOL_RXRPC 272
+#define SOL_PPPOL2TP 273
+#define SOL_BLUETOOTH 274
+#define SOL_PNPIPE 275
+#define SOL_RDS 276
+#define SOL_IUCV 277
+#define SOL_CAIF 278
+#define SOL_ALG 279
+#define SOL_NFC 280
+#define SOL_KCM 281
#define SOMAXCONN 128
#define SOMAXCONN 128
@@
-259,6
+275,7
@@
struct linger
#define MSG_NOSIGNAL 0x4000
#define MSG_MORE 0x8000
#define MSG_WAITFORONE 0x10000
#define MSG_NOSIGNAL 0x4000
#define MSG_MORE 0x8000
#define MSG_WAITFORONE 0x10000
+#define MSG_BATCH 0x40000
#define MSG_FASTOPEN 0x20000000
#define MSG_CMSG_CLOEXEC 0x40000000
#define MSG_FASTOPEN 0x20000000
#define MSG_CMSG_CLOEXEC 0x40000000
@@
-279,17
+296,15
@@
struct linger
#define SCM_RIGHTS 0x01
#define SCM_CREDENTIALS 0x02
#define SCM_RIGHTS 0x01
#define SCM_CREDENTIALS 0x02
-struct sockaddr
-{
+struct sockaddr {
sa_family_t sa_family;
char sa_data[14];
};
sa_family_t sa_family;
char sa_data[14];
};
-struct sockaddr_storage
-{
+struct sockaddr_storage {
sa_family_t ss_family;
sa_family_t ss_family;
+ char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
unsigned long __ss_align;
unsigned long __ss_align;
- char __ss_padding[128-2*sizeof(unsigned long)];
};
int socket (int, int, int);
};
int socket (int, int, int);