X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fsys%2Fsocket.h;h=f1489186e38066bcb13052216019a844e16e4961;hp=4afec4efb3e44417d631835f05bc2baa20a9a15e;hb=91738d0241aed345cac8685422d4518ea5f3cdf0;hpb=6cf8bfdb646efaf76c75a95d1ea0cd254706c037

diff --git a/include/sys/socket.h b/include/sys/socket.h
index 4afec4ef..f1489186 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -47,8 +47,10 @@ struct linger
 #define SOCK_DCCP      6
 #define SOCK_PACKET    10
 
+#ifndef SOCK_CLOEXEC
 #define SOCK_CLOEXEC   02000000
 #define SOCK_NONBLOCK  04000
+#endif
 
 #define PF_UNSPEC       0
 #define PF_LOCAL        1
@@ -126,6 +128,7 @@ struct linger
 #define AF_ALG          PF_ALG
 #define AF_MAX          PF_MAX
 
+#ifndef SO_DEBUG
 #define SO_DEBUG        1
 #define SO_REUSEADDR    2
 #define SO_TYPE         3
@@ -140,13 +143,15 @@ struct linger
 #define SO_PRIORITY     12
 #define SO_LINGER       13
 #define SO_BSDCOMPAT    14
-#define SO_REUSEPORT    15
+/* #define SO_REUSEPORT    15 */
 #define SO_PASSCRED     16
 #define SO_PEERCRED     17
 #define SO_RCVLOWAT     18
 #define SO_SNDLOWAT     19
 #define SO_RCVTIMEO     20
 #define SO_SNDTIMEO     21
+#endif
+
 
 #define SO_SECURITY_AUTHENTICATION              22
 #define SO_SECURITY_ENCRYPTION_TRANSPORT        23
@@ -163,7 +168,9 @@ struct linger
 
 #define SO_ACCEPTCONN           30
 
+#ifndef SOL_SOCKET
 #define SOL_SOCKET      1
+#endif
 
 #define SOL_RAW         255
 #define SOL_DECNET      261
@@ -235,6 +242,7 @@ int bind (int, const struct sockaddr *, socklen_t);
 int connect (int, const struct sockaddr *, socklen_t);
 int listen (int, int);
 int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
+int accept4(int, struct sockaddr *__restrict, socklen_t *__restrict, int);
 
 int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict);
 int getpeername (int, struct sockaddr *__restrict, socklen_t *__restrict);
@@ -255,10 +263,6 @@ int sockatmark (int);
 #define SHUT_WR 1
 #define SHUT_RDWR 2
 
-#ifdef _GNU_SOURCE
-int accept4(int, struct sockaddr *__restrict, socklen_t *__restrict, int);
-#endif
-
 #ifdef __cplusplus
 }
 #endif