diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 22:41:36 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 22:41:36 +0200 |
commit | 654611b4d68129954697bb94d49c671e164ec938 (patch) | |
tree | 2ce37f94177c4fa56255e9302237353b4593db58 /resolv | |
parent | 4c8e595e5068631982964dd21b7b0e92e4cac65c (diff) | |
parent | 151bb4feff3f5956653df0c0532bc5c3f5bd15df (diff) |
Merge remote-tracking branch 'refs/remotes/savannah/top-bases/tschwinge/Roger_Whittaker' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'resolv')
-rw-r--r-- | resolv/Depend | 1 | ||||
-rw-r--r-- | resolv/res_send.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/resolv/Depend b/resolv/Depend index 8d2587bbc1..5c6ec03451 100644 --- a/resolv/Depend +++ b/resolv/Depend @@ -1,2 +1,3 @@ linuxthreads nptl +libpthread diff --git a/resolv/res_send.c b/resolv/res_send.c index 0a28cd784b..c790031b45 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -1129,7 +1129,7 @@ send_dg(res_state statp, reqs[1].msg_hdr.msg_control = NULL; reqs[1].msg_hdr.msg_controllen = 0; - int ndg = sendmmsg (pfd[0].fd, reqs, 2, MSG_NOSIGNAL); + int ndg = __sendmmsg (pfd[0].fd, reqs, 2, MSG_NOSIGNAL); if (__builtin_expect (ndg == 2, 1)) { if (reqs[0].msg_len != buflen |