diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-17 16:05:03 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-17 16:05:03 -0700 |
| commit | b6c63181aded7f8e8879914b0f92767a47aa47cf (patch) | |
| tree | a467ad0057f208897cb6d56e511772b030176f72 | |
| parent | b566d33d344876392254941d8ef73c848194c432 (diff) | |
Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | src/FSlibInt.c | 3 | ||||
| -rw-r--r-- | src/FSlibint.h | 15 | ||||
| -rw-r--r-- | src/FSlibos.h | 28 |
3 files changed, 0 insertions, 46 deletions
diff --git a/src/FSlibInt.c b/src/FSlibInt.c index 3d0675e..d94e242 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -1287,9 +1287,6 @@ _FSFreeQ(void) #ifdef hpux #define NEED_UTSNAME #endif -#ifdef USG -#define NEED_UTSNAME -#endif #ifdef SVR4 #ifndef _SEQUENT_ #define NEED_UTSNAME diff --git a/src/FSlibint.h b/src/FSlibint.h index 6991d6a..5e9cf51 100644 --- a/src/FSlibint.h +++ b/src/FSlibint.h @@ -54,22 +54,7 @@ in this Software without prior written authorization from The Open Group. */ #include <X11/Xos.h> #include <stdio.h> - -/* This is all probably superfluous given Xos.h above */ -#ifdef USG -#ifndef __TYPES__ -#include <sys/types.h> /* forgot to protect it... */ -#define __TYPES__ -#endif /* __TYPES__ */ -#else -#if defined(_POSIX_SOURCE) && defined(MOTOROLA) -#undef _POSIX_SOURCE #include <sys/types.h> -#define _POSIX_SOURCE -#else -#include <sys/types.h> -#endif -#endif /* USG */ #include "FSlib.h" #include "FSlibos.h" diff --git a/src/FSlibos.h b/src/FSlibos.h index 1e41e75..041bba1 100644 --- a/src/FSlibos.h +++ b/src/FSlibos.h @@ -297,32 +297,4 @@ typedef fd_set FdSet; #define FScalloc(nelem, elsize) calloc((nelem), (elsize)) #endif -/* - * ReadvFromServer and WritevToSever use struct iovec, normally found - * in Berkeley systems in <sys/uio.h>. See the readv(2) and writev(2) - * manual pages for details. - * - * struct iovec { - * caddr_t iov_base; - * int iov_len; - * }; - */ - -#ifdef USG - -#if defined(USG) && !defined(CRAY) && !defined(umips) && !defined(MOTOROLA) -#ifndef __TIMEVAL__ -#define __TIMEVAL__ -struct timeval { /* BSD has in <sys/time.h> */ - long tv_sec; - long tv_usec; -}; - -#endif /* __TIMEVAL__ */ - -#endif /* not CRAY or umips */ - -#endif /* USG */ - - #define SearchString(string, char) index((string), (char)) |