diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 20:59:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-08 22:40:46 +0100 |
| commit | 184c5d778210dea8eab045a5f7ecf9d4344c1c34 (patch) | |
| tree | 9ac5219fc25700a78e5ad934ba1372482f6fb5ba /nx-X11/include | |
| parent | ace255eda62081526b721e82ed0339c566975ad3 (diff) | |
| download | nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.tar.gz nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.tar.bz2 nx-libs-184c5d778210dea8eab045a5f7ecf9d4344c1c34.zip | |
drop platform support: unifdef hpux and __hppa__.
Fixes ArcticaProject/nx-libs#273.
Diffstat (limited to 'nx-X11/include')
| -rw-r--r-- | nx-X11/include/Xmd.h | 1 | ||||
| -rw-r--r-- | nx-X11/include/Xos_r.h | 4 | ||||
| -rw-r--r-- | nx-X11/include/Xpoll.h.in | 20 |
3 files changed, 4 insertions, 21 deletions
diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h index 83d22a47f..a1e165d4d 100644 --- a/nx-X11/include/Xmd.h +++ b/nx-X11/include/Xmd.h @@ -58,7 +58,6 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 44a3690ba..138efd704 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -927,8 +927,8 @@ typedef struct { (_Xos_processUnlock), \ (p).result ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4)) -/* Returns (int)0 on success. OSF/1 v3.2, HP/UX 10 +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) +/* Returns (int)0 on success. OSF/1 v3.2 * * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen); * extern int ctime_r(const time_t *timer, char *buffer, int buflen); diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 47a0341e2..4d720a742 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -149,27 +149,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 */ |