diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 21:51:55 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-08 22:40:47 +0100 |
| commit | c6250a86468b1c2c23d41b27c4d6e438518ec917 (patch) | |
| tree | dba2dae28d10c3df874d6ea1dc10a12dde7376bb /nx-X11/programs/Xserver/os/access.c | |
| parent | 754e48ac009e4ddf452af06ee3451ecaf7946547 (diff) | |
| download | nx-libs-c6250a86468b1c2c23d41b27c4d6e438518ec917.tar.gz nx-libs-c6250a86468b1c2c23d41b27c4d6e438518ec917.tar.bz2 nx-libs-c6250a86468b1c2c23d41b27c4d6e438518ec917.zip | |
drop platform support: unifdef QNX.
Relates to ArcticaProject/nx-libs#275.
Diffstat (limited to 'nx-X11/programs/Xserver/os/access.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/access.c | 24 |
1 files changed, 2 insertions, 22 deletions
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 <sys/utsname.h> -# ifdef HAS_IFREQ -# include <net/if.h> -# endif -#else #if defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__GNU__) # include <sys/utsname.h> #endif @@ -113,7 +107,6 @@ SOFTWARE. #else /*!__GNU__*/ # include <net/if.h> #endif /*__GNU__ */ -#endif /* QNX4 */ #ifdef SVR4 #include <sys/sockio.h> @@ -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 <arpa/inet.h> @@ -1033,7 +1013,7 @@ DefineSelf (int fd) } } } -#endif /* SIOCGIFCONF || QNX4 */ +#endif /* !SIOCGIFCONF */ #endif /* WINTCP */ #ifdef XDMCP |