diff options
| -rw-r--r-- | src/files.cc | 2 | ||||
| -rw-r--r-- | src/h-config.h | 20 | ||||
| -rw-r--r-- | src/h-system.h | 2 | ||||
| -rw-r--r-- | src/h-type.h | 8 |
4 files changed, 6 insertions, 26 deletions
diff --git a/src/files.cc b/src/files.cc index ca4e15a6..919d71bd 100644 --- a/src/files.cc +++ b/src/files.cc @@ -4022,7 +4022,7 @@ void process_player_name(bool_ sf) #endif -#if defined(WINDOWS) || defined(MSDOS) +#if defined(WINDOWS) /* Hack -- max length */ if (k > 8) k = 8; diff --git a/src/h-config.h b/src/h-config.h index 3ebaa87f..220be370 100644 --- a/src/h-config.h +++ b/src/h-config.h @@ -122,15 +122,6 @@ extern "C" { #endif /* - * Extract the "MSDOS" flag from the compiler - */ -#ifdef __MSDOS__ -# ifndef MSDOS -# define MSDOS -# endif -#endif - -/* * Extract the "WINDOWS" flag from the compiler */ #if defined(_Windows) || defined(__WINDOWS__) || \ @@ -165,8 +156,7 @@ extern "C" { * Basically, SET_UID should *only* be set for "Unix" machines, * or for the "Atari" platform which is Unix-like, apparently */ -#if !defined(MACINTOSH) && !defined(WINDOWS) && \ - !defined(MSDOS) +#if !defined(MACINTOSH) && !defined(WINDOWS) # define SET_UID #endif @@ -205,10 +195,6 @@ extern "C" { # undef PATH_SEP # define PATH_SEP "\\" #endif -#if defined(MSDOS) || defined(OS2) -# undef PATH_SEP -# define PATH_SEP "\\" -#endif #ifdef __GO32__ # undef PATH_SEP # define PATH_SEP "/" @@ -218,7 +204,7 @@ extern "C" { /* * The Macintosh allows the use of a "file type" when creating a file */ -#if defined(MACINTOSH) && !defined(applec) || defined(MACH_O_CARBON) +#if defined(MACINTOSH) && !defined(applec) # define FILE_TYPE_TEXT 'TEXT' # define FILE_TYPE_DATA 'DATA' # define FILE_TYPE_SAVE 'SAVE' @@ -231,7 +217,7 @@ extern "C" { /* * OPTION: Hack -- Make sure "strchr()" and "strrchr()" will work */ -#if defined(SYS_III) || defined(SYS_V) || defined(MSDOS) +#if defined(SYS_III) || defined(SYS_V) # if !defined(__TURBOC__) && !defined(__WATCOMC__) # define strchr index # define strrchr rindex diff --git a/src/h-system.h b/src/h-system.h index 1c021a61..3c919099 100644 --- a/src/h-system.h +++ b/src/h-system.h @@ -47,7 +47,7 @@ # include <unix.h> #endif -#if defined(WINDOWS) || defined(MSDOS) +#if defined(WINDOWS) # include <io.h> #endif diff --git a/src/h-type.h b/src/h-type.h index 145d4729..bcf013bb 100644 --- a/src/h-type.h +++ b/src/h-type.h @@ -72,17 +72,11 @@ typedef int errr; #define uint uint_hack /* - * Hack -- prevent problems with MSDOS and WINDOWS + * Hack -- prevent problems with WINDOWS */ #undef huge #define huge huge_hack -/* - * Hack -- prevent problems with AMIGA - */ -#undef byte -#define byte byte_hack - /* Note that "signed char" is not always "defined" */ /* So always use "s16b" to hold small signed values */ /* A signed byte of memory */ |