diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-07-30 16:07:39 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-07-30 16:07:39 -0700 |
| commit | e5f52f206916b7c5264b9371f9bd0113632a4a16 (patch) | |
| tree | 27cec8bb83f115343db2a53c8f27543330cf5b64 | |
| parent | 6d1ad967b894a37f423fd52247df5fcc3bfab1a8 (diff) | |
| download | xorg-lib-libxtrans-e5f52f206916b7c5264b9371f9bd0113632a4a16.tar.gz | |
Fix ifdef checks for SVR4 to do the right thing on Solaris
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Xtrans.c | 4 | ||||
| -rw-r--r-- | Xtransint.h | 2 | ||||
| -rw-r--r-- | Xtranslcl.c | 2 | ||||
| -rw-r--r-- | Xtranssock.c | 6 |
4 files changed, 7 insertions, 7 deletions
@@ -103,7 +103,7 @@ Xtransport_table Xtransports[] = { #ifndef sun { &TRANS(PTSFuncs), TRANS_LOCAL_PTS_INDEX }, #endif /* sun */ -#ifdef SVR4 +#if defined(SVR4) || defined(__SVR4) { &TRANS(NAMEDFuncs), TRANS_LOCAL_NAMED_INDEX }, #endif #ifdef sun @@ -1348,7 +1348,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) #endif /* SYSV && __i386__ || WIN32 || __sxg__ */ -#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SCO__) +#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) #ifndef NEED_UTSNAME #define NEED_UTSNAME #endif diff --git a/Xtransint.h b/Xtransint.h index 0bd4b46..cd5b64f 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -94,7 +94,7 @@ from The Open Group. * to avoid a race condition. JKJ (6/5/97) */ -# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SCO__) +# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) # ifndef NEED_UTSNAME # define NEED_UTSNAME # endif diff --git a/Xtranslcl.c b/Xtranslcl.c index f6a2468..8391156 100644 --- a/Xtranslcl.c +++ b/Xtranslcl.c @@ -75,7 +75,7 @@ from The Open Group. #include <sys/signal.h> #include <sys/ioctl.h> #include <sys/stat.h> -#if defined(SVR4) +#if defined(SVR4) || defined(__SVR4) #include <sys/filio.h> #endif #ifdef sun diff --git a/Xtranssock.c b/Xtranssock.c index f36e3a6..0935744 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -87,7 +87,7 @@ from the copyright holders. #endif /* !NO_TCP_H */ #include <sys/ioctl.h> -#if defined(SVR4) +#if defined(SVR4) || defined(__SVR4) #include <sys/filio.h> #endif @@ -222,7 +222,7 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr); #if defined HAVE_SOCKLEN_T || (defined(IPv6) && defined(AF_INET6)) # define SOCKLEN_T socklen_t -#elif defined(SVR4) || defined(__SCO__) +#elif defined(SVR4) || defined(__SVR4) || defined(__SCO__) # define SOCKLEN_T size_t #else # define SOCKLEN_T int @@ -1194,7 +1194,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) if (!abstract && ( stat (unsock->sun_path, &statb) == -1 || ((statb.st_mode & S_IFMT) != -#if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) +#if defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) S_IFIFO #else S_IFSOCK |