diff options
Diffstat (limited to 'xc/include/Xos.h')
| -rw-r--r-- | xc/include/Xos.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/xc/include/Xos.h b/xc/include/Xos.h index 30ce3d56f..3b2c866a4 100644 --- a/xc/include/Xos.h +++ b/xc/include/Xos.h @@ -1,5 +1,5 @@ /* - * $TOG: Xos.h /main/71 1998/02/09 11:18:52 kaleb $ + * $Xorg: Xos.h,v 1.5 2000/08/18 04:05:44 coskrey Exp $ * * Copyright 1987, 1998 The Open Group @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.30 2000/08/10 17:40:27 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.32 2001/02/15 18:20:28 dawes Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -56,6 +56,14 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ +#ifdef _SEQUENT_ +/* + * in_systm.h compatibility between SysV and BSD types u_char u_short u_long + * select.h for typedef of args to select, fd_set, may use SVR4 later + */ +#include <netinet/in_systm.h> +#include <sys/select.h> +#endif /* _SEQUENT_ */ /* * Just about everyone needs the strings routines. We provide both forms here, @@ -149,10 +157,10 @@ extern int sys_nerr; #endif /* CSRG_BASED */ /* - * Get struct timeval + * Get struct timeval and struct tm */ -#ifdef SYSV +#if defined(SYSV) && !defined(_SEQUENT_) #ifndef USL #include <sys/time.h> @@ -209,8 +217,7 @@ struct timeval { #include <sys/time.h> #elif defined(MINIX) || defined(_SEQUENT_) || defined(Lynx) #include <time.h> -#else -#ifdef __QNX__ +#elif defined (__QNX__) typedef unsigned long fd_mask; /* Make sure we get 256 bit select masks */ #define FD_SETSIZE 256 @@ -219,7 +226,7 @@ typedef unsigned long fd_mask; #include <time.h> #else #include <sys/time.h> -#endif /* QNX */ +#include <time.h> #endif /* defined(_POSIX_SOURCE) && defined(SVR4) */ #endif /* SYSV */ |