diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-07-15 21:36:31 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-15 21:36:31 -0700 |
| commit | ceac58b4cb40ab118d6c984c7cd63780e57fbb43 (patch) | |
| tree | b38eebc0321c9a984bf38def6b6df591b9d3cc2b | |
| parent | bf0f60a46872526a4f632eb1bd07e7f1b4a25af0 (diff) | |
| parent | 6765b7405a1a44e6879f1058052e893819553e3e (diff) | |
Merge pull request #1387 from amatus/push-upstream
Fixes for GNUnet compile.
| -rw-r--r-- | system/include/net/netinet/in.h | 7 | ||||
| -rw-r--r-- | system/include/sys/socket.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/system/include/net/netinet/in.h b/system/include/net/netinet/in.h index cf324f3d..fba1a7b3 100644 --- a/system/include/net/netinet/in.h +++ b/system/include/net/netinet/in.h @@ -55,6 +55,13 @@ extern const struct in6_addr in6addr_interfacelocal_allnodes; extern const struct in6_addr in6addr_interfacelocal_allrouters; extern const struct in6_addr in6addr_sitelocal_allrouters; +#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } +#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } +#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \ + { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } +#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \ + { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } } + struct sockaddr_in6 { int sin6_family; unsigned short sin6_port; diff --git a/system/include/sys/socket.h b/system/include/sys/socket.h index 3168f85b..9650bb9a 100644 --- a/system/include/sys/socket.h +++ b/system/include/sys/socket.h @@ -34,7 +34,8 @@ extern "C" { #define SO_LINGER 130 #define SO_BSDCOMPAT 140 -#define SHUT_RD 1 +#define SHUT_RD 0 +#define SHUT_WR 1 #define SHUT_RDWR 2 typedef unsigned int sa_family_t; |