summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dcop/KDE-ICE/Xtrans.c4
-rw-r--r--dcop/KDE-ICE/Xtransint.h4
-rw-r--r--dcop/KDE-ICE/Xtranssock.c14
3 files changed, 11 insertions, 11 deletions
diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c
index e34574248..c85a9263d 100644
--- a/dcop/KDE-ICE/Xtrans.c
+++ b/dcop/KDE-ICE/Xtrans.c
@@ -1244,7 +1244,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
#endif /* CRAY */
-#if (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
+#if (defined(SYSV) && defined(i386)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
/*
* emulate readv
@@ -1276,7 +1276,7 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
#endif /* SYSV && i386 || _WIN32 || __sxg__ */
-#if (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
+#if (defined(SYSV) && defined(i386)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
/*
* emulate writev
diff --git a/dcop/KDE-ICE/Xtransint.h b/dcop/KDE-ICE/Xtransint.h
index 20c003387..dfe89baf8 100644
--- a/dcop/KDE-ICE/Xtransint.h
+++ b/dcop/KDE-ICE/Xtransint.h
@@ -372,7 +372,7 @@ typedef struct _Xtransport_table {
* systems, so they may be emulated.
*/
-#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
+#if defined(CRAY) || (defined(SYSV) && defined(i386)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
#define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt)
@@ -389,7 +389,7 @@ static int TRANS(ReadV)(
#endif /* CRAY || (SYSV && i386) || _WIN32 || __sxg__ || */
-#if defined(CRAY) || (defined(SYSV) && defined(i386) && !defined(SCO325)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
+#if defined(CRAY) || (defined(SYSV) && defined(i386)) || defined(_WIN32) || defined(__sxg__) || defined(__EMX__)
#define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt)
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index 9d2c39456..ba31e2966 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -94,14 +94,14 @@ from The Open Group.
#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)) && !defined(DGUX)
#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_ */
@@ -302,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;
@@ -347,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;
@@ -1072,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);
@@ -1152,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;
@@ -1232,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;