nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Don't infringe on POSIX typedef namespace.

Browse Source
This commit is contained in:
nhkeni
2022-03-16 21:31:26 -04:00
parent 3e4ea0a2c3
commit 1e31fee0df
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/decl.h
View File

@@ -675,7 +675,7 @@ struct _cmd_queue {
struct _cmd_queue *next; struct _cmd_queue *next;
}; };
typedef long cmdcount_t; /* Command counts */ typedef long cmdcount_nht; /* Command counts */
/* /*
* 'g' -- instance_globals holds engine state that does not need to be * 'g' -- instance_globals holds engine state that does not need to be
@@ -732,7 +732,7 @@ struct instance_globals {
coord clicklook_cc; coord clicklook_cc;
winid en_win; winid en_win;
boolean en_via_menu; boolean en_via_menu;
cmdcount_t last_command_count; cmdcount_nht last_command_count;
struct ext_func_tab *ext_tlist; /* info for rhack() from doextcmd() */ struct ext_func_tab *ext_tlist; /* info for rhack() from doextcmd() */
/* dbridge.c */ /* dbridge.c */
@@ -745,9 +745,9 @@ struct instance_globals {
int hackpid; /* current process id */ int hackpid; /* current process id */
char chosen_windowtype[WINTYPELEN]; char chosen_windowtype[WINTYPELEN];
int bases[MAXOCLASSES + 1]; int bases[MAXOCLASSES + 1];
cmdcount_t multi; cmdcount_nht multi;
char command_line[COLNO]; char command_line[COLNO];
cmdcount_t command_count; cmdcount_nht command_count;
const char *multi_reason; const char *multi_reason;
char multireasonbuf[QBUFSZ]; /* note: smaller than usual [BUFSZ] */ char multireasonbuf[QBUFSZ]; /* note: smaller than usual [BUFSZ] */
int nroom; int nroom;

4
include/extern.h
View File

@@ -247,7 +247,7 @@ extern const char *cmdname_from_func(int(*)(void), char *, boolean);
extern boolean redraw_cmd(char); extern boolean redraw_cmd(char);
extern const char *levltyp_to_name(int); extern const char *levltyp_to_name(int);
extern void reset_occupations(void); extern void reset_occupations(void);
extern void set_occupation(int(*)(void), const char *, cmdcount_t); extern void set_occupation(int(*)(void), const char *, cmdcount_nht);
extern void cmdq_add_ec(int(*)(void)); extern void cmdq_add_ec(int(*)(void));
extern void cmdq_add_key(char); extern void cmdq_add_key(char);
extern struct _cmd_queue *cmdq_pop(void); extern struct _cmd_queue *cmdq_pop(void);
@@ -279,7 +279,7 @@ extern const char *directionname(int);
extern int isok(int, int); extern int isok(int, int);
extern int get_adjacent_loc(const char *, const char *, xchar, xchar, coord *); extern int get_adjacent_loc(const char *, const char *, xchar, xchar, coord *);
extern const char *click_to_cmd(int, int, int); extern const char *click_to_cmd(int, int, int);
extern char get_count(char *, char, long, cmdcount_t *, boolean); extern char get_count(char *, char, long, cmdcount_nht *, boolean);
#ifdef HANGUPHANDLING #ifdef HANGUPHANDLING
extern void hangup(int); extern void hangup(int);
extern void end_of_input(void); extern void end_of_input(void);

4
src/cmd.c
View File

@@ -214,7 +214,7 @@ reset_occupations(void)
* function times out by its own means. * function times out by its own means.
*/ */
void void
set_occupation(int (*fn)(void), const char *txt, cmdcount_t xtime) set_occupation(int (*fn)(void), const char *txt, cmdcount_nht xtime)
{ {
if (xtime) { if (xtime) {
g.occupation = timed_occupation; g.occupation = timed_occupation;
@@ -4766,7 +4766,7 @@ get_count(
char *allowchars, char *allowchars,
char inkey, char inkey,
long maxcount, long maxcount,
cmdcount_t *count, cmdcount_nht *count,
boolean historicmsg) /* whether to include in ^P history: True => yes */ boolean historicmsg) /* whether to include in ^P history: True => yes */
{ {
char qbuf[QBUFSZ]; char qbuf[QBUFSZ];