Merge branch 'incoming'

3 files changed, 14 insertions, 3 deletions

diff --git a/system/include/net/netinet/in.h b/system/include/net/netinet/in.h
index 2ac98dfe..e32bf3ee 100644
--- a/system/include/net/netinet/in.h
+++ b/system/include/net/netinet/in.h
@@ -25,10 +25,10 @@ struct in_addr {
 };
 
 struct sockaddr_in {
-  short          sin_family;
+  int            sin_family;
   unsigned short sin_port;
   struct in_addr sin_addr;
-  char           sin_zero[8];
+  char           sin_zero[6];
 };
 
 struct in6_addr {
diff --git a/system/include/sys/select.h b/system/include/sys/select.h
index 49bc034b..a5c73147 100644
--- a/system/include/sys/select.h
+++ b/system/include/sys/select.h
@@ -1,6 +1,14 @@
 #ifndef _SELECT_H
 #define _SELECT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/system/include/sys/socket.h b/system/include/sys/socket.h
index 10ba5ce8..e9b6c770 100644
--- a/system/include/sys/socket.h
+++ b/system/include/sys/socket.h
@@ -47,7 +47,10 @@ struct sockaddr {
 };
 
 struct sockaddr_storage {
-  sa_family_t ss_family;
+  sa_family_t    ss_family;
+  unsigned short ss_port;
+  unsigned long  ss_addr;
+  char           ss_zero[6];
 };
 
 ssize_t recvfrom(int socket, void *buffer, size_t length, int flags, struct sockaddr *address, socklen_t *address_len);