diff options
author | Bardur Arantsson <bardur@scientician.net> | 2014-12-16 08:03:10 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-16 08:03:10 +0100 |
commit | 1317b79a18d283e5a953005cb4a57b600dedadc0 (patch) | |
tree | e26755772ec30a716d78150f1aa36c9639796b0e /src/h-config.h | |
parent | 63dc88888692fbeddb4c0a2ec99af3cd708276eb (diff) |
Remove lots of obsolete platform defines
Diffstat (limited to 'src/h-config.h')
-rw-r--r-- | src/h-config.h | 124 |
1 files changed, 2 insertions, 122 deletions
diff --git a/src/h-config.h b/src/h-config.h index 66fa5c1b..6babdff9 100644 --- a/src/h-config.h +++ b/src/h-config.h @@ -33,93 +33,6 @@ extern "C" { /* #define WINDOWS */ #endif -/* - * OPTION: Compile on a SYS III version of UNIX - */ -#ifndef SYS_III -/* #define SYS_III */ -#endif - -/* - * OPTION: Compile on a SYS V version of UNIX (not Solaris) - */ -#ifndef SYS_V -/* #define SYS_V */ -#endif - -/* - * OPTION: Compile on a HPUX version of UNIX - */ -#ifndef HPUX -/* #define HPUX */ -#endif - -/* - * OPTION: Compile on an SGI running IRIX - */ -#ifndef SGI -/* #define SGI */ -#endif - -/* - * OPTION: Compile on a SunOS machine - */ -#ifndef SUNOS -/* #define SUNOS */ -#endif - -/* - * OPTION: Compile on a Solaris machine - */ -#ifndef SOLARIS -/* #define SOLARIS */ -#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. - */ -#ifndef ULTRIX -/* #define ULTRIX */ -#endif - - - -/* - * Extract the "SUNOS" flag from the compiler - */ -#if defined(sun) -# ifndef SUNOS -# define SUNOS -# endif -#endif - -/* - * Extract the "ULTRIX" flag from the compiler - */ -#if defined(ultrix) || defined(Pyramid) -# ifndef ULTRIX -# define ULTRIX -# endif -#endif - -/* - * Extract the "ATARI" flag from the compiler [cjh] - */ -#if defined(__atarist) || defined(__atarist__) -# ifndef ATARI -# define ATARI -# endif -#endif - -/* - * Extract the "SGI" flag from the compiler - */ -#ifdef sgi -# ifndef SGI -# define SGI -# endif -#endif /* * Extract the "WINDOWS" flag from the compiler @@ -139,7 +52,7 @@ extern "C" { * The only such platform that angband is ported to is currently * DEC Alpha AXP running OSF/1 (OpenVMS uses 32-bit longs). */ -#if defined(__alpha) && defined(__osf__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__ia64) || defined(__ia64__) || defined(__mips64) || defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || defined(__64BIT__) || defined(__sparc64__) || defined(__LP64__) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__ia64) || defined(__ia64__) || defined(__mips64) || defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || defined(__64BIT__) || defined(__sparc64__) || defined(__LP64__) # define L64 #endif @@ -152,9 +65,7 @@ extern "C" { * and of the "umask()" call for various reasons, and to guess if * the "kill()" function is available, and for permission to use * functions to extract user names and expand "tildes" in filenames. - * It is also used for "locking" and "unlocking" the score file. - * Basically, SET_UID should *only* be set for "Unix" machines, - * or for the "Atari" platform which is Unix-like, apparently + * Basically, SET_UID should *only* be set for "Unix" machines. */ #if !defined(MACINTOSH) && !defined(WINDOWS) # define SET_UID @@ -162,23 +73,6 @@ extern "C" { /* - * 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(SYS_III) || defined(SYS_V) || defined(SOLARIS) || \ - defined(HPUX) || defined(SGI) || defined(ATARI) -# 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 @@ -215,17 +109,6 @@ extern "C" { /* - * OPTION: Hack -- Make sure "strchr()" and "strrchr()" will work - */ -#if defined(SYS_III) || defined(SYS_V) -# if !defined(__TURBOC__) && !defined(__WATCOMC__) -# define strchr index -# define strrchr rindex -# endif -#endif - - -/* * OPTION: Define "HAS_STRICMP" only if "stricmp()" exists. * Note that "stricmp()" is not actually used by Angband. */ @@ -248,10 +131,7 @@ extern "C" { * Note that this is only relevant for "SET_UID" machines */ #ifdef SET_UID -# if !defined(HPUX) && !defined(ULTRIX) && !defined(SOLARIS) && \ - !defined(SGI) && !defined(ISC) # define HAS_USLEEP -# endif #endif #ifdef __cplusplus |