diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:37:38 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:37:38 +0000 |
| commit | b1115227b87a24137310c566f5f8a53cf182796e (patch) | |
| tree | 820fae46cf56ad6bb657e43fb93a7a078a42dd7c /libc/sunrpc/clnt_udp.c | |
| parent | 2f4cad8d89b656684e8829b2e164070515d4d34b (diff) | |
| download | eglibc2-b1115227b87a24137310c566f5f8a53cf182796e.tar.gz | |
Merge changes between r14127 and r14282 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@14283 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sunrpc/clnt_udp.c')
| -rw-r--r-- | libc/sunrpc/clnt_udp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/sunrpc/clnt_udp.c b/libc/sunrpc/clnt_udp.c index 7aa86a64c..83fdd8ef2 100644 --- a/libc/sunrpc/clnt_udp.c +++ b/libc/sunrpc/clnt_udp.c @@ -172,8 +172,6 @@ __libc_clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, cu->cu_xdrpos = XDR_GETPOS (&(cu->cu_outxdrs)); if (*sockp < 0) { - int dontblock = 1; - #ifdef SOCK_NONBLOCK # ifndef __ASSUME_SOCK_CLOEXEC if (__have_sock_cloexec >= 0) @@ -212,8 +210,11 @@ __libc_clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, # ifdef SOCK_CLOEXEC if (__have_sock_cloexec < 0) # endif - /* the sockets rpc controls are non-blocking */ - (void) __ioctl (*sockp, FIONBIO, (char *) &dontblock); + { + /* the sockets rpc controls are non-blocking */ + int dontblock = 1; + (void) __ioctl (*sockp, FIONBIO, (char *) &dontblock); + } #endif #ifdef IP_RECVERR { |