diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/programs/Xserver/os/osinit.c | |
parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/programs/Xserver/os/osinit.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/osinit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 5f097f89a..7aa961a56 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -67,11 +67,11 @@ SOFTWARE. #endif #endif -#if defined(Lynx) || defined(__SCO__) +#if defined(__SCO__) #include <sys/wait.h> #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) #include <sys/resource.h> #endif @@ -133,7 +133,7 @@ OsInit(void) dup2 (fileno (err), 2); fclose (err); } -#if defined(SYSV) || defined(SVR4) || defined(__UNIXOS2__) || defined(WIN32) || defined(__CYGWIN__) +#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) { static char buf[BUFSIZ]; setvbuf (stderr, buf, _IOLBF, BUFSIZ); |