From 3f8b27a9dff68792fdc448782459a6d41cade9ff Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 24 Sep 2019 19:48:17 -0400 Subject: unifdef USG and NCR Reviewed-by: Alan Coopersmith --- Xtrans.c | 2 +- Xtrans.h | 2 +- Xtransint.h | 2 +- Xtranssock.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Xtrans.c b/Xtrans.c index 0e09b25..7263a08 100644 --- a/Xtrans.c +++ b/Xtrans.c @@ -1318,7 +1318,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) #endif /* WIN32 */ -#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) +#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) #ifndef NEED_UTSNAME #define NEED_UTSNAME #endif diff --git a/Xtrans.h b/Xtrans.h index 360b01b..281fb52 100644 --- a/Xtrans.h +++ b/Xtrans.h @@ -148,7 +148,7 @@ typedef long BytesReadable_t; #endif -#if defined(WIN32) || defined(USG) +#if defined(WIN32) /* * TRANS(Readv) and TRANS(Writev) use struct iovec, normally found diff --git a/Xtransint.h b/Xtransint.h index 2156bd5..ef3d739 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -98,7 +98,7 @@ from The Open Group. * to avoid a race condition. JKJ (6/5/97) */ -# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) +# if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) # ifndef NEED_UTSNAME # define NEED_UTSNAME # endif diff --git a/Xtranssock.c b/Xtranssock.c index b06579c..8d0766c 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -1068,7 +1068,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) if (!abstract && ( stat (unsock->sun_path, &statb) == -1 || ((statb.st_mode & S_IFMT) != -#if defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) +#if defined(SCO325) || !defined(S_IFSOCK) S_IFIFO #else S_IFSOCK -- cgit v1.2.3