3 files changed, 2 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c
index c812673eb..ee493bc2c 100644
--- a/nx-X11/programs/Xserver/mi/miarc.c
+++ b/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
diff --git a/nx-X11/programs/Xserver/mi/micoord.h b/nx-X11/programs/Xserver/mi/micoord.h
index b3d725b73..3e45cfede 100644
--- a/nx-X11/programs/Xserver/mi/micoord.h
+++ b/nx-X11/programs/Xserver/mi/micoord.h
@@ -43,7 +43,7 @@
  * forcing as to use div instead of shift.  Let's be explicit.
  */
 
-#if defined(mips) || defined(sgi) || \
+#if defined(mips) || \
     defined(sparc) || defined(__sparc64__) || \
     defined(__alpha) || defined(__alpha__) || \
     defined(__i386__) || defined(i386) || \
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index fc64937d7..6f6d67841 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/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