diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-23 09:09:11 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-23 10:44:34 -0400 |
| commit | 0ff5bc404842f7264a8e77f9e2a0bd8d0b051356 (patch) | |
| tree | 3f4844681d7d5bd0692cdabfb39b4b5a5c021e0c /os/access.c | |
| parent | 331cc3f0799a54910a99484264f76569beeee55a (diff) | |
Unifdef QNX.
Again, hasn't worked since at least 7.0.
Diffstat (limited to 'os/access.c')
| -rw-r--r-- | os/access.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/os/access.c b/os/access.c index 93e33b52f..c973cb114 100644 --- a/os/access.c +++ b/os/access.c @@ -95,7 +95,7 @@ SOFTWARE. # endif #endif -#if defined(hpux) || defined(QNX4) +#if defined(hpux) # include <sys/utsname.h> # ifdef HAS_IFREQ # include <net/if.h> @@ -350,7 +350,7 @@ ifioctl (int fd, int cmd, char *arg) * for this fd and add them to the selfhosts list. */ -#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4) +#if !defined(SIOCGIFCONF) || defined (hpux) && ! defined (HAS_IFREQ) void DefineSelf (int fd) { @@ -393,19 +393,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) @@ -514,14 +506,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> |