mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 10:14:52 +00:00
os: xtrans: fix shadowed variable
`arg` is also a parameter of that functions, so we really shouldn't also have a local variable by the same name. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
f1c1293803
commit
8299ef3d81
11
os/Xtrans.c
11
os/Xtrans.c
@@ -596,15 +596,10 @@ int _XSERVTransSetOption (XtransConnInfo ciptr, int option, int arg)
|
||||
#else
|
||||
#if defined(WIN32)
|
||||
{
|
||||
#ifdef WIN32
|
||||
u_long arg;
|
||||
#else
|
||||
int arg;
|
||||
#endif
|
||||
arg = 1;
|
||||
u_long arg_ret = 1;
|
||||
/* IBM TCP/IP understands this option too well: it causes _XSERVTransRead to fail
|
||||
* eventually with EWOULDBLOCK */
|
||||
ret = ioctl (fd, FIONBIO, &arg);
|
||||
ret = ioctl (fd, FIONBIO, &arg_ret);
|
||||
}
|
||||
#else
|
||||
ret = fcntl (fd, F_GETFL, 0);
|
||||
@@ -613,7 +608,7 @@ int _XSERVTransSetOption (XtransConnInfo ciptr, int option, int arg)
|
||||
#else
|
||||
ret = fcntl (fd, F_SETFL, ret | O_NDELAY);
|
||||
#endif
|
||||
#endif /* AIXV3 || uniosu */
|
||||
#endif /* WIN32 */
|
||||
#endif /* FIOSNBIO */
|
||||
#endif /* O_NONBLOCK */
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user