generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1cf377bb: am aad59faf: Merge "Small accept4 fixes."

Browse Source 
* commit '1cf377bbceb5c59b8572fcdb456034e18fdc1db1':
  Small accept4 fixes.
This commit is contained in:
Christopher Ferris 2014-03-31 19:50:02 +00:00 committed by Android Git Automerger
commit 29786ff84b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/sys/socket.h
View File

@ -284,6 +284,7 @@ struct ucred {
#endif #endif
__socketcall int accept(int, struct sockaddr*, socklen_t*); __socketcall int accept(int, struct sockaddr*, socklen_t*);
__socketcall int accept4(int, struct sockaddr*, socklen_t*, int);
__socketcall int bind(int, const struct sockaddr*, int); __socketcall int bind(int, const struct sockaddr*, int);
__socketcall int connect(int, const struct sockaddr*, socklen_t); __socketcall int connect(int, const struct sockaddr*, socklen_t);
__socketcall int getpeername(int, struct sockaddr*, socklen_t*); __socketcall int getpeername(int, struct sockaddr*, socklen_t*);
@ -298,7 +299,6 @@ __socketcall int setsockopt(int, int, int, const void*, socklen_t);
__socketcall int shutdown(int, int); __socketcall int shutdown(int, int);
__socketcall int socket(int, int, int); __socketcall int socket(int, int, int);
__socketcall int socketpair(int, int, int, int*); __socketcall int socketpair(int, int, int, int*);
__socketcall int accept4(int, struct sockaddr*, socklen_t*, int);
extern ssize_t send(int, const void*, size_t, int); extern ssize_t send(int, const void*, size_t, int);
extern ssize_t recv(int, void*, size_t, int); extern ssize_t recv(int, void*, size_t, int);

2
libc/include/sys/socketcalls.h
View File

@ -48,5 +48,7 @@
#define SYS_SENDMSG 16 /* sys_sendmsg(2) */ #define SYS_SENDMSG 16 /* sys_sendmsg(2) */
#define SYS_RECVMSG 17 /* sys_recvmsg(2) */ #define SYS_RECVMSG 17 /* sys_recvmsg(2) */
#define SYS_ACCEPT4 18 /* sys_accept4(2) */ #define SYS_ACCEPT4 18 /* sys_accept4(2) */
#define SYS_RECVMMSG 19 /* sys_recvmmsg(2) */
#define SYS_SENDMMSG 20 /* sys_sendmmsg(2) */
#endif /* _SYS_SOCKETCALLS_H_ */ #endif /* _SYS_SOCKETCALLS_H_ */

2
tests/Android.mk
View File

@ -39,6 +39,7 @@ test_cflags = \
-fno-builtin \ -fno-builtin \
libBionicStandardTests_src_files := \ libBionicStandardTests_src_files := \
accept4_test.cpp \
buffer_tests.cpp \ buffer_tests.cpp \
dirent_test.cpp \ dirent_test.cpp \
eventfd_test.cpp \ eventfd_test.cpp \
@ -82,7 +83,6 @@ libBionicStandardTests_src_files := \
system_properties_test.cpp \ system_properties_test.cpp \
time_test.cpp \ time_test.cpp \
unistd_test.cpp \ unistd_test.cpp \
accept4_test.cpp \
libBionicStandardTests_cflags := \ libBionicStandardTests_cflags := \
$(test_cflags) \ $(test_cflags) \