summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2012-06-28 08:18:38 +0200
committerBardur Arantsson <bardur@scientician.net>2012-06-28 08:18:38 +0200
commit046525fb26733df2e87928a48d2e23914174f5ac (patch)
treea24dd1c580fa8699fa0f69f6164975f9c0d2b54c
parent3b0a9bcf376ab893751991199aea5888932accc5 (diff)
Remove NeXT conditional code
-rw-r--r--src/h-system.h10
-rw-r--r--src/init2.c38
2 files changed, 3 insertions, 45 deletions
diff --git a/src/h-system.h b/src/h-system.h
index 50cc0af8..c1b17e1f 100644
--- a/src/h-system.h
+++ b/src/h-system.h
@@ -18,18 +18,14 @@
#include <ctype.h>
#include <errno.h>
-#if defined(NeXT)
-# include <libc.h>
-#else
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#ifdef SET_UID
# include <sys/types.h>
-# if defined(Pyramid) || defined(NeXT) || defined(SUNOS) || \
+# if defined(Pyramid) || defined(SUNOS) || \
defined(NCR3K) || defined(SUNOS) || defined(ibm032) || \
defined(__osf__) || defined(ISC) || defined(SGI) || \
defined(linux)
@@ -65,7 +61,7 @@
#endif
-#if !defined(NeXT) && !defined(__MWERKS__)
+#if !defined(__MWERKS__)
# include <fcntl.h>
#endif
diff --git a/src/init2.c b/src/init2.c
index 977e6d1a..9c1c2afa 100644
--- a/src/init2.c
+++ b/src/init2.c
@@ -198,44 +198,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)
- {
- cptr 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 */
-
}