From 869629d7d1356c9cc84ac495842f6fa716304d07 Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 14 Feb 2020 21:07:59 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20NeXTSTEP=20OS=E3=81=AE?= =?utf8?q?=E3=82=B5=E3=83=9D=E3=83=BC=E3=83=88=E3=82=92=E6=89=93=E3=81=A1?= =?utf8?q?=E5=88=87=E3=82=8A=20/=20Finished=20support=20for=20NeXTSTEP=20O?= =?utf8?q?S?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/h-system.h | 10 ++-------- src/init.c | 39 --------------------------------------- src/util.c | 3 --- 3 files changed, 2 insertions(+), 50 deletions(-) diff --git a/src/h-system.h b/src/h-system.h index c416f1725..943bd23a2 100644 --- a/src/h-system.h +++ b/src/h-system.h @@ -24,19 +24,13 @@ #include #include #include - -#if defined(NeXT) -# include -#else # include -#endif /* NeXT */ #ifdef SET_UID # include -# if defined(Pyramid) || defined(NeXT) || \ - defined(NCR3K) || defined(ibm032) || \ +# if defined(Pyramid) || defined(NCR3K) || defined(ibm032) || \ defined(__osf__) || defined(ISC) || defined(linux) # include # endif @@ -59,7 +53,7 @@ # endif #endif -#if !defined(NeXT) && !defined(__MWERKS__) +#if !defined(__MWERKS__) # include #endif diff --git a/src/init.c b/src/init.c index 5ed1aa9de..7aa1f6163 100644 --- a/src/init.c +++ b/src/init.c @@ -190,45 +190,6 @@ void init_file_paths(char *path) /* Build a path name */ strcpy(tail, "xtra"); ANGBAND_DIR_XTRA = string_make(path); - - -#ifdef NeXT - - /* Allow "fat binary" usage with NeXT */ - if (TRUE) - { - concptr next = NULL; - -# if defined(m68k) - next = "m68k"; -# endif - -# if defined(i386) - next = "i386"; -# endif - -# if defined(sparc) - next = "sparc"; -# endif - -# if defined(hppa) - next = "hppa"; -# endif - - /* Use special directory */ - if (next) - { - /* Forget the old path name */ - string_free(ANGBAND_DIR_DATA); - - /* Build a new path name */ - sprintf(tail, "data-%s", next); - ANGBAND_DIR_DATA = string_make(path); - } - } - -#endif /* NeXT */ - } diff --git a/src/util.c b/src/util.c index 373e46ce7..c43e9075c 100644 --- a/src/util.c +++ b/src/util.c @@ -660,9 +660,6 @@ errr fd_chop(int fd, huge n) n = n ? n : 0; if (fd < 0) return -1; -#if defined(NeXT) - ftruncate(fd, n); -#endif return 0; } -- 2.11.0