5 files changed, 4 insertions, 9 deletions
diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h
index 348a7bc2d..ef1bf7b96 100644
--- a/nx-X11/include/Xalloca.h
+++ b/nx-X11/include/Xalloca.h
@@ -109,14 +109,12 @@ from The Open Group.
  * decide that you don't want to use alloca, you might want to fix it here.
  */
 /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-#        ifndef __sgi			/* IRIX 5/6 has definition */
 #          define __Xnullarg		/* as nothing */
 #          ifndef X_NOT_STDC_ENV
              extern void *alloca(__Xnullarg);
 #          else
              extern char *alloca(__Xnullarg);
 #          endif
-#        endif /* __sgi */
 #        define ALLOCATE_LOCAL(size) alloca((int)(size))
 #      endif /* who does alloca */
 #    endif /* NCR */
diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h
index aa92b43f4..222da2e1f 100644
--- a/nx-X11/include/Xarch.h
+++ b/nx-X11/include/Xarch.h
@@ -40,7 +40,7 @@
 #else
 
 #ifdef SVR4
-#if defined(NCR) || defined(Mips) || defined(__sgi)
+#if defined(NCR) || defined(Mips)
 #include <sys/endian.h>
 #else
 #if !defined(sun)
diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h
index 8b3af78f6..50159edd3 100644
--- a/nx-X11/include/Xmd.h
+++ b/nx-X11/include/Xmd.h
@@ -59,8 +59,7 @@ SOFTWARE.
     defined(__sparc64__) || \
     defined(__s390x__) || \
     defined(__amd64__) || defined(amd64) || \
-    defined(__powerpc64__) || \
-    (defined(sgi) && (_MIPS_SZLONG == 64))
+    defined(__powerpc64__)
 #define LONG64				/* 32/64-bit architecture */
 #endif
 
@@ -100,7 +99,7 @@ typedef long INT32;
 #endif
 typedef short INT16;
 
-#if defined(__STDC__) || defined(sgi)
+#if defined(__STDC__)
 typedef signed char    INT8;
 #else
 typedef char           INT8;
diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h
index 353965c1c..b664337c5 100644
--- a/nx-X11/include/Xos.h
+++ b/nx-X11/include/Xos.h
@@ -57,11 +57,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* USG */
 
-#ifndef sgi
 #if defined(__SCO__) || defined(__UNIXWARE__)
 #include <stdint.h>
 #endif
-#endif
 
 #ifdef _SEQUENT_
 /*
diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h
index 77267bea1..06649106d 100644
--- a/nx-X11/include/Xthreads.h
+++ b/nx-X11/include/Xthreads.h
@@ -56,7 +56,7 @@ typedef struct mutex xmutex_rec;
 #define xcondition_broadcast(cv) condition_broadcast(cv)
 #define xcondition_set_name(cv,str) condition_set_name(cv,str)
 #else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_)
+#if defined(SVR4) && !defined(_SEQUENT_)
 #include <thread.h>
 #include <synch.h>
 typedef thread_t xthread_t;