Don't infringe on POSIX typedef namespace.

diff --git a/include/decl.h b/include/decl.h
index 387ebb83e65615d0d41b6df26efe88e6ba5aacb1..4b69f03f852f52895f7477968b78f98d22c293b8 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -675,7 +675,7 @@ struct _cmd_queue {
     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
@@ -732,7 +732,7 @@ struct instance_globals {
     coord clicklook_cc;
     winid en_win;
     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() */
 
     /* dbridge.c */
@@ -745,9 +745,9 @@ struct instance_globals {
     int hackpid; /* current process id */
     char chosen_windowtype[WINTYPELEN];
     int bases[MAXOCLASSES + 1];
-    cmdcount_t multi;
+    cmdcount_nht multi;
     char command_line[COLNO];
-    cmdcount_t command_count;
+    cmdcount_nht command_count;
     const char *multi_reason;
     char multireasonbuf[QBUFSZ]; /* note: smaller than usual [BUFSZ] */
     int nroom;

diff --git a/include/extern.h b/include/extern.h
index 88820e6b2f817c0c5f369e7cb80f496cab3f6876..1138db340a99dfac736caa8e7d3a5a4901f6e198 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -247,7 +247,7 @@ extern const char *cmdname_from_func(int(*)(void), char *, boolean);
 extern boolean redraw_cmd(char);
 extern const char *levltyp_to_name(int);
 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_key(char);
 extern struct _cmd_queue *cmdq_pop(void);
@@ -279,7 +279,7 @@ extern const char *directionname(int);
 extern int isok(int, int);
 extern int get_adjacent_loc(const char *, const char *, xchar, xchar, coord *);
 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
 extern void hangup(int);
 extern void end_of_input(void);

diff --git a/src/cmd.c b/src/cmd.c
index 75dfe442306caf2d850d021141f7bbe050a15875..b22d68fbd4bf9d635e46abaa5c429f5c00504068 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -214,7 +214,7 @@ reset_occupations(void)
  * function times out by its own means.
  */
 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) {
         g.occupation = timed_occupation;
@@ -4766,7 +4766,7 @@ get_count(
     char *allowchars,
     char inkey,
     long maxcount,
-    cmdcount_t *count,
+    cmdcount_nht *count,
     boolean historicmsg) /* whether to include in ^P history: True => yes */
 {
     char qbuf[QBUFSZ];