diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-01-31 17:15:45 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-01-31 17:15:45 -0800 |
commit | ac0972ebf6cb8ff17f1bbbf01526d29fd2d2f420 (patch) | |
tree | 499dd06881cddf43520b40cc62b51276ca411c60 /system/include/sys | |
parent | 64c779641a2a9587613cc65ad7251890f18e25c3 (diff) | |
parent | 375eb145c8a6c1627a8b93f81d40fd1aa7fc899b (diff) |
Merge branch 'incoming'
Diffstat (limited to 'system/include/sys')
-rw-r--r-- | system/include/sys/select.h | 8 | ||||
-rw-r--r-- | system/include/sys/socket.h | 5 |
2 files changed, 12 insertions, 1 deletions
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); |