mirror of
https://codeberg.org/noisytoot/notnotdnethack.git
synced 2025-04-04 15:40:43 +01:00
Drop support for SCO UNIX, A/UX, IRIX, and no signed/void/const
Also clean up some extra whitespace caused by coan2.
This commit is contained in:
parent
31411a8d66
commit
8fad6a1255
GPG key ID:
1D43EF4F4492268B
8 changed files with 7 additions and 240 deletions
include
src
sys
win/tty
|
|
@ -5,11 +5,6 @@
|
|||
#ifndef TRADSTDC_H
|
||||
#define TRADSTDC_H
|
||||
|
||||
|
||||
#ifdef NOVOID
|
||||
#define void int
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Borland C provides enough ANSI C compatibility in its Borland C++
|
||||
* mode to warrant this. But it does not set __STDC__ unless it compiles
|
||||
|
|
@ -20,7 +15,6 @@
|
|||
#define NHSTDC
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* ANSI X3J11 detection.
|
||||
* Makes substitutes for compatibility with the old C standard.
|
||||
|
|
@ -81,12 +75,6 @@ void foo VA_DECL(int, arg) --macro expansion has a hidden opening brace
|
|||
/* generic pointer, always a macro; genericptr_t is usually a typedef */
|
||||
# define genericptr void *
|
||||
|
||||
# if !defined(NHSTDC)
|
||||
# define const
|
||||
# define signed
|
||||
# define volatile
|
||||
# endif
|
||||
|
||||
/*
|
||||
* Suppress `const' if necessary and not handled elsewhere.
|
||||
* Don't use `#if defined(xxx) && !defined(const)'
|
||||
|
|
@ -122,7 +110,6 @@ void foo VA_DECL(int, arg) --macro expansion has a hidden opening brace
|
|||
typedef genericptr genericptr_t; /* (void *) or (char *) */
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* According to ANSI, prototypes for old-style declarations must widen the
|
||||
* arguments to int. However, the MSDOS compilers accept shorter arguments
|
||||
|
|
@ -132,44 +119,12 @@ typedef genericptr genericptr_t; /* (void *) or (char *) */
|
|||
* prototypes to match the standard and thus lose the typechecking.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UNWIDENED_PROTOTYPES
|
||||
# if defined(NHSTDC)
|
||||
# define WIDENED_PROTOTYPES
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/* The problem below is still the case through 4.0.5F, but the suggested
|
||||
* compiler flags in the Makefiles suppress the nasty messages, so we don't
|
||||
* need to be quite so drastic.
|
||||
*/
|
||||
#if defined(__sgi) && !defined(__GNUC__)
|
||||
/*
|
||||
* As of IRIX 4.0.1, /bin/cc claims to be an ANSI compiler, but it thinks
|
||||
* it's impossible for a prototype to match an old-style definition with
|
||||
* unwidened argument types. Thus, we have to turn off all NetHack
|
||||
* prototypes, and avoid declaring several system functions, since the system
|
||||
* include files have prototypes and the compiler also complains that
|
||||
* prototyped and unprototyped declarations don't match.
|
||||
*/
|
||||
# undef NDECL
|
||||
# undef FDECL
|
||||
# undef VDECL
|
||||
# define NDECL(f) f()
|
||||
# define FDECL(f,p) f()
|
||||
# define VDECL(f,p) f()
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/* MetaWare High-C defaults to unsigned chars */
|
||||
/* AIX 3.2 needs this also */
|
||||
#if defined(__HC__)
|
||||
# undef signed
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Allow gcc2 to check parameters of printf-like calls with -Wformat;
|
||||
* append this to a prototype declaration (see pline() in extern.h).
|
||||
|
|
|
|||
|
|
@ -6,45 +6,11 @@
|
|||
#ifndef UNIXCONF_H
|
||||
#define UNIXCONF_H
|
||||
|
||||
/*
|
||||
* Some include files are in a different place under SYSV
|
||||
* BSD SYSV
|
||||
* <sys/time.h> <time.h>
|
||||
* <sgtty.h> <termio.h>
|
||||
*
|
||||
* Some routines are called differently
|
||||
* index strchr
|
||||
* rindex strrchr
|
||||
*
|
||||
*/
|
||||
|
||||
/* define exactly one of the following four choices */
|
||||
/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
|
||||
/* also for relatives like SunOS 4.x, DG/UX, and */
|
||||
/* older versions of Linux */
|
||||
/* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
|
||||
/* Use BSD for < v3.0 */
|
||||
/* "ULTRIX" not to be confused with "ultrix" */
|
||||
/* of Linux */
|
||||
/* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
|
||||
/* use SYSV for < v6.5 */
|
||||
|
||||
/*#define FUZZER_TIMEOUT 60*/
|
||||
|
||||
/* define any of the following that are appropriate */
|
||||
/*#define SVR4*/ /* use in addition to SYSV for System V Release 4 */
|
||||
/* including Solaris 2+ */
|
||||
#define NETWORK /* if running on a networked system */
|
||||
/* e.g. Suns sharing a playground through NFS */
|
||||
/* #define SUNOS4 */ /* SunOS 4.x */
|
||||
/* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
|
||||
/* #define GENIX */ /* Yet Another Unix Clone */
|
||||
/* #define HISX */ /* Bull Unix for XPS Machines */
|
||||
/* #define BOS */ /* Bull Open Software - Unix for DPX/2 Machines */
|
||||
/* #define UNIXPC */ /* use in addition to SYSV for AT&T 7300/3B1 */
|
||||
/* #define AIX_31 */ /* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
|
||||
* job control (note that AIX is SYSV otherwise)
|
||||
* Also define this for AIX 3.2 */
|
||||
|
||||
#define TERMINFO /* uses terminfo rather than termcap */
|
||||
/* Should be defined for most SYSV, SVR4 (including
|
||||
|
|
@ -168,15 +134,6 @@
|
|||
* The remainder of the file should not need to be changed.
|
||||
*/
|
||||
|
||||
#ifdef _AUX_SOURCE
|
||||
# ifdef AUX /* gcc ? */
|
||||
# define _SYSV_SOURCE
|
||||
# define _BSD_SOURCE
|
||||
#else
|
||||
# define AUX
|
||||
# endif
|
||||
#endif /* _AUX_SOURCE */
|
||||
|
||||
# ifndef POSIX_JOB_CONTROL
|
||||
# define POSIX_JOB_CONTROL
|
||||
# endif
|
||||
|
|
@ -192,13 +149,10 @@
|
|||
* equivalent for NetHack's purposes. POSIX_JOB_CONTROL should work on
|
||||
* various recent SYSV versions (with possibly tweaks to unixtty.c again).
|
||||
*/
|
||||
#ifndef POSIX_JOB_CONTROL
|
||||
#endif
|
||||
#if defined(BSD_JOB_CONTROL) || defined(POSIX_JOB_CONTROL) || defined(AUX)
|
||||
#if defined(BSD_JOB_CONTROL) || defined(POSIX_JOB_CONTROL)
|
||||
/*#define SUSPEND*/ /* let ^Z suspend the game */
|
||||
#endif
|
||||
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#define HLOCK "perm" /* an empty file used for locking purposes */
|
||||
|
|
@ -214,12 +168,12 @@
|
|||
|
||||
#include <sys/wait.h>
|
||||
|
||||
# ifndef index /* some systems seem to do this for you */
|
||||
#define index strchr
|
||||
# endif
|
||||
# ifndef rindex
|
||||
#define rindex strrchr
|
||||
# endif
|
||||
#ifndef index /* some systems seem to do this for you */
|
||||
# define index strchr
|
||||
#endif
|
||||
#ifndef rindex
|
||||
# define rindex strrchr
|
||||
#endif
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
#define Rand() random()
|
||||
|
|
@ -228,14 +182,5 @@
|
|||
# define msleep(k) usleep((k)*1000)
|
||||
#endif
|
||||
|
||||
#ifdef hc /* older versions of the MetaWare High-C compiler define this */
|
||||
# ifdef __HC__
|
||||
# undef __HC__
|
||||
# endif
|
||||
# define __HC__ hc
|
||||
# undef hc
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* UNIXCONF_H */
|
||||
#endif /* UNIX */
|
||||
|
|
|
|||
|
|
@ -52,10 +52,8 @@ int mustgetmail = -1;
|
|||
#include <sys/stat.h>
|
||||
#include <pwd.h>
|
||||
/* DON'T trust all Unices to declare getpwuid() in <pwd.h> */
|
||||
# if !defined(__sgi) && !defined(_M_UNIX)
|
||||
/* DO trust all SVR4 to typedef uid_t in <sys/types.h> (probably to a long) */
|
||||
extern struct passwd *FDECL(getpwuid,(uid_t));
|
||||
# endif
|
||||
static struct stat omstat,nmstat;
|
||||
static char *mailbox = (char *)0;
|
||||
static long laststattime;
|
||||
|
|
|
|||
|
|
@ -22,25 +22,11 @@ struct termios termio;
|
|||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef _M_UNIX
|
||||
extern void NDECL(sco_mapon);
|
||||
extern void NDECL(sco_mapoff);
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
extern void NDECL(linux_mapon);
|
||||
extern void NDECL(linux_mapoff);
|
||||
#endif
|
||||
|
||||
#ifdef AUX
|
||||
void
|
||||
catch_stp()
|
||||
{
|
||||
signal(SIGTSTP, SIG_DFL);
|
||||
dosuspend();
|
||||
}
|
||||
#endif /* AUX */
|
||||
|
||||
void
|
||||
getwindowsz()
|
||||
{
|
||||
|
|
@ -74,9 +60,6 @@ getioctls()
|
|||
(void) tcgetattr(fileno(stdin), &termio);
|
||||
#endif
|
||||
getwindowsz();
|
||||
#ifdef AUX
|
||||
( void ) signal ( SIGTSTP , catch_stp ) ;
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -96,21 +79,11 @@ dosuspend()
|
|||
# ifdef SIGTSTP
|
||||
if(signal(SIGTSTP, SIG_IGN) == SIG_DFL) {
|
||||
suspend_nhwindows((char *)0);
|
||||
# ifdef _M_UNIX
|
||||
sco_mapon();
|
||||
# endif
|
||||
# ifdef __linux__
|
||||
linux_mapon();
|
||||
# endif
|
||||
(void) signal(SIGTSTP, SIG_DFL);
|
||||
# ifdef AUX
|
||||
( void ) kill ( 0 , SIGSTOP ) ;
|
||||
# else
|
||||
(void) kill(0, SIGTSTP);
|
||||
# endif
|
||||
# ifdef _M_UNIX
|
||||
sco_mapoff();
|
||||
# endif
|
||||
# ifdef __linux__
|
||||
linux_mapoff();
|
||||
# endif
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
*/
|
||||
# define USG
|
||||
|
||||
|
||||
# include <termios.h>
|
||||
# include <unistd.h>
|
||||
# define termstruct termios
|
||||
|
|
@ -222,75 +221,6 @@ introff() /* disable kbd interrupts if required*/
|
|||
#endif
|
||||
}
|
||||
|
||||
#ifdef _M_UNIX /* SCO UNIX (3.2.4), from Andreas Arens */
|
||||
# include <sys/console.h>
|
||||
|
||||
# define BSIZE (E_TABSZ*2)
|
||||
# define LDIOC ('D'<<8) /* POSIX prevents definition */
|
||||
|
||||
# include <sys/emap.h>
|
||||
|
||||
int sco_flag_console = 0;
|
||||
int sco_map_valid = -1;
|
||||
unsigned char sco_chanmap_buf[BSIZE];
|
||||
|
||||
void NDECL(sco_mapon);
|
||||
void NDECL(sco_mapoff);
|
||||
void NDECL(check_sco_console);
|
||||
void NDECL(init_sco_cons);
|
||||
|
||||
void
|
||||
sco_mapon()
|
||||
{
|
||||
# ifdef TTY_GRAPHICS
|
||||
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
|
||||
if (sco_map_valid != -1) {
|
||||
ioctl(0,LDSMAP,sco_chanmap_buf);
|
||||
}
|
||||
sco_map_valid = -1;
|
||||
}
|
||||
# endif
|
||||
}
|
||||
|
||||
void
|
||||
sco_mapoff()
|
||||
{
|
||||
# ifdef TTY_GRAPHICS
|
||||
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
|
||||
sco_map_valid = ioctl(0,LDGMAP,sco_chanmap_buf);
|
||||
if (sco_map_valid != -1) {
|
||||
ioctl(0,LDNMAP,(char *)0);
|
||||
}
|
||||
}
|
||||
# endif
|
||||
}
|
||||
|
||||
void
|
||||
check_sco_console()
|
||||
{
|
||||
if (isatty(0) && ioctl(0,CONS_GET,0) != -1) {
|
||||
sco_flag_console = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
init_sco_cons()
|
||||
{
|
||||
# ifdef TTY_GRAPHICS
|
||||
if (!strcmp(windowprocs.name, "tty") && sco_flag_console) {
|
||||
atexit(sco_mapon);
|
||||
sco_mapoff();
|
||||
switch_graphics(IBM_GRAPHICS);
|
||||
# ifdef TEXTCOLOR
|
||||
if (has_colors())
|
||||
iflags.use_color = TRUE;
|
||||
# endif
|
||||
}
|
||||
# endif
|
||||
}
|
||||
#endif /* _M_UNIX */
|
||||
|
||||
|
||||
#ifdef __linux__ /* via Jesse Thilo and Ben Gertzfield */
|
||||
# include <sys/vt.h>
|
||||
|
||||
|
|
@ -347,7 +277,6 @@ init_linux_cons()
|
|||
}
|
||||
#endif /* __linux__ */
|
||||
|
||||
|
||||
#ifndef __begui__ /* the Be GUI will define its own error proc */
|
||||
/* fatal error */
|
||||
/*VARARGS1*/
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#if !defined(__sgi) && !defined(_M_UNIX)
|
||||
extern struct passwd *FDECL(getpwuid,(uid_t));
|
||||
#endif
|
||||
extern struct passwd *FDECL(getpwnam,(const char *));
|
||||
static void FDECL(chdirx, (const char *,BOOLEAN_P));
|
||||
static boolean NDECL(whoami);
|
||||
|
|
@ -25,10 +23,6 @@ static void NDECL(init_fuzzer_child);
|
|||
#endif
|
||||
static void FDECL(process_options, (int, char **));
|
||||
|
||||
#ifdef _M_UNIX
|
||||
extern void NDECL(check_sco_console);
|
||||
extern void NDECL(init_sco_cons);
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
extern void NDECL(check_linux_console);
|
||||
extern void NDECL(init_linux_cons);
|
||||
|
|
@ -140,9 +134,6 @@ char *argv[];
|
|||
*/
|
||||
chdirx(dir,1);
|
||||
|
||||
#ifdef _M_UNIX
|
||||
check_sco_console();
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
check_linux_console();
|
||||
#endif
|
||||
|
|
@ -153,9 +144,6 @@ char *argv[];
|
|||
initoptions();
|
||||
init_nhwindows(&argc,argv);
|
||||
exact_username = whoami();
|
||||
#ifdef _M_UNIX
|
||||
init_sco_cons();
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
init_linux_cons();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@
|
|||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
|
||||
#ifdef _M_UNIX
|
||||
extern void NDECL(sco_mapon);
|
||||
extern void NDECL(sco_mapoff);
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
extern void NDECL(linux_mapon);
|
||||
extern void NDECL(linux_mapoff);
|
||||
|
|
@ -261,9 +257,6 @@ int wt;
|
|||
{
|
||||
register int f;
|
||||
suspend_nhwindows((char *)0); /* also calls end_screen() */
|
||||
#ifdef _M_UNIX
|
||||
sco_mapon();
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
linux_mapon();
|
||||
#endif
|
||||
|
|
@ -281,9 +274,6 @@ int wt;
|
|||
(void) signal(SIGINT,SIG_IGN);
|
||||
(void) signal(SIGQUIT,SIG_IGN);
|
||||
(void) wait( (int *) 0);
|
||||
#ifdef _M_UNIX
|
||||
sco_mapoff();
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
linux_mapoff();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -661,7 +661,6 @@ cl_eos(void) /* free after Robert Viduya */
|
|||
|
||||
|
||||
# ifndef COLOR_BLACK /* trust include file */
|
||||
# ifndef _M_UNIX /* guess BGR */
|
||||
#define COLOR_BLACK 0
|
||||
#define COLOR_BLUE 1
|
||||
#define COLOR_GREEN 2
|
||||
|
|
@ -670,16 +669,6 @@ cl_eos(void) /* free after Robert Viduya */
|
|||
#define COLOR_MAGENTA 5
|
||||
#define COLOR_YELLOW 6
|
||||
#define COLOR_WHITE 7
|
||||
# else /* guess RGB */
|
||||
#define COLOR_BLACK 0
|
||||
#define COLOR_RED 1
|
||||
#define COLOR_GREEN 2
|
||||
#define COLOR_YELLOW 3
|
||||
#define COLOR_BLUE 4
|
||||
#define COLOR_MAGENTA 5
|
||||
#define COLOR_CYAN 6
|
||||
#define COLOR_WHITE 7
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* Mapping data for the six terminfo colors that resolve to pairs of nethack
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue