drop platform support: unifdef QNX.

nx-X11/config/cf/Imake.cf

@@ -1041,37 +1041,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #endif
 #endif
 
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define MacroIncludeFile <QNX4.cf>
-#define MacroFile QNX4.cf
-#define QNX4Architecture
-#define i386Architecture
-#endif /* QNX4 */
-
-#ifdef __QNXNTO__
-#define MacroIncludeFile <nto.cf>
-#define MacroFile nto.cf
-#define NTOArchitecture
-# ifdef PPC
-#  define PPCArchitecture
-#  undef PPC
-# endif
-# ifdef MIPS
-#  define mipsArchitecture
-#  undef MIPS
-# endif
-# ifdef i386
-#  define i386Architecture
-#  undef i386
-# endif /* i386 */
-# ifdef __i386__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i386__
-# endif /* __i386__ */
-#endif /* QNX/Neutrino */
-
 #ifdef SparcArchitecture
 # if defined(__sparc_v9) || defined(__arch64__)
 #  define Sparc64Architecture

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 */

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 <sys/isa_defs.h>
 #ifdef _LITTLE_ENDIAN

nx-X11/include/Xos.h

@@ -221,13 +221,6 @@ struct timeval {
 }
 #elif defined(_SEQUENT_)
 #include <time.h>
-#elif defined (__QNX__)
-typedef unsigned long fd_mask;
-/* Make sure we get 256 bit select masks */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-#include <sys/time.h>
-#include <time.h>
 #else
 #include <sys/time.h>
 #include <time.h>
@@ -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
  */

nx-X11/include/Xpoll.h.in

@@ -86,9 +86,6 @@ from The Open Group.
 #  include <sysent.h>
 # endif
 #else /* not SVR4 */
-# ifdef __QNX__  /* Make sure we get 256 bit select masks */
-#  define FD_SETSIZE 256
-# endif
 # include <sys/select.h>
 #endif
 

nx-X11/lib/X11/Imakefile

@@ -1078,10 +1078,6 @@ InstallNonExecFile(Xcms.txt,$(LIBDIR))
 InstallNonExecFile(XErrorDB,$(LIBDIR))
 InstallLintLibrary(X11,$(LINTLIBDIR))
 
-#ifdef QNX4Architecture
-LOCAL_LDFLAGS=-F
-#endif
-
 MAKEKEYS = ./makekeys
 KEYSYMDEFS =  $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h
 

nx-X11/lib/X11/XlibInt.c

@@ -3891,7 +3891,7 @@ _XData32(
  *       and so, you may be better off using gethostname (if it exists).
  */
 
-#if (defined(_POSIX_SOURCE) && !defined(__QNX__)) || defined(SVR4)
+#if defined(_POSIX_SOURCE) || defined(SVR4)
 #define NEED_UTSNAME
 #include <sys/utsname.h>
 #else

nx-X11/programs/Xserver/Imakefile

@@ -248,8 +248,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXmiexpose.o    \
               hw/nxagent/NXresource.o    \
               hw/nxagent/NXdamage.o
-#elif !defined(Win32Architecture) && \
-      !defined(QNX4Architecture)
+#elif !defined(Win32Architecture)
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXwindow.o      \
               hw/nxagent/NXevents.o      \

nx-X11/programs/Xserver/include/servermd.h

@@ -305,7 +305,6 @@ SOFTWARE.
 #if	(defined(SVR4) && defined(i386)) || \
 	defined(__alpha__) || defined(__alpha) || \
 	defined(__i386__) || defined(__i386) || \
-	defined(__QNX__) || \
 	defined(__s390x__) || defined(__s390__)
   
 #ifndef IMAGE_BYTE_ORDER

nx-X11/programs/Xserver/mi/miarc.c

@@ -51,7 +51,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+#if defined(_XOPEN_SOURCE) \
 	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
 #else

nx-X11/programs/Xserver/mi/miinitext.c

@@ -66,10 +66,6 @@ SOFTWARE.
 #include "extension.h"
 #include "micmap.h"
 
-#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
-#undef GLXEXT
-#endif
-
 extern Bool noTestExtensions;
 
 #ifdef BIGREQS

nx-X11/programs/Xserver/os/access.c

@@ -91,12 +91,6 @@ SOFTWARE.
 # endif
 #endif
 
-#if defined(QNX4)
-# include <sys/utsname.h>
-# ifdef HAS_IFREQ
-#  include <net/if.h>
-# endif
-#else
 #if defined(SVR4) ||  (defined(SYSV) && defined(i386)) || defined(__GNU__)
 # include <sys/utsname.h>
 #endif
@@ -113,7 +107,6 @@ SOFTWARE.
 #else /*!__GNU__*/
 # include <net/if.h>
 #endif /*__GNU__ */
-#endif /* QNX4 */
 
 #ifdef SVR4
 #include <sys/sockio.h>
@@ -499,7 +492,7 @@ DefineSelf (int fd)
 
 #else /* WINTCP */
 
-#if !defined(SIOCGIFCONF) || defined(QNX4)
+#if !defined(SIOCGIFCONF)
 void
 DefineSelf (int fd)
 {
@@ -542,19 +535,11 @@ DefineSelf (int fd)
      * uname() lets me access to the whole string (it smashes release, you
      * see), whereas gethostname() kindly truncates it for me.
      */
-#ifndef QNX4
 #ifndef WIN32
     uname(&name);
 #else
     gethostname(name.nodename, sizeof(name.nodename));
 #endif
-#else
-    /* QNX4's uname returns node number in name.nodename, not the hostname
-       have to overwrite it */
-    char hname[1024];
-    gethostname(hname, 1024);
-    name.nodename = hname;
-#endif
 
     hp = _XGethostbyname(name.nodename, hparams);
     if (hp != NULL)
@@ -663,14 +648,9 @@ DefineLocalHost:
 		      p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
 #define ifraddr_size(a) (a.sa_len)
 #else
-#ifdef QNX4
-#define ifr_size(p) (p->ifr_addr.sa_len + IFNAMSIZ)
-#define ifraddr_size(a) (a.sa_len)
-#else
 #define ifr_size(p) (sizeof (ifr_type))
 #define ifraddr_size(a) (sizeof (a))
 #endif
-#endif
 
 #if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6))
 #include <arpa/inet.h>
@@ -1033,7 +1013,7 @@ DefineSelf (int fd)
 	}
     }
 }
-#endif /* SIOCGIFCONF || QNX4 */
+#endif /* !SIOCGIFCONF */
 #endif /* WINTCP */
 
 #ifdef XDMCP

nx-X11/programs/Xserver/os/osdep.h

@@ -79,9 +79,6 @@ SOFTWARE.
 #endif /* X_NOT_POSIX */
 #endif
 
-#ifdef __QNX__
-#define NOFILES_MAX 256
-#endif
 #ifndef OPEN_MAX
 #ifdef SVR4
 #define OPEN_MAX 256

nx-X11/programs/Xserver/os/osinit.c

@@ -71,7 +71,7 @@ SOFTWARE.
 #include <sys/wait.h>
 #endif
 
-#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
 #include <sys/resource.h>
 #endif
 

nx-X11/programs/Xserver/os/utils.c

@@ -113,7 +113,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef WIN32
 #include <sys/wait.h>
 #endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
 #include <sys/resource.h>
 #endif
 #include <time.h>
@@ -2007,9 +2007,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
     enum BadCode bad = NotBad;
     int i = 0, j;
     char *a, *e = NULL;
-#if defined(__QNX__) && !defined(__QNXNTO__)
-    char cmd_name[64];
-#endif
 
 #if CHECK_EUID
     if (geteuid() == 0 && getuid() != geteuid())

nx-X11/programs/Xserver/xkb/xkbAccessX.c

@@ -30,9 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #include <math.h>
-#ifdef __QNX__
-#include <limits.h>
-#endif
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include <nx-X11/keysym.h>