diff options
Diffstat (limited to 'dcop/KDE-ICE/Xtranssock.c')
| -rw-r--r-- | dcop/KDE-ICE/Xtranssock.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c index bb6d122bc..62e0ee0cd 100644 --- a/dcop/KDE-ICE/Xtranssock.c +++ b/dcop/KDE-ICE/Xtranssock.c @@ -47,6 +47,10 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <ctype.h> #include <unistd.h> #include <stdlib.h> @@ -84,23 +88,20 @@ from The Open Group. #endif /* SYSV */ #endif /* MOTOROLA */ #ifndef NO_TCP_H -#ifdef __osf__ -#include <sys/param.h> -#endif /* osf */ #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) #include <machine/endian.h> #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ #include <netinet/tcp.h> #endif /* !NO_TCP_H */ #include <sys/ioctl.h> -#if (defined(SVR4) || defined(__SVR4)) && !defined(SCO325) && !defined(DGUX) +#if (defined(SVR4) || defined(__SVR4)) #include <sys/filio.h> #endif #if (defined(i386) && defined(SYSV)) || defined(_SEQUENT_) #if !defined(_SEQUENT_) && !defined(ESIX) && !defined(sco) #include <net/errno.h> #endif /* _SEQUENT_ || ESIX || SCO */ -#if !defined(ISC) || !defined(I_NREAD) || defined(SCO325) +#if !defined(ISC) || !defined(I_NREAD) #include <sys/stropts.h> #endif #endif /* i386 && SYSV || _SEQUENT_ */ @@ -301,7 +302,7 @@ TRANS(SocketINETGetAddr) (XtransConnInfo ciptr) { struct sockaddr_in sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) size_t namelen = sizeof sockname; #else int namelen = sizeof sockname; @@ -346,7 +347,7 @@ TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr) { struct sockaddr_in sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) size_t namelen = sizeof sockname; #else int namelen = sizeof sockname; @@ -873,7 +874,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port) else sockname.sin_port = htons (0); -#ifdef BSD44SOCKETS +#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN sockname.sin_len = sizeof (sockname); #endif sockname.sin_family = AF_INET; @@ -947,7 +948,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port) } namelen = sizeof( sockname ) - sizeof( sockname.sun_path ) + strlen( sockname.sun_path ) + 1; -#if defined(BSD44SOCKETS) +#if defined(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN) sockname.sun_len = namelen; #endif @@ -1071,7 +1072,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status) { XtransConnInfo newciptr; struct sockaddr_in sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) size_t namelen = sizeof sockname; #else int namelen = sizeof(sockname); @@ -1151,7 +1152,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) { XtransConnInfo newciptr; struct sockaddr_un sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) size_t namelen = sizeof sockname; #else int namelen = sizeof sockname; @@ -1231,7 +1232,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port) { struct sockaddr_in sockname; -#if defined(SVR4) || defined(SCO325) +#if defined(SVR4) size_t namelen = sizeof sockname; #else int namelen = sizeof sockname; @@ -1278,7 +1279,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port) * Build the socket name. */ -#ifdef BSD44SOCKETS +#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN sockname.sin_len = sizeof (struct sockaddr_in); #endif sockname.sin_family = AF_INET; |