diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:43:09 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:43:09 -0400 |
| commit | 0d785bd635d135fcd67b4c9c88f5c8217e9b9240 (patch) | |
| tree | cba029e92d1967358eff0cf238bf5d722a43af99 /os | |
| parent | 5035741fd4cb4918957064a8c9ded9c7c31b4e22 (diff) | |
Unifdef hpux.
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 9 | ||||
| -rw-r--r-- | os/connection.c | 6 | ||||
| -rw-r--r-- | os/osdep.h | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/os/access.c b/os/access.c index 6179d5bd1..efc9a458b 100644 --- a/os/access.c +++ b/os/access.c @@ -95,12 +95,6 @@ SOFTWARE. # endif #endif -#if defined(hpux) -# 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 @@ -117,7 +111,6 @@ SOFTWARE. #else /*!__GNU__*/ # include <net/if.h> #endif /*__GNU__ */ -#endif /* hpux */ #ifdef SVR4 #include <sys/sockio.h> @@ -350,7 +343,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) +#if !defined(SIOCGIFCONF) void DefineSelf (int fd) { diff --git a/os/connection.c b/os/connection.c index 89795bf77..8e9121bfb 100644 --- a/os/connection.c +++ b/os/connection.c @@ -85,16 +85,11 @@ SOFTWARE. #ifndef WIN32 #include <sys/socket.h> -#ifdef hpux -#include <sys/utsname.h> -#include <sys/ioctl.h> -#endif #if defined(TCPCONN) || defined(STREAMSCONN) # include <netinet/in.h> # include <arpa/inet.h> -# if !defined(hpux) # ifdef apollo # ifndef NO_TCP_H # include <netinet/tcp.h> @@ -105,7 +100,6 @@ SOFTWARE. # endif # include <netinet/tcp.h> # endif -# endif # include <arpa/inet.h> #endif diff --git a/os/osdep.h b/os/osdep.h index af1d5a9b4..e719f9a70 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -102,7 +102,7 @@ SOFTWARE. #define MAXSELECT (sizeof(fd_set) * NBBY) #ifndef HAS_GETDTABLESIZE -#if !defined(hpux) && !defined(SVR4) && !defined(SYSV) +#if !defined(SVR4) && !defined(SYSV) #define HAS_GETDTABLESIZE #endif #endif |