diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-11-07 22:24:59 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:49:55 +0100 |
| commit | 5fb7f53c6f06df54e7fb45498d697d17483565b6 (patch) | |
| tree | ca97e2026c47f4c04481199d1561ba075fdd4e14 /nx-X11/programs/Xserver | |
| parent | bccf81ea062c6a6c4066ed5453c44b89c63f7f5f (diff) | |
| download | nx-libs-5fb7f53c6f06df54e7fb45498d697d17483565b6.tar.gz nx-libs-5fb7f53c6f06df54e7fb45498d697d17483565b6.tar.bz2 nx-libs-5fb7f53c6f06df54e7fb45498d697d17483565b6.zip | |
os: unifdef ISC
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/access.c | 35 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/log.c | 2 |
3 files changed, 5 insertions, 34 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 08ce9e5d9..352e40261 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -50,7 +50,7 @@ #ifdef SVR4 #include <sys/sysmacros.h> #endif -#if defined(ISC) || defined(__CYGWIN__) || defined(__SCO__) +#if defined(__CYGWIN__) || defined(__SCO__) #include <sys/param.h> #include <sys/sysmacros.h> #endif diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index df540e704..9497d84a7 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -80,9 +80,9 @@ SOFTWARE. #include <sys/ioctl.h> #include <ctype.h> -#if defined(TCPCONN) || defined(ISC) || defined(__SCO__) +#if defined(TCPCONN) || defined(__SCO__) #include <netinet/in.h> -#endif /* TCPCONN || ISC || __SCO__ */ +#endif /* TCPCONN || __SCO__ */ #ifdef HAS_GETPEERUCRED # include <ucred.h> @@ -96,10 +96,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 @@ -282,7 +278,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR))) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -299,17 +295,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 { @@ -321,19 +306,11 @@ 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 NCR and others */ #define ifioctl ioctl -#endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ +#endif /* ((SVR4 && !sun !SCO325 !NCR)) && SIOCGIFCONF */ /* * DefineSelf (fd): @@ -723,11 +700,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 diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 0ead6e9f0..2dc5627e4 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -730,11 +730,9 @@ ErrorF(const char * f, ...) #ifndef NEED_STRERROR #ifdef SYSV -#if !defined(ISC) || defined(ISC202) || defined(ISC22) #define NEED_STRERROR #endif #endif -#endif #if defined(NEED_STRERROR) && !defined(strerror) extern char *sys_errlist[]; |