Reformat .h files.
I did my best to exempt some of the bigger aligned blocks from the reformatting using the /* clang-format off */ and /* clang-format on */ tags. Probably some that shouldn't have been formatted were anyway; if you encounter them, please fix. The clang-format tags were left in on the basis that it's much easier to prune those out later than to put them back in, and it means that, modulo my custom version of clang-format, I should be able to run clang-format on the source tree again without changing anything, now that Pat has fixed the VA_DECL issues.
This commit is contained in:
Sean Hunt
@@ -20,73 +20,73 @@
|
||||
*/
|
||||
|
||||
/* 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" */
|
||||
#define SYSV /* define for System V, Solaris 2.x, newer versions */
|
||||
/* of Linux */
|
||||
/* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
|
||||
/* use SYSV for < v6.5 */
|
||||
|
||||
/* #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" */
|
||||
#define SYSV /* define for System V, Solaris 2.x, newer versions */
|
||||
/* of Linux */
|
||||
/* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
|
||||
/* use SYSV for < v6.5 */
|
||||
|
||||
/* 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 LINUX */ /* Another Unix clone */
|
||||
/* #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 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 LINUX */ /* Another Unix clone */
|
||||
/* #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
|
||||
* Solaris 2+), HPUX, and Linux systems. In
|
||||
* particular, it should NOT be defined for the UNIXPC
|
||||
* unless you remove the use of the shared library in
|
||||
* the Makefile */
|
||||
#define TEXTCOLOR /* Use System V r3.2 terminfo color support */
|
||||
/* and/or ANSI color support on termcap systems */
|
||||
/* and/or X11 color */
|
||||
#define POSIX_JOB_CONTROL /* use System V / Solaris 2.x / POSIX job control */
|
||||
/* (e.g., VSUSP) */
|
||||
#define POSIX_TYPES /* use POSIX types for system calls and termios */
|
||||
/* Define for many recent OS releases, including
|
||||
* those with specific defines (since types are
|
||||
* changing toward the standard from earlier chaos).
|
||||
* For example, platforms using the GNU libraries,
|
||||
* Linux, Solaris 2.x
|
||||
*/
|
||||
#define TERMINFO /* uses terminfo rather than termcap */
|
||||
/* Should be defined for most SYSV, SVR4 (including
|
||||
* Solaris 2+), HPUX, and Linux systems. In
|
||||
* particular, it should NOT be defined for the UNIXPC
|
||||
* unless you remove the use of the shared library in
|
||||
* the Makefile */
|
||||
#define TEXTCOLOR /* Use System V r3.2 terminfo color support */
|
||||
/* and/or ANSI color support on termcap systems */
|
||||
/* and/or X11 color */
|
||||
#define POSIX_JOB_CONTROL /* use System V / Solaris 2.x / POSIX job control \
|
||||
*/
|
||||
/* (e.g., VSUSP) */
|
||||
#define POSIX_TYPES /* use POSIX types for system calls and termios */
|
||||
/* Define for many recent OS releases, including
|
||||
* those with specific defines (since types are
|
||||
* changing toward the standard from earlier chaos).
|
||||
* For example, platforms using the GNU libraries,
|
||||
* Linux, Solaris 2.x
|
||||
*/
|
||||
|
||||
/* #define OPENWINBUG */ /* avoid a problem using OpenWindows 3.0 for
|
||||
X11 on SunOS 4.1.x, x>= 2. Do not define
|
||||
for other X11 implementations. */
|
||||
/* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */
|
||||
/* #define BSD_43_BUG */ /* for real 4.3BSD cc's without schain botch fix */
|
||||
/* #define MICROPORT_BUG */ /* problems with large arrays in structs */
|
||||
/* #define OPENWINBUG */ /* avoid a problem using OpenWindows 3.0 for
|
||||
X11 on SunOS 4.1.x, x>= 2. Do not define
|
||||
for other X11 implementations. */
|
||||
/* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */
|
||||
/* #define BSD_43_BUG */ /* for real 4.3BSD cc's without schain botch fix */
|
||||
/* #define MICROPORT_BUG */ /* problems with large arrays in structs */
|
||||
/* #define MICROPORT_286_BUG */ /* changes needed in termcap.c to get it to
|
||||
run with Microport Sys V/AT version 2.4.
|
||||
By Jay Maynard */
|
||||
/* #define AIXPS_2BUG */ /* avoid a problem with little_to_big() optimization */
|
||||
run with Microport Sys V/AT version 2.4.
|
||||
By Jay Maynard */
|
||||
/* #define AIXPS_2BUG */ /* avoid a problem with little_to_big() optimization
|
||||
*/
|
||||
|
||||
/* #define RANDOM */ /* if neither random/srandom nor lrand48/srand48
|
||||
is available from your system */
|
||||
/* #define RANDOM */ /* if neither random/srandom nor lrand48/srand48
|
||||
is available from your system */
|
||||
|
||||
/* see sys/unix/snd86unx.shr for more information on these */
|
||||
/* #define UNIX386MUSIC */ /* play real music through speaker on systems
|
||||
with music driver installed */
|
||||
/* #define VPIX_MUSIC */ /* play real music through speaker on systems
|
||||
with built-in VPIX support */
|
||||
|
||||
/* #define UNIX386MUSIC */ /* play real music through speaker on systems
|
||||
with music driver installed */
|
||||
/* #define VPIX_MUSIC */ /* play real music through speaker on systems
|
||||
with built-in VPIX support */
|
||||
|
||||
/*
|
||||
* The next two defines are intended mainly for the Andrew File System,
|
||||
@@ -96,8 +96,8 @@
|
||||
* Ralf Brown, 7/26/89 (from v2.3 hack of 10/10/88)
|
||||
*/
|
||||
|
||||
/* #define NO_FILE_LINKS */ /* if no hard links */
|
||||
/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */
|
||||
/* #define NO_FILE_LINKS */ /* if no hard links */
|
||||
/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */
|
||||
|
||||
/*
|
||||
* If you want the static parts of your playground on a read-only file
|
||||
@@ -105,7 +105,6 @@
|
||||
*/
|
||||
/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
|
||||
|
||||
|
||||
/*
|
||||
* Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
|
||||
* If defined, it can be overridden by the environment variable PAGER.
|
||||
@@ -114,8 +113,6 @@
|
||||
* #define DEF_PAGER ".../mydir/mypager"
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Define PORT_HELP to be the name of the port-specfic help file.
|
||||
* This file is found in HACKDIR.
|
||||
@@ -133,7 +130,7 @@
|
||||
* "extra output" method is used, but not all systems provide access to
|
||||
* a fine-grained timer.
|
||||
*/
|
||||
/* #define TIMED_DELAY */ /* usleep() */
|
||||
/* #define TIMED_DELAY */ /* usleep() */
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -144,7 +141,7 @@
|
||||
* A stat system call is done on the mailbox every MAILCKFREQ moves.
|
||||
*/
|
||||
#if !defined(NOMAIL)
|
||||
#define MAIL /* Deliver mail during the game */
|
||||
#define MAIL /* Deliver mail during the game */
|
||||
#endif
|
||||
|
||||
/* The Andrew Message System does mail a little differently from normal
|
||||
@@ -157,7 +154,7 @@
|
||||
* dl2n+@andrew.cmu.edu (dec 19 1989)
|
||||
*/
|
||||
|
||||
/* #define AMS */ /* use Andrew message system for mail */
|
||||
/* #define AMS */ /* use Andrew message system for mail */
|
||||
|
||||
/* NO_MAILREADER is for kerberos authenticating filesystems where it is
|
||||
* essentially impossible to securely exec child processes, like mail
|
||||
@@ -166,45 +163,44 @@
|
||||
* dan
|
||||
*/
|
||||
|
||||
/* #define NO_MAILREADER */ /* have mail daemon just tell player of mail */
|
||||
/* #define NO_MAILREADER */ /* have mail daemon just tell player of mail */
|
||||
|
||||
#ifdef MAIL
|
||||
# if defined(BSD) || defined(ULTRIX)
|
||||
# ifdef AMS
|
||||
#define AMS_MAILBOX "/Mailbox"
|
||||
# else
|
||||
# if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#define DEF_MAILREADER "/usr/bin/mail"
|
||||
# else
|
||||
#define DEF_MAILREADER "/usr/ucb/Mail"
|
||||
# endif
|
||||
# endif
|
||||
#ifdef MAIL
|
||||
#if defined(BSD) || defined(ULTRIX)
|
||||
#ifdef AMS
|
||||
#define AMS_MAILBOX "/Mailbox"
|
||||
#else
|
||||
# if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
|
||||
# if defined(M_XENIX)
|
||||
#define DEF_MAILREADER "/usr/bin/mail"
|
||||
# else
|
||||
# ifdef __sgi
|
||||
#define DEF_MAILREADER "/usr/sbin/Mail"
|
||||
# else
|
||||
#define DEF_MAILREADER "/usr/bin/mailx"
|
||||
# endif
|
||||
# endif
|
||||
# else
|
||||
#define DEF_MAILREADER "/bin/mail"
|
||||
# endif
|
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#define DEF_MAILREADER "/usr/bin/mail"
|
||||
#else
|
||||
#define DEF_MAILREADER "/usr/ucb/Mail"
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
|
||||
#if defined(M_XENIX)
|
||||
#define DEF_MAILREADER "/usr/bin/mail"
|
||||
#else
|
||||
#ifdef __sgi
|
||||
#define DEF_MAILREADER "/usr/sbin/Mail"
|
||||
#else
|
||||
#define DEF_MAILREADER "/usr/bin/mailx"
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#define DEF_MAILREADER "/bin/mail"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define MAILCKFREQ 50
|
||||
#endif /* MAIL */
|
||||
#define MAILCKFREQ 50
|
||||
#endif /* MAIL */
|
||||
|
||||
/*
|
||||
* Some terminals or terminal emulators send two character sequence "ESC c"
|
||||
* when Alt+c is pressed. The altmeta run-time option allows the user to
|
||||
* request that "ESC c" be treated as M-c.
|
||||
*/
|
||||
#define ALTMETA /* support altmeta run-time option */
|
||||
|
||||
#define ALTMETA /* support altmeta run-time option */
|
||||
|
||||
#ifdef COMPRESS
|
||||
/* Some implementations of compress need a 'quiet' option.
|
||||
@@ -215,13 +211,13 @@
|
||||
/* #define COMPRESS_OPTIONS "-q" */
|
||||
#endif
|
||||
|
||||
#define FCMASK 0660 /* file creation mask */
|
||||
#define FCMASK 0660 /* file creation mask */
|
||||
|
||||
/* fcntl(2) is a POSIX-portable call for manipulating file descriptors.
|
||||
* Comment out the USE_FCNTL if for some reason you have a strange
|
||||
* OS/filesystem combination for which fcntl(2) does not work. */
|
||||
#ifdef POSIX_TYPES
|
||||
# define USE_FCNTL
|
||||
#define USE_FCNTL
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -229,21 +225,21 @@
|
||||
*/
|
||||
|
||||
#ifdef _AUX_SOURCE
|
||||
# ifdef AUX /* gcc ? */
|
||||
# define _SYSV_SOURCE
|
||||
# define _BSD_SOURCE
|
||||
#ifdef AUX /* gcc ? */
|
||||
#define _SYSV_SOURCE
|
||||
#define _BSD_SOURCE
|
||||
#else
|
||||
# define AUX
|
||||
# endif
|
||||
#define AUX
|
||||
#endif
|
||||
#endif /* _AUX_SOURCE */
|
||||
|
||||
#if defined(LINUX) || defined(bsdi)
|
||||
# ifndef POSIX_TYPES
|
||||
# define POSIX_TYPES
|
||||
# endif
|
||||
# ifndef POSIX_JOB_CONTROL
|
||||
# define POSIX_JOB_CONTROL
|
||||
# endif
|
||||
#ifndef POSIX_TYPES
|
||||
#define POSIX_TYPES
|
||||
#endif
|
||||
#ifndef POSIX_JOB_CONTROL
|
||||
#define POSIX_JOB_CONTROL
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -258,16 +254,16 @@
|
||||
* various recent SYSV versions (with possibly tweaks to unixtty.c again).
|
||||
*/
|
||||
#ifndef POSIX_JOB_CONTROL
|
||||
# if defined(BSD) || defined(ULTRIX) || defined(HPUX) || defined(AIX_31)
|
||||
# define BSD_JOB_CONTROL
|
||||
# else
|
||||
# if defined(SVR4)
|
||||
# define POSIX_JOB_CONTROL
|
||||
# endif
|
||||
# endif
|
||||
#if defined(BSD) || defined(ULTRIX) || defined(HPUX) || defined(AIX_31)
|
||||
#define BSD_JOB_CONTROL
|
||||
#else
|
||||
#if defined(SVR4)
|
||||
#define POSIX_JOB_CONTROL
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#if defined(BSD_JOB_CONTROL) || defined(POSIX_JOB_CONTROL) || defined(AUX)
|
||||
#define SUSPEND /* let ^Z suspend the game */
|
||||
#define SUSPEND /* let ^Z suspend the game */
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -278,19 +274,18 @@
|
||||
*/
|
||||
#define SAFERHANGUP
|
||||
|
||||
|
||||
#if defined(BSD) || defined(ULTRIX)
|
||||
#include <sys/time.h>
|
||||
#else
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
#define HLOCK "perm" /* an empty file used for locking purposes */
|
||||
#define HLOCK "perm" /* an empty file used for locking purposes */
|
||||
|
||||
#define tgetch getchar
|
||||
|
||||
#ifndef NOSHELL
|
||||
# define SHELL /* do not delete the '!' command */
|
||||
#define SHELL /* do not delete the '!' command */
|
||||
#endif
|
||||
|
||||
#include "system.h"
|
||||
@@ -300,73 +295,75 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(POSIX_TYPES) || defined(__GNUC__) || defined(BSD) || defined(ULTRIX)
|
||||
#if defined(POSIX_TYPES) || defined(__GNUC__) || defined(BSD) \
|
||||
|| defined(ULTRIX)
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
|
||||
#if defined(BSD) || defined(ULTRIX)
|
||||
# if !defined(DGUX) && !defined(SUNOS4)
|
||||
#define memcpy(d, s, n) bcopy(s, d, n)
|
||||
#define memcmp(s1, s2, n) bcmp(s2, s1, n)
|
||||
# endif
|
||||
# ifdef SUNOS4
|
||||
#if !defined(DGUX) && !defined(SUNOS4)
|
||||
#define memcpy(d, s, n) bcopy(s, d, n)
|
||||
#define memcmp(s1, s2, n) bcmp(s2, s1, n)
|
||||
#endif
|
||||
#ifdef SUNOS4
|
||||
#include <memory.h>
|
||||
# endif
|
||||
#else /* therefore SYSV */
|
||||
# ifndef index /* some systems seem to do this for you */
|
||||
#define index strchr
|
||||
# endif
|
||||
# ifndef rindex
|
||||
#define rindex strrchr
|
||||
# endif
|
||||
#endif
|
||||
#else /* therefore SYSV */
|
||||
#ifndef index /* some systems seem to do this for you */
|
||||
#define index strchr
|
||||
#endif
|
||||
#ifndef rindex
|
||||
#define rindex strrchr
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) || defined(RANDOM) || defined(__APPLE__)
|
||||
#define Rand() random()
|
||||
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|
||||
|| defined(RANDOM) || defined(__APPLE__)
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() lrand48()
|
||||
#define Rand() lrand48()
|
||||
#endif
|
||||
|
||||
#ifdef TIMED_DELAY
|
||||
# if defined(SUNOS4) || defined(LINUX) || (defined(BSD) && !defined(ULTRIX))
|
||||
# define msleep(k) usleep((k)*1000)
|
||||
# endif
|
||||
# ifdef ULTRIX
|
||||
# define msleep(k) napms(k)
|
||||
# endif
|
||||
#if defined(SUNOS4) || defined(LINUX) || (defined(BSD) && !defined(ULTRIX))
|
||||
#define msleep(k) usleep((k) *1000)
|
||||
#endif
|
||||
#ifdef ULTRIX
|
||||
#define msleep(k) napms(k)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef hc /* older versions of the MetaWare High-C compiler define this */
|
||||
# ifdef __HC__
|
||||
# undef __HC__
|
||||
# endif
|
||||
# define __HC__ hc
|
||||
# undef hc
|
||||
#ifdef hc /* older versions of the MetaWare High-C compiler define this */
|
||||
#ifdef __HC__
|
||||
#undef __HC__
|
||||
#endif
|
||||
#define __HC__ hc
|
||||
#undef hc
|
||||
#endif
|
||||
|
||||
#if defined(GNOME_GRAPHICS)
|
||||
#if defined(LINUX)
|
||||
# include <linux/unistd.h>
|
||||
# if defined(__NR_getresuid) && defined(__NR_getresgid) /* ie., >= v2.1.44 */
|
||||
# define GETRES_SUPPORT
|
||||
# endif
|
||||
#include <linux/unistd.h>
|
||||
#if defined(__NR_getresuid) && defined(__NR_getresgid) /* ie., >= v2.1.44 */
|
||||
#define GETRES_SUPPORT
|
||||
#endif
|
||||
#else
|
||||
# if defined(BSD) || defined(SVR4)
|
||||
#if defined(BSD) || defined(SVR4)
|
||||
/*
|
||||
* [ALI] We assume that SVR4 means we can safely include syscall.h
|
||||
* (although it's really a BSDism). This is certainly true for Solaris 2.5,
|
||||
* Solaris 7, Solaris 8 and Compaq Tru64 5.1
|
||||
* Later BSD systems will have the getresid system calls.
|
||||
*/
|
||||
# include <sys/syscall.h>
|
||||
# if (defined (SYS_getuid) || defined(SYS_getresuid)) && \
|
||||
(defined(SYS_getgid) || defined(SYS_getresgid))
|
||||
# define GETRES_SUPPORT
|
||||
# endif
|
||||
# endif /* BSD || SVR4 */
|
||||
#include <sys/syscall.h>
|
||||
#if (defined(SYS_getuid) || defined(SYS_getresuid)) \
|
||||
&& (defined(SYS_getgid) || defined(SYS_getresgid))
|
||||
#define GETRES_SUPPORT
|
||||
#endif
|
||||
#endif /* BSD || SVR4 */
|
||||
#endif /* LINUX */
|
||||
#endif /* GNOME_GRAPHICS */
|
||||
#endif /* GNOME_GRAPHICS */
|
||||
|
||||
#endif /* UNIXCONF_H */
|
||||
#endif /* UNIX */
|
||||
|
||||
Reference in New Issue
Block a user