From 74bd560ff8ab24c84f6839469eaf936cb79e3aeb Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 26 Jan 2020 23:15:52 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20SGI=20=E3=81=AE=E3=83=97?=
 =?utf8?q?=E3=83=AA=E3=83=97=E3=83=AD=E3=82=92=E5=89=8A=E9=99=A4=20/=20Rem?=
 =?utf8?q?oved=20preprocessor=20SGI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/h-config.h   | 33 ---------------------------------
 src/h-system.h   |  5 ++---
 src/makefile.std |  8 --------
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/h-config.h b/src/h-config.h
index ade352382..ed0c49a80 100644
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -32,13 +32,6 @@
 #endif
 
 /*
- * OPTION: Compile on an SGI running IRIX
- */
-#ifndef SGI
-/* #define SGI */
-#endif
-
-/*
  * OPTION: Compile on an ultrix/4.2BSD/Dynix/etc. version of UNIX,
  * Do not define this if you are on any kind of SunOS.
  */
@@ -57,15 +50,6 @@
 #endif
 
 /*
- * Extract the "SGI" flag from the compiler
- */
-#ifdef sgi
-# ifndef SGI
-#  define SGI
-# endif
-#endif
-
-/*
  * Extract the "WINDOWS" flag from the compiler
  */
 #if defined(_Windows) || defined(__WINDOWS__) || \
@@ -106,22 +90,6 @@
 
 
 /*
- * OPTION: Set "USG" for "System V" versions of Unix
- * This is used to choose a "lock()" function, and to choose
- * which header files ("string.h" vs "strings.h") to include.
- * It is also used to allow certain other options, such as options
- * involving userid's, or multiple users on a single machine, etc.
- */
-#ifdef SET_UID
-# if defined(SGI)
-#  ifndef USG
-#   define USG
-#  endif
-# endif
-#endif
-
-
-/*
  * Every system seems to use its own symbol as a path separator.
  * Default to the standard Unix slash, but attempt to change this
  * for various other systems.  Note that any system that uses the
@@ -178,7 +146,6 @@
  * OPTION: Define "HAVE_USLEEP" only if "usleep()" exists.
  *
  * Note that this is only relevant for "SET_UID" machines.
- * Note that new "SGI" machines have "usleep()".
  */
 #if defined(SET_UID) && !defined(HAVE_CONFIG_H)
 # if !defined(ULTRIX) && !defined(ISC)
diff --git a/src/h-system.h b/src/h-system.h
index f5eaacede..b4fba2ce8 100644
--- a/src/h-system.h
+++ b/src/h-system.h
@@ -42,12 +42,11 @@
 
 # if defined(Pyramid) || defined(NeXT) || \
      defined(NCR3K) || defined(ibm032) || \
-     defined(__osf__) || defined(ISC) || defined(SGI) || \
-     defined(linux)
+     defined(__osf__) || defined(ISC) || defined(linux)
 #  include <sys/time.h>
 # endif
 
-# if !defined(SGI) && !defined(ULTRIX)
+# if !defined(ULTRIX)
 #  include <sys/timeb.h>
 # endif
 
diff --git a/src/makefile.std b/src/makefile.std
index 9d0428e16..65d94dc0a 100644
--- a/src/makefile.std
+++ b/src/makefile.std
@@ -210,14 +210,6 @@ LIBS = -L/usr/X11R6/lib -lX11 -lncurses
 
 
 ##
-## Variation -- compile for SGI Indigo runnig Irix
-##
-#CFLAGS = -Wall -O2  -fno-strength-reduce -g -D"USE_X11" $(JP_OPT) -D"USE_GCU" -I/usr/X11R6/include
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses -ltermcap -lsun
-
-
-
-##
 ## Variation -- compile for Dec ALPHA OSF/1 v2.0
 ##
 #CC     = cc
-- 
2.11.0