summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorsbc <sbc@chromium.org>2014-08-29 17:02:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-30 00:06:15 +0000
commit08906d2ccfce56f719b060df9f8b9b781c25a44b (patch)
tree5ae399561f5621b588ab1f33f71baa0c409bf96c /native_client_sdk
parent8ac2ad2945de828afa49435357d5c4f1f59f4387 (diff)
downloadchromium_src-08906d2ccfce56f719b060df9f8b9b781c25a44b.zip
chromium_src-08906d2ccfce56f719b060df9f8b9b781c25a44b.tar.gz
chromium_src-08906d2ccfce56f719b060df9f8b9b781c25a44b.tar.bz2
[NaCl SDK] nacl_io: fix bionic build
getnameinfo has a slightly different signature on bionic. TEST=./build_tools/build_sdk.py --bionic Review URL: https://codereview.chromium.org/523043004 Cr-Commit-Position: refs/heads/master@{#292725}
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/libraries/nacl_io/syscalls/getnameinfo.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/native_client_sdk/src/libraries/nacl_io/syscalls/getnameinfo.c b/native_client_sdk/src/libraries/nacl_io/syscalls/getnameinfo.c
index d5ac949..78794eb 100644
--- a/native_client_sdk/src/libraries/nacl_io/syscalls/getnameinfo.c
+++ b/native_client_sdk/src/libraries/nacl_io/syscalls/getnameinfo.c
@@ -6,9 +6,15 @@
#include "nacl_io/kernel_wrap.h"
#ifdef __native_client__
-int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
- socklen_t hostlen, char *serv, socklen_t servlen,
+#ifdef __BIONIC__
+// bionic has a slightly different signatute to glibc for getnameinfo
+int getnameinfo(const struct sockaddr* sa, socklen_t salen, char* host,
+ size_t hostlen, char* serv, size_t servlen, int flags) {
+#else
+int getnameinfo(const struct sockaddr* sa, socklen_t salen, char* host,
+ socklen_t hostlen, char* serv, socklen_t servlen,
unsigned int flags) {
+#endif
return ki_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
}
#endif