diff --git a/sys/amiga/amidos.c b/sys/amiga/amidos.c index 9de6a0810..47b793762 100644 --- a/sys/amiga/amidos.c +++ b/sys/amiga/amidos.c @@ -20,10 +20,8 @@ #undef COUNT -#if defined(__SASC_60) || defined(__GNUC__) #include #include -#endif /* POSIX stubs needed by libnix (-noixemul) */ #ifdef __noixemul__ @@ -85,11 +83,6 @@ free_nhuuid(void) } } -#ifdef AZTEC_50 -#include -#undef strcmpi -#endif - /* Prototypes */ #ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/amiwind.p" @@ -107,9 +100,7 @@ extern struct window_procs amii_procs; struct ami_sysflags sysflags = {0}; FILE *fopenp(const char *, const char *); -#ifndef __SASC_60 int Enable_Abort = 0; /* for stdio package */ -#endif /* Initial path, so we can find NetHack.cnf */ char PATH[PATHLEN] = "NetHack:"; diff --git a/sys/amiga/amigst.c b/sys/amiga/amigst.c index 8f6a74f64..6e6697111 100644 --- a/sys/amiga/amigst.c +++ b/sys/amiga/amigst.c @@ -17,25 +17,10 @@ #include #include -#ifdef __SASC -#include /* for __emit */ -#include -#include -#include -#include -#include -#include -#include -#endif - #include "hack.h" #include "winprocs.h" #include "winami.h" -#ifdef AZTEC -#include -#endif - #ifndef CROSS_TO_AMIGA #include "NH:sys/amiga/winami.p" #include "NH:sys/amiga/amiwind.p" diff --git a/sys/amiga/amirip.c b/sys/amiga/amirip.c index 5f4aa52af..6c23a4f6c 100644 --- a/sys/amiga/amirip.c +++ b/sys/amiga/amirip.c @@ -28,20 +28,10 @@ static struct RastPort *rp; #undef NULL #define NULL 0 -#ifdef AZTEC_C -#include -#else -#ifdef _DCC -#include -#include -#include -#include -#else #include #include #include #include -#endif static BitMapHeader tomb_bmhd; static struct BitMap *tombimg = NULL; @@ -58,14 +48,8 @@ static int xoff, yoff; /* image centering */ #undef red #undef green #undef blue -#ifdef _DCC -#include -#include -#else #include #include -#endif -#endif /* AZTEC_C */ static struct Window *ripwin = 0; static void tomb_text(char *); diff --git a/sys/amiga/amistack.c b/sys/amiga/amistack.c index 690bea07c..50abff355 100644 --- a/sys/amiga/amistack.c +++ b/sys/amiga/amistack.c @@ -2,30 +2,15 @@ /* Copyright (c) Janne Salmijärvi, Tampere, Finland, 2000 */ /* NetHack may be freely redistributed. See license for details. */ -/* - * Increase stack size to allow deep recursions. - * - * Note: This is SAS/C specific, using other compiler probably - * requires another method for increasing stack. - * - */ - -#ifdef __SASC_60 -#include -#endif - /* * Increase stack size to allow deep recursions. * NetHack 5.0 with Lua needs significantly more stack than 3.6. + * + * libnix needs __stkinit referenced to pull swapstack.o from libnix.a. */ -#ifdef __SASC_60 -long __stack = 256 * 1024; -#else -/* libnix needs __stkinit referenced to pull swapstack.o from libnix.a */ unsigned long __stack = 256 * 1024; #ifdef CROSS_TO_AMIGA extern void __stkinit(void); void *__nh_force_stkinit = __stkinit; #endif -#endif diff --git a/sys/amiga/amitty.c b/sys/amiga/amitty.c index 22036c8f5..e47f3b693 100644 --- a/sys/amiga/amitty.c +++ b/sys/amiga/amitty.c @@ -13,13 +13,6 @@ #include #include -#ifdef _DCC -#define getch() getchar() -#endif -#ifdef __SASC_60 -#include -#endif - void tty_change_color(void); char *tty_get_color_string(void); diff --git a/sys/amiga/amiwind.c b/sys/amiga/amiwind.c index d931697b7..beaf3cb89 100644 --- a/sys/amiga/amiwind.c +++ b/sys/amiga/amiwind.c @@ -711,7 +711,6 @@ amii_cleanup(void) void Abort(long rc) { - int fault = 1; #ifdef CHDIR extern char orgdir[]; chdir(orgdir); @@ -724,38 +723,11 @@ Abort(long rc) } else #endif printf("\n\nAbort with alert code %08lx...\n", rc); -/* Alert(rc); this is too severe */ -#ifdef __SASC -#ifdef INTUI_NEW_LOOK - if (IntuitionBase->LibNode.lib_Version >= 37) { - struct EasyStruct es = { - sizeof(struct EasyStruct), 0, "NetHack Panic Request", - "NetHack is Aborting with code == 0x%08lx", - "Continue Abort|Return to Program|Clean up and exit", - }; - fault = EasyRequest(NULL, &es, NULL, (long) rc); - if (fault == 2) - return; - } -#endif - if (fault == 1) { - /* __emit(0x4afc); */ /* illegal instruction */ - __emit(0x40fc); /* divide by */ - __emit(0x0000); /* #0 */ - /* NOTE: don't move amii_cleanup() above here - */ - /* it is too likely to kill the system */ - /* before it can get the SnapShot out, if */ - /* there is something really wrong. */ - } -#endif #ifdef AMII_GRAPHICS if (windowprocs.win_init_nhwindows == amii_procs.win_init_nhwindows) amii_cleanup(); #endif #undef exit -#ifdef AZTEC_C - _abort(); -#endif exit((int) rc); } diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c index e1276e986..c190a7c39 100644 --- a/sys/amiga/winami.c +++ b/sys/amiga/winami.c @@ -1161,17 +1161,7 @@ amii_display_file(const char *fn, boolean complain) if ((fp = dlb_fopen(fn, RDTMODE)) == (dlb *) NULL) { if (complain) { - sprintf(buf, "Can't display %s: %s", fn, -#if defined(_DCC) || defined(__GNUC__) - strerror(errno) -#else -#ifdef __SASC_60 - __sys_errlist[errno] -#else - sys_errlist[errno] -#endif -#endif - ); + sprintf(buf, "Can't display %s: %s", fn, strerror(errno)); amii_addtopl(buf); } return; diff --git a/sys/amiga/winchar.c b/sys/amiga/winchar.c index 7e17ea574..c2281c914 100644 --- a/sys/amiga/winchar.c +++ b/sys/amiga/winchar.c @@ -7,9 +7,7 @@ #include #include #include -#ifndef _DCC #include -#endif #ifdef TESTING #include "hack.h" diff --git a/sys/amiga/windefs.h b/sys/amiga/windefs.h index cb6cbd3db..617c095f1 100644 --- a/sys/amiga/windefs.h +++ b/sys/amiga/windefs.h @@ -5,9 +5,6 @@ #include #include #include -#if !defined(_DCC) && !defined(__GNUC__) -#include -#endif #include #include #include @@ -19,25 +16,10 @@ #include #include #include -/* stddef.h is included in the precompiled version of hack.h . If we include - * it here normally (through string.h) we'll get an "illegal typedef" later - * on. This is the easiest way I can think of to fix it without messing - * around with the rest of the #includes. --AMC - */ -#if defined(_DCC) && !defined(HACK_H) -#define ptrdiff_t ptrdiff_t_ -#define size_t size_t_ -#define wchar_t wchar_t_ -#endif #include #undef strcmpi #include #include -#if defined(_DCC) && !defined(HACK_H) -#undef ptrdiff_t -#undef size_t -#undef wchar_T -#endif #ifdef IDCMP_CLOSEWINDOW #ifndef INTUI_NEW_LOOK @@ -62,17 +44,6 @@ CLIPPING must be defined for the AMIGA version /*#define TOPL_GETLINE /* Don't use a window for getlin() */ /*#define WINDOW_YN /* Use a window for y/n questions */ -#ifdef AZTEC_C -#include -#else -#ifdef _DCC -#include -#include -#include -#include -#include -#include -#else #include #include #include @@ -80,28 +51,13 @@ CLIPPING must be defined for the AMIGA version #include #include #include -#endif /* kludge - see amirip for why */ #undef red #undef green #undef blue -#ifdef _DCC -#include -#else #include -#endif - -#ifdef _DCC -#define __asm /* DICE doesn't like __asm */ -#endif - -#ifdef _DCC -#include -#else #include -#endif -#endif #ifdef SHAREDLIB #include "NH:sys/amiga/lib/libmacs.h" diff --git a/sys/amiga/winfuncs.c b/sys/amiga/winfuncs.c index 788964b77..aec3939c7 100644 --- a/sys/amiga/winfuncs.c +++ b/sys/amiga/winfuncs.c @@ -252,7 +252,6 @@ struct FillParams { WORD offsety; }; -#ifdef __GNUC__ #ifdef __PPC__ void PPC_LayerFillHook(void); struct EmulLibEntry LayerFillHook = { TRAP_LIB, 0, @@ -281,16 +280,6 @@ void LayerFillHook_impl(struct Hook *hk, struct RastPort *rp, struct FillParams *fp) { -#endif -#else -void -#ifndef _DCC - __interrupt -#endif - __saveds __asm LayerFillHook(__a0 struct Hook *hk, - __a2 struct RastPort *rp, - __a1 struct FillParams *fp) -{ #endif long x, y, xmax, ymax; @@ -828,7 +817,6 @@ amii_create_nhwindow(int type) return (newid); } -#ifdef __GNUC__ #ifdef __PPC__ int PPC_SM_Filter(void); struct EmulLibEntry SM_Filter = { TRAP_LIB, 0, @@ -857,16 +845,6 @@ int SM_Filter_impl(struct Hook *hk, ULONG modeID, struct ScreenModeRequester *smr) { -#endif -#else -int -#ifndef _DCC - __interrupt -#endif - __saveds __asm SM_Filter( - __a0 struct Hook *hk, __a1 ULONG modeID, - __a2 struct ScreenModeRequester *smr) -{ #endif struct DimensionInfo dims; struct DisplayInfo disp;