Use 'short int' rather than 'short', and similarly for 'long', 'unsigned', etc.

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index b75912891375fb8e2d63d65011ac25797aa9eaa2..2c6c45a54c016401368cf14cf5187ecdfa2fb593 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
 /* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -94,7 +94,7 @@
 | Numbering states.  |
 `-------------------*/
 
-typedef short state_number;
+typedef short int state_number;
 # define STATE_NUMBER_MAXIMUM SHRT_MAX
 
 /* Be ready to map a state_number to an int.  */
@@ -113,7 +113,7 @@ typedef struct state state;
 
 typedef struct
 {
-  short num;
+  short int num;
   state *states[1];
 } transitions;
 
@@ -171,7 +171,7 @@ struct state *transitions_to (transitions *shifts, symbol_number sym);
 
 typedef struct
 {
-  short num;
+  short int num;
   symbol *symbols[1];
 } errs;
 
@@ -184,7 +184,7 @@ errs *errs_new (int num, symbol **tokens);
 
 typedef struct
 {
-  short num;
+  short int num;
   bitset *lookaheads;
   rule *rules[1];
 } reductions;
@@ -212,7 +212,7 @@ struct state
 
   /* Its items.  Must be last, since ITEMS can be arbitrarily large.
      */
-  unsigned short nitems;
+  unsigned short int nitems;
   item_number items[1];
 };