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
193
include/ntconf.h
193
include/ntconf.h
@@ -9,68 +9,75 @@
|
||||
|
||||
/* #define SHELL /* nt use of pcsys routines caused a hang */
|
||||
|
||||
#define RANDOM /* have Berkeley random(3) */
|
||||
#define TEXTCOLOR /* Color text */
|
||||
#define RANDOM /* have Berkeley random(3) */
|
||||
#define TEXTCOLOR /* Color text */
|
||||
|
||||
#define EXEPATH /* Allow .exe location to be used as HACKDIR */
|
||||
#define TRADITIONAL_GLYPHMAP /* Store glyph mappings at level change time */
|
||||
#define EXEPATH /* Allow .exe location to be used as HACKDIR */
|
||||
#define TRADITIONAL_GLYPHMAP /* Store glyph mappings at level change time */
|
||||
|
||||
#define LAN_FEATURES /* Include code for lan-aware features. Untested in 3.4.0*/
|
||||
#define LAN_FEATURES /* Include code for lan-aware features. Untested in \
|
||||
3.4.0*/
|
||||
|
||||
#define PC_LOCKING /* Prevent overwrites of aborted or in-progress games */
|
||||
/* without first receiving confirmation. */
|
||||
#define PC_LOCKING /* Prevent overwrites of aborted or in-progress games */
|
||||
/* without first receiving confirmation. */
|
||||
|
||||
#define HOLD_LOCKFILE_OPEN /* Keep an exclusive lock on the .0 file */
|
||||
#define HOLD_LOCKFILE_OPEN /* Keep an exclusive lock on the .0 file */
|
||||
|
||||
#define SELF_RECOVER /* Allow the game itself to recover from an aborted game */
|
||||
#define SELF_RECOVER /* Allow the game itself to recover from an aborted \
|
||||
game */
|
||||
|
||||
#define SYSCF /* Use a global configuration */
|
||||
#define SYSCF_FILE "sysconf" /* Use a file to hold the SYSCF configuration */
|
||||
#define SYSCF /* Use a global configuration */
|
||||
#define SYSCF_FILE "sysconf" /* Use a file to hold the SYSCF configuration \
|
||||
*/
|
||||
|
||||
#define USER_SOUNDS
|
||||
|
||||
/*#define CHANGE_COLOR*/ /* allow palette changes */
|
||||
#define SELECTSAVED /* Provide menu of saved games to choose from at start */
|
||||
/*#define CHANGE_COLOR*/ /* allow palette changes */
|
||||
#define SELECTSAVED /* Provide menu of saved games to choose from at start \
|
||||
*/
|
||||
|
||||
/*
|
||||
* -----------------------------------------------------------------
|
||||
* The remaining code shouldn't need modification.
|
||||
* -----------------------------------------------------------------
|
||||
*/
|
||||
/* #define SHORT_FILENAMES /* All NT filesystems support long names now */
|
||||
/* #define SHORT_FILENAMES /* All NT filesystems support long names now
|
||||
*/
|
||||
|
||||
#ifdef MICRO
|
||||
#undef MICRO /* never define this! */
|
||||
#undef MICRO /* never define this! */
|
||||
#endif
|
||||
|
||||
#define NOCWD_ASSUMPTIONS /* Always define this. There are assumptions that
|
||||
it is defined for WIN32.
|
||||
Allow paths to be specified for HACKDIR,
|
||||
LEVELDIR, SAVEDIR, BONESDIR, DATADIR,
|
||||
SCOREDIR, LOCKDIR, CONFIGDIR, and TROUBLEDIR */
|
||||
#define NOCWD_ASSUMPTIONS /* Always define this. There are assumptions that \
|
||||
it is defined for WIN32. \
|
||||
Allow paths to be specified for HACKDIR, \
|
||||
LEVELDIR, SAVEDIR, BONESDIR, DATADIR, \
|
||||
SCOREDIR, LOCKDIR, CONFIGDIR, and TROUBLEDIR */
|
||||
#define NO_TERMS
|
||||
#define ASCIIGRAPH
|
||||
|
||||
#ifdef OPTIONS_USED
|
||||
#undef OPTIONS_USED
|
||||
#endif
|
||||
#define OPTIONS_USED "options"
|
||||
#define OPTIONS_USED "options"
|
||||
#define OPTIONS_FILE OPTIONS_USED
|
||||
|
||||
#define PORT_HELP "porthelp"
|
||||
#define PORT_HELP "porthelp"
|
||||
|
||||
#define PORT_DEBUG /* include ability to debug international keyboard issues */
|
||||
#define PORT_DEBUG /* include ability to debug international keyboard issues \
|
||||
*/
|
||||
|
||||
#define SAFERHANGUP /* Define SAFERHANGUP to delay hangup processing
|
||||
* until the main command loop. 'safer' because it
|
||||
* avoids certain cheats and also avoids losing
|
||||
* objects being thrown when the hangup occurs.
|
||||
*/
|
||||
#define SAFERHANGUP /* Define SAFERHANGUP to delay hangup processing \
|
||||
* until the main command loop. 'safer' because it \
|
||||
* avoids certain cheats and also avoids losing \
|
||||
* objects being thrown when the hangup occurs. \
|
||||
*/
|
||||
|
||||
/* Stuff to help the user with some common, yet significant errors */
|
||||
#define INTERJECT_PANIC 0
|
||||
#define INTERJECTION_TYPES (INTERJECT_PANIC + 1)
|
||||
extern void FDECL(interject_assistance, (int,int,genericptr_t,genericptr_t));
|
||||
#define INTERJECT_PANIC 0
|
||||
#define INTERJECTION_TYPES (INTERJECT_PANIC + 1)
|
||||
extern void FDECL(interject_assistance,
|
||||
(int, int, genericptr_t, genericptr_t));
|
||||
extern void FDECL(interject, (int));
|
||||
|
||||
/*
|
||||
@@ -79,52 +86,54 @@ extern void FDECL(interject, (int));
|
||||
*===============================================
|
||||
*/
|
||||
#ifdef _MSC_VER
|
||||
# if (_MSC_VER > 1000)
|
||||
#if (_MSC_VER > 1000)
|
||||
/* Visual C 8 warning elimination */
|
||||
# ifndef _CRT_SECURE_NO_DEPRECATE
|
||||
#ifndef _CRT_SECURE_NO_DEPRECATE
|
||||
#define _CRT_SECURE_NO_DEPRECATE
|
||||
# endif
|
||||
# ifndef _SCL_SECURE_NO_DEPRECATE
|
||||
#endif
|
||||
#ifndef _SCL_SECURE_NO_DEPRECATE
|
||||
#define _SCL_SECURE_NO_DEPRECATE
|
||||
# endif
|
||||
# ifndef _CRT_NONSTDC_NO_DEPRECATE
|
||||
#endif
|
||||
#ifndef _CRT_NONSTDC_NO_DEPRECATE
|
||||
#define _CRT_NONSTDC_NO_DEPRECATE
|
||||
# endif
|
||||
#pragma warning(disable:4996) /* VC8 deprecation warnings */
|
||||
#pragma warning(disable:4142) /* benign redefinition */
|
||||
#pragma warning(disable:4267) /* conversion from 'size_t' to XX */
|
||||
# if (_MSC_VER > 1600)
|
||||
#pragma warning(disable:4459) /* hide global declaration */
|
||||
# endif /* _MSC_VER > 1600 */
|
||||
# endif /* _MSC_VER > 1000 */
|
||||
#pragma warning(disable:4761) /* integral size mismatch in arg; conv supp*/
|
||||
# ifdef YYPREFIX
|
||||
#pragma warning(disable:4102) /* unreferenced label */
|
||||
# endif
|
||||
# if 0
|
||||
#pragma warning(disable:4018) /* signed/unsigned mismatch */
|
||||
#pragma warning(disable:4305) /* init, conv from 'const int' to 'char' */
|
||||
# endif
|
||||
#endif
|
||||
#pragma warning(disable : 4996) /* VC8 deprecation warnings */
|
||||
#pragma warning(disable : 4142) /* benign redefinition */
|
||||
#pragma warning(disable : 4267) /* conversion from 'size_t' to XX */
|
||||
#if (_MSC_VER > 1600)
|
||||
#pragma warning(disable : 4459) /* hide global declaration */
|
||||
#endif /* _MSC_VER > 1600 */
|
||||
#endif /* _MSC_VER > 1000 */
|
||||
#pragma warning(disable : 4761) /* integral size mismatch in arg; conv \
|
||||
supp*/
|
||||
#ifdef YYPREFIX
|
||||
#pragma warning(disable : 4102) /* unreferenced label */
|
||||
#endif
|
||||
#if 0
|
||||
#pragma warning(disable : 4018) /* signed/unsigned mismatch */
|
||||
#pragma warning(disable : 4305) /* init, conv from 'const int' to 'char' */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define RUNTIME_PORT_ID /* trigger run-time port identification for
|
||||
* identification of exe CPU architecture
|
||||
*/
|
||||
#define RUNTIME_PORT_ID /* trigger run-time port identification for \
|
||||
* identification of exe CPU architecture \
|
||||
*/
|
||||
|
||||
/* The following is needed for prototypes of certain functions */
|
||||
#if defined(_MSC_VER)
|
||||
#include <process.h> /* Provides prototypes of exit(), spawn() */
|
||||
#include <process.h> /* Provides prototypes of exit(), spawn() */
|
||||
#endif
|
||||
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#include <string.h> /* Provides prototypes of strncmpi(), etc. */
|
||||
#ifdef STRNCMPI
|
||||
#define strncmpi(a,b,c) strnicmp(a,b,c)
|
||||
#define strncmpi(a, b, c) strnicmp(a, b, c)
|
||||
#endif
|
||||
|
||||
/* Visual Studio defines this in their own headers, which we don't use */
|
||||
#ifndef snprintf
|
||||
#define snprintf _snprintf
|
||||
#pragma warning(disable:4996) /* deprecation warning suggesting snprintf_s */
|
||||
#pragma warning( \
|
||||
disable : 4996) /* deprecation warning suggesting snprintf_s */
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -135,21 +144,21 @@ extern void FDECL(interject, (int));
|
||||
#undef random
|
||||
#endif
|
||||
|
||||
#define PATHLEN BUFSZ /* maximum pathlength */
|
||||
#define FILENAME BUFSZ /* maximum filename length (conservative) */
|
||||
#define PATHLEN BUFSZ /* maximum pathlength */
|
||||
#define FILENAME BUFSZ /* maximum filename length (conservative) */
|
||||
|
||||
#if defined(_MAX_PATH) && defined(_MAX_FNAME)
|
||||
# if (_MAX_PATH < BUFSZ) && (_MAX_FNAME < BUFSZ)
|
||||
#if (_MAX_PATH < BUFSZ) && (_MAX_FNAME < BUFSZ)
|
||||
#undef PATHLEN
|
||||
#undef FILENAME
|
||||
#define PATHLEN _MAX_PATH
|
||||
#define FILENAME _MAX_FNAME
|
||||
# endif
|
||||
#define PATHLEN _MAX_PATH
|
||||
#define FILENAME _MAX_FNAME
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define NO_SIGNAL
|
||||
#define index strchr
|
||||
#define rindex strrchr
|
||||
#define index strchr
|
||||
#define rindex strrchr
|
||||
|
||||
/* Time stuff */
|
||||
#include <time.h>
|
||||
@@ -157,27 +166,27 @@ extern void FDECL(interject, (int));
|
||||
#define USE_STDARG
|
||||
#ifdef RANDOM
|
||||
/* Use the high quality random number routines. */
|
||||
#define Rand() random()
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
|
||||
#include <sys/stat.h>
|
||||
#define FCMASK (_S_IREAD|_S_IWRITE) /* file creation mask */
|
||||
#define regularize nt_regularize
|
||||
#define FCMASK (_S_IREAD | _S_IWRITE) /* file creation mask */
|
||||
#define regularize nt_regularize
|
||||
#define HLOCK "NHPERM"
|
||||
|
||||
#ifndef M
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
#define M(c) ((char) (0x80 | (c)))
|
||||
/* #define M(c) ((c) - 128) */
|
||||
#endif
|
||||
|
||||
#ifndef C
|
||||
#define C(c) (0x1f & (c))
|
||||
#define C(c) (0x1f & (c))
|
||||
#endif
|
||||
|
||||
#if defined(DLB)
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
#define FILENAME_CMP stricmp /* case insensitive */
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
@@ -189,7 +198,7 @@ extern const char *alllevels, *allbones;
|
||||
extern char hackdir[];
|
||||
#define ABORT C('a')
|
||||
#define getuid() 1
|
||||
#define getlogin() ((char *)0)
|
||||
#define getlogin() ((char *) 0)
|
||||
extern void NDECL(win32_abort);
|
||||
extern void FDECL(nttty_preference_update, (const char *));
|
||||
extern void NDECL(toggle_mouse_support);
|
||||
@@ -202,20 +211,22 @@ extern void NDECL(raw_clear_screen);
|
||||
#include <io.h>
|
||||
#include <direct.h>
|
||||
#else
|
||||
int _RTLENTRY _EXPFUNC access (const char _FAR *__path, int __amode);
|
||||
int _RTLENTRY _EXPFUNC _chdrive(int __drive);
|
||||
int _RTLENTRYF _EXPFUNC32 chdir( const char _FAR *__path );
|
||||
char _FAR * _RTLENTRY _EXPFUNC getcwd( char _FAR *__buf, int __buflen );
|
||||
int _RTLENTRY _EXPFUNC write (int __handle, const void _FAR *__buf, unsigned __len);
|
||||
int _RTLENTRY _EXPFUNC creat (const char _FAR *__path, int __amode);
|
||||
int _RTLENTRY _EXPFUNC close (int __handle);
|
||||
int _RTLENTRY _EXPFUNC _close (int __handle);
|
||||
int _RTLENTRY _EXPFUNC open (const char _FAR *__path, int __access,... /*unsigned mode*/);
|
||||
long _RTLENTRY _EXPFUNC lseek (int __handle, long __offset, int __fromwhere);
|
||||
int _RTLENTRY _EXPFUNC read (int __handle, void _FAR *__buf, unsigned __len);
|
||||
int _RTLENTRY _EXPFUNC access(const char _FAR *__path, int __amode);
|
||||
int _RTLENTRY _EXPFUNC _chdrive(int __drive);
|
||||
int _RTLENTRYF _EXPFUNC32 chdir(const char _FAR *__path);
|
||||
char _FAR *_RTLENTRY _EXPFUNC getcwd(char _FAR *__buf, int __buflen);
|
||||
int _RTLENTRY _EXPFUNC
|
||||
write(int __handle, const void _FAR *__buf, unsigned __len);
|
||||
int _RTLENTRY _EXPFUNC creat(const char _FAR *__path, int __amode);
|
||||
int _RTLENTRY _EXPFUNC close(int __handle);
|
||||
int _RTLENTRY _EXPFUNC _close(int __handle);
|
||||
int _RTLENTRY _EXPFUNC
|
||||
open(const char _FAR *__path, int __access, ... /*unsigned mode*/);
|
||||
long _RTLENTRY _EXPFUNC lseek(int __handle, long __offset, int __fromwhere);
|
||||
int _RTLENTRY _EXPFUNC read(int __handle, void _FAR *__buf, unsigned __len);
|
||||
#endif
|
||||
#include <conio.h>
|
||||
#undef kbhit /* Use our special NT kbhit */
|
||||
#undef kbhit /* Use our special NT kbhit */
|
||||
#define kbhit (*nt_kbhit)
|
||||
|
||||
#ifdef LAN_FEATURES
|
||||
@@ -223,13 +234,13 @@ int _RTLENTRY _EXPFUNC read (int __handle, void _FAR *__buf, unsigned __len);
|
||||
#endif
|
||||
|
||||
#ifndef alloca
|
||||
#define ALLOCA_HACK /* used in util/panic.c */
|
||||
#define ALLOCA_HACK /* used in util/panic.c */
|
||||
#endif
|
||||
|
||||
extern int FDECL(set_win32_option, (const char *, const char *));
|
||||
#define LEFTBUTTON FROM_LEFT_1ST_BUTTON_PRESSED
|
||||
#define LEFTBUTTON FROM_LEFT_1ST_BUTTON_PRESSED
|
||||
#define RIGHTBUTTON RIGHTMOST_BUTTON_PRESSED
|
||||
#define MIDBUTTON FROM_LEFT_2ND_BUTTON_PRESSED
|
||||
#define MIDBUTTON FROM_LEFT_2ND_BUTTON_PRESSED
|
||||
#define MOUSEMASK (LEFTBUTTON | RIGHTBUTTON | MIDBUTTON)
|
||||
#ifdef CHANGE_COLOR
|
||||
extern int FDECL(alternative_palette, (char *));
|
||||
|
||||
Reference in New Issue
Block a user