diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 22:03:39 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:14 +0100 |
| commit | 8c1a21b4568f50a1fbbe014ee744d7130754d2ed (patch) | |
| tree | a6b8d62ef726871ff2af619a68bb4873536a76d9 /nx-X11/programs/Xserver/os | |
| parent | 5c3776d251ec0fb9cddf1d0ac641754582dbc4d7 (diff) | |
| download | nx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.tar.gz nx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.tar.bz2 nx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.zip | |
drop platform support: unifdef sgi.
Relates to ArcticaProject/nx-libs#275.
Diffstat (limited to 'nx-X11/programs/Xserver/os')
| -rw-r--r-- | nx-X11/programs/Xserver/os/access.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/osdep.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index c04e9c7a0..d3a18efbe 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -286,7 +286,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 3babab3e1..f0e8b707b 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -61,7 +61,6 @@ SOFTWARE. #include <X11/Xdmcp.h> -#ifndef sgi /* SGI defines OPEN_MAX in a useless way */ #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE #include <limits.h> @@ -77,7 +76,6 @@ SOFTWARE. #undef _POSIX_ #endif #endif /* X_NOT_POSIX */ -#endif #ifndef OPEN_MAX #ifdef SVR4 diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 6e5482fc1..5f7542a2d 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -269,10 +269,6 @@ long Memory_fail = 0; #include <stdlib.h> /* for random() */ #endif -#ifdef sgi -int userdefinedfontpath = 0; -#endif /* sgi */ - char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ extern char dispatchExceptionAtReset; @@ -831,9 +827,6 @@ ProcessCommandLine(int argc, char *argv[]) { if(++i < argc) { -#ifdef sgi - userdefinedfontpath = 1; -#endif /* sgi */ defaultFontPath = argv[i]; } else |