From c6250a86468b1c2c23d41b27c4d6e438518ec917 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:51:55 +0100 Subject: drop platform support: unifdef QNX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/include/Xalloca.h | 2 -- nx-X11/include/Xarch.h | 12 ------------ nx-X11/include/Xos.h | 10 +--------- nx-X11/include/Xpoll.h.in | 3 --- 4 files changed, 1 insertion(+), 26 deletions(-) (limited to 'nx-X11/include') diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h index 1ec112619..348a7bc2d 100644 --- a/nx-X11/include/Xalloca.h +++ b/nx-X11/include/Xalloca.h @@ -110,14 +110,12 @@ from The Open Group. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ # ifndef __sgi /* IRIX 5/6 has definition */ -# ifndef __QNX__ # define __Xnullarg /* as nothing */ # ifndef X_NOT_STDC_ENV extern void *alloca(__Xnullarg); # else extern char *alloca(__Xnullarg); # endif -# endif /* __QNX__ */ # endif /* __sgi */ # define ALLOCATE_LOCAL(size) alloca((int)(size)) # endif /* who does alloca */ diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h index d68b0493a..aa92b43f4 100644 --- a/nx-X11/include/Xarch.h +++ b/nx-X11/include/Xarch.h @@ -79,18 +79,6 @@ #define LITTLE_ENDIAN 1234 #define BIG_ENDIAN 4321 -#if defined(__QNX__) && !defined(__QNXNTO__) -#define BYTE_ORDER LITTLE_ENDIAN -#endif - -#if defined(__QNXNTO__) -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif - #if (defined(sun) && defined(SVR4)) #include #ifdef _LITTLE_ENDIAN diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 8a7fface1..353965c1c 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -221,13 +221,6 @@ struct timeval { } #elif defined(_SEQUENT_) #include -#elif defined (__QNX__) -typedef unsigned long fd_mask; -/* Make sure we get 256 bit select masks */ -#define FD_SETSIZE 256 -#include -#include -#include #else #include #include @@ -264,8 +257,7 @@ typedef unsigned long fd_mask; #endif #if defined(ISC) || \ - (defined(__linux__) && !defined(__GLIBC__)) || \ - (defined(__QNX__) && !defined(UNIXCONN)) + (defined(__linux__) && !defined(__GLIBC__)) /* * Some OS's may not have this */ diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 3ad5d0669..db8c565d9 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -86,9 +86,6 @@ from The Open Group. # include # endif #else /* not SVR4 */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif # include #endif -- cgit v1.2.3