From d12f9524138899e43deb1a70fb37c97559d8f64e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 18:41:52 +0100 Subject: drop platform support: unifdef __UNIXOS2__. Fixes ArcticaProject/nx-libs#271. --- nx-X11/programs/Xserver/os/access.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'nx-X11/programs/Xserver/os/access.c') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 5735fd556..c775952e2 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -1139,9 +1139,6 @@ ResetHosts (char *display) if (fnamelen > sizeof(fname)) FatalError("Display name `%s' is too long\n", display); sprintf(fname, ETC_HOST_PREFIX "%s" ETC_HOST_SUFFIX, display); -#ifdef __UNIXOS2__ - strcpy(fname, (char*)__XOS2RedirRoot(fname)); -#endif /* __UNIXOS2__ */ if ((fd = fopen (fname, "r")) != 0) { @@ -1152,10 +1149,6 @@ ResetHosts (char *display) continue; if ((ptr = strchr(ohostname, '\n')) != 0) *ptr = 0; -#ifdef __UNIXOS2__ - if ((ptr = strchr(ohostname, '\r')) != 0) - *ptr = 0; -#endif hostlen = strlen(ohostname) + 1; for (i = 0; i < hostlen; i++) lhostname[i] = tolower(ohostname[i]); -- cgit v1.2.3 From ace255eda62081526b721e82ed0339c566975ad3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 19:20:13 +0100 Subject: drop platform support: unifdef Lynx. Fixes ArcticaProject/nx-libs#272. --- nx-X11/programs/Xserver/os/access.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'nx-X11/programs/Xserver/os/access.c') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index c775952e2..286e978ba 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -76,11 +76,7 @@ SOFTWARE. #include #include #ifndef WIN32 -#ifndef Lynx #include -#else -#include -#endif #include #include @@ -173,11 +169,7 @@ SOFTWARE. #endif /* WIN32 */ #ifndef PATH_MAX -#ifndef Lynx #include -#else -#include -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN #define PATH_MAX MAXPATHLEN -- cgit v1.2.3 From 184c5d778210dea8eab045a5f7ecf9d4344c1c34 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 20:59:35 +0100 Subject: drop platform support: unifdef hpux and __hppa__. Fixes ArcticaProject/nx-libs#273. --- nx-X11/programs/Xserver/os/access.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/os/access.c') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 286e978ba..de81c5141 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -105,7 +105,7 @@ SOFTWARE. #endif -#if defined(hpux) || defined(QNX4) +#if defined(QNX4) # include # ifdef HAS_IFREQ # include @@ -127,7 +127,7 @@ SOFTWARE. #else /*!__GNU__*/ # include #endif /*__GNU__ */ -#endif /* hpux */ +#endif /* QNX4 */ #ifdef SVR4 #include @@ -513,7 +513,7 @@ DefineSelf (int fd) #else /* WINTCP */ -#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4) +#if !defined(SIOCGIFCONF) || defined(QNX4) void DefineSelf (int fd) { @@ -1047,7 +1047,7 @@ DefineSelf (int fd) } } } -#endif /* hpux && !HAS_IFREQ */ +#endif /* SIOCGIFCONF || QNX4 */ #endif /* WINTCP */ #ifdef XDMCP -- cgit v1.2.3 From 754e48ac009e4ddf452af06ee3451ecaf7946547 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:41:57 +0100 Subject: drop platform support: unifdef DGUX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/programs/Xserver/os/access.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'nx-X11/programs/Xserver/os/access.c') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index de81c5141..e45645cda 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -91,20 +91,6 @@ SOFTWARE. # endif #endif -#if defined(DGUX) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - - #if defined(QNX4) # include # ifdef HAS_IFREQ @@ -307,7 +293,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(DGUX) && !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(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -356,9 +342,9 @@ ifioctl (int fd, int cmd, char *arg) #endif return(ret); } -#else /* Case DGUX, sun, SCO325 NCR and others */ +#else /* Case sun, SCO325 NCR and others */ #define ifioctl ioctl -#endif /* ((SVR4 && !DGUX !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ +#endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ /* * DefineSelf (fd): -- cgit v1.2.3 From c6250a86468b1c2c23d41b27c4d6e438518ec917 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:51:55 +0100 Subject: drop platform support: unifdef QNX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/programs/Xserver/os/access.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'nx-X11/programs/Xserver/os/access.c') diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index e45645cda..c04e9c7a0 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -91,12 +91,6 @@ SOFTWARE. # endif #endif -#if defined(QNX4) -# include -# ifdef HAS_IFREQ -# include -# endif -#else #if defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__GNU__) # include #endif @@ -113,7 +107,6 @@ SOFTWARE. #else /*!__GNU__*/ # include #endif /*__GNU__ */ -#endif /* QNX4 */ #ifdef SVR4 #include @@ -499,7 +492,7 @@ DefineSelf (int fd) #else /* WINTCP */ -#if !defined(SIOCGIFCONF) || defined(QNX4) +#if !defined(SIOCGIFCONF) void DefineSelf (int fd) { @@ -542,19 +535,11 @@ DefineSelf (int fd) * uname() lets me access to the whole string (it smashes release, you * see), whereas gethostname() kindly truncates it for me. */ -#ifndef QNX4 #ifndef WIN32 uname(&name); #else gethostname(name.nodename, sizeof(name.nodename)); #endif -#else - /* QNX4's uname returns node number in name.nodename, not the hostname - have to overwrite it */ - char hname[1024]; - gethostname(hname, 1024); - name.nodename = hname; -#endif hp = _XGethostbyname(name.nodename, hparams); if (hp != NULL) @@ -663,14 +648,9 @@ DefineLocalHost: p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0)) #define ifraddr_size(a) (a.sa_len) #else -#ifdef QNX4 -#define ifr_size(p) (p->ifr_addr.sa_len + IFNAMSIZ) -#define ifraddr_size(a) (a.sa_len) -#else #define ifr_size(p) (sizeof (ifr_type)) #define ifraddr_size(a) (sizeof (a)) #endif -#endif #if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6)) #include @@ -1033,7 +1013,7 @@ DefineSelf (int fd) } } } -#endif /* SIOCGIFCONF || QNX4 */ +#endif /* !SIOCGIFCONF */ #endif /* WINTCP */ #ifdef XDMCP -- cgit v1.2.3 From 2d45d8d805df95f7277d333e026a008dbd07f479 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 22:03:39 +0100 Subject: drop platform support: unifdef sgi. Relates to ArcticaProject/nx-libs#275. --- nx-X11/programs/Xserver/os/access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/os/access.c') 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 */ -- cgit v1.2.3