diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-02 17:03:54 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-10-02 17:03:54 -0400 |
| commit | f836e1f11b7bf3449c3e469cc7799c4ed28d2356 (patch) | |
| tree | c8ba8e01ec2d1fb73b7fa3d70c8bac7c59c0031f /os | |
| parent | b1a31734731a768d586b4cb18317d4a5c5e20fa8 (diff) | |
Unifdef ISC
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/os/access.c b/os/access.c index efc9a458b..c91212b1b 100644 --- a/os/access.c +++ b/os/access.c @@ -80,7 +80,7 @@ SOFTWARE. #include <sys/ioctl.h> #include <ctype.h> -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(__SCO__) +#if defined(TCPCONN) || defined(STREAMSCONN) || defined(__SCO__) #include <netinet/in.h> #endif /* TCPCONN || STREAMSCONN || ISC || __SCO__ */ #ifdef DNETCONN @@ -100,10 +100,6 @@ SOFTWARE. #endif #if defined(SYSV) && defined(__i386__) # include <sys/stream.h> -# ifdef ISC -# include <sys/stropts.h> -# include <sys/sioctl.h> -# endif /* ISC */ #endif #ifdef __GNU__ #undef SIOCGIFCONF @@ -283,7 +279,7 @@ AccessUsingXdmcp (void) } -#if ( defined(SVR4) && !defined(SCO325) && !defined(sun) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if defined(SVR4) && !defined(SCO325) && !defined(sun) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -300,17 +296,6 @@ ifioctl (int fd, int cmd, char *arg) { ioc.ic_len = ((struct ifconf *) arg)->ifc_len; ioc.ic_dp = ((struct ifconf *) arg)->ifc_buf; -#ifdef ISC - /* SIOCGIFCONF is somewhat brain damaged on ISC. The argument - * buffer must contain the ifconf structure as header. Ifc_req - * is also not a pointer but a one element array of ifreq - * structures. On return this array is extended by enough - * ifreq fields to hold all interfaces. The return buffer length - * is placed in the buffer header. - */ - ((struct ifconf *) ioc.ic_dp)->ifc_len = - ioc.ic_len - sizeof(struct ifconf); -#endif } else { @@ -322,14 +307,6 @@ ifioctl (int fd, int cmd, char *arg) #ifdef SVR4 ((struct ifconf *) arg)->ifc_len = ioc.ic_len; #endif -#ifdef ISC - { - ((struct ifconf *) arg)->ifc_len = - ((struct ifconf *)ioc.ic_dp)->ifc_len; - ((struct ifconf *) arg)->ifc_buf = - (caddr_t)((struct ifconf *)ioc.ic_dp)->ifc_req; - } -#endif return(ret); } #else /* Case sun, SCO325 and others */ @@ -609,11 +586,7 @@ DefineSelf (int fd) ifc.ifc_buf = bufptr; #define IFC_IOCTL_REQ SIOCGIFCONF -#ifdef ISC -#define IFC_IFC_REQ (struct ifreq *) ifc.ifc_buf -#else #define IFC_IFC_REQ ifc.ifc_req -#endif /* ISC */ #define IFC_IFC_LEN ifc.ifc_len #define IFR_IFR_ADDR ifr->ifr_addr #define IFR_IFR_NAME ifr->ifr_name |