diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-01-08 07:51:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:55:03 +0200 |
| commit | bd9ada59b47fb777ad1524abdc23b1a151494fff (patch) | |
| tree | c6687689cf9859cb788ee02e8f48694d8ad6999b /nx-X11 | |
| parent | 424c0e8ee3986b886bf2d7617897577a6b84aaed (diff) | |
| download | nx-libs-bd9ada59b47fb777ad1524abdc23b1a151494fff.tar.gz nx-libs-bd9ada59b47fb777ad1524abdc23b1a151494fff.tar.bz2 nx-libs-bd9ada59b47fb777ad1524abdc23b1a151494fff.zip | |
os: remove CYGWIN remnants
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/osinit.c | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 7 |
3 files changed, 1 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 7deeec428..8ebef9c33 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; diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 823656316..367635f6c 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -101,11 +101,8 @@ OsInit(void) InitNotifyFds(); -#if !defined(__CYGWIN__) fclose(stdin); fclose(stdout); -#endif - /* * If a write of zero bytes to stderr returns non-zero, i.e. -1, @@ -131,7 +128,7 @@ OsInit(void) dup2 (fileno (err), 2); fclose (err); } -#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) +#if defined(SYSV) || defined(SVR4) { static char buf[BUFSIZ]; setvbuf (stderr, buf, _IOLBF, BUFSIZ); diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index eed8cbf13..853a33736 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -78,11 +78,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#ifdef __CYGWIN__ -#include <stdlib.h> -#include <signal.h> -#endif - #include <nx-X11/Xos.h> #include <stdio.h> #include "misc.h" @@ -903,11 +898,9 @@ ProcessCommandLine(int argc, char *argv[]) #ifdef SERVER_LOCK else if ( strcmp ( argv[i], "-nolock") == 0) { -#if !defined(__CYGWIN__) if (getuid() != 0) ErrorF("Warning: the -nolock option can only be used by root\n"); else -#endif nolock = TRUE; } #endif |