diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
| commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
| tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/include/Xpoll.h.in | |
| parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
| parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
| download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip | |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/include/Xpoll.h.in')
| -rw-r--r-- | nx-X11/include/Xpoll.h.in | 48 |
1 files changed, 9 insertions, 39 deletions
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 47a0341e2..db8c565d9 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -79,28 +79,14 @@ from The Open Group. /* Below is the monster branch from hell. Basically, most systems will drop to * 'the branch below is the fallthrough for halfway modern systems', and include * <sys/select.h>, so we get the FD_* macros. */ -#if !defined(DGUX) -# if (defined(SVR4) || defined(AIXV3)) && !defined(FD_SETSIZE) -# include <sys/select.h> -# ifdef luna -# include <sysent.h> -# endif -# else /* not SVR4/AIXv3 */ -# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */ -# if !defined(NFDBITS) -# include <sys/select.h> -# endif -# else /* the branch below is the fallthrough for halfway modern systems */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif -# include <sys/select.h> -# endif + +#if defined(SVR4) && !defined(FD_SETSIZE) +# include <sys/select.h> +# ifdef luna +# include <sysent.h> # endif -#else /* DGUX -- No sys/select in Intel DG/ux */ -# include <sys/time.h> -# include <sys/types.h> -# include <unistd.h> +#else /* not SVR4 */ +# include <sys/select.h> #endif #include <nx-X11/Xmd.h> @@ -149,27 +135,11 @@ typedef struct fd_set { extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); -#ifndef hpux /* and perhaps old BSD ??? */ -# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -#else -# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */ -# define Select(n,r,w,e,t) _XSelect(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t) -# else -# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -# endif -#endif +#define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) #else /* #ifdef NX_TRANS_SOCKET */ -#ifndef hpux /* and perhaps old BSD ??? */ -# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -#else -# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */ -# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t) -# else -# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -# endif -#endif +#define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) #endif /* #ifdef NX_TRANS_SOCKET */ |