diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 16:00:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 16:00:44 +0200 |
| commit | e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0 (patch) | |
| tree | a8fbc3bfb442ef8222367b9a5b2285c9e6408fda /nx-X11/programs/Xserver/os/connection.c | |
| parent | 424c0e8ee3986b886bf2d7617897577a6b84aaed (diff) | |
| parent | c69d2ad0fc5f69163c4babc7a356a783aa7ae411 (diff) | |
| download | nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.gz nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.bz2 nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.zip | |
Merge branch 'uli42-pr/various4' into 3.6.x
Attributes GH PR #896: https://github.com/ArcticaProject/nx-libs/pull/896
Diffstat (limited to 'nx-X11/programs/Xserver/os/connection.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 7deeec428..4d30dd86f 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -185,8 +185,6 @@ InitConnectionLimits(void) { lastfdesc = -1; -#ifndef __CYGWIN__ - #if !defined(XNO_SYSCONF) && defined(_SC_OPEN_MAX) lastfdesc = sysconf(_SC_OPEN_MAX) - 1; #endif @@ -201,8 +199,6 @@ InitConnectionLimits(void) lastfdesc = _NFILE - 1; #endif -#endif /* __CYGWIN__ */ - /* This is the fallback */ if (lastfdesc < 0) lastfdesc = MAXSOCKS; @@ -912,7 +908,7 @@ CheckConnections(void) mask = AllClients.fds_bits[i]; while (mask) { - curoff = ffs (mask) - 1; + curoff = mffs (mask) - 1; curclient = curoff + (i * (sizeof(fd_mask)*8)); FD_ZERO(&tmask); FD_SET(curclient, &tmask); |