Hi tech@,
Drop the conditional shrt macro definitions and use short everywhere.
Comments? OK?
Index: games/monop/houses.c
===================================================================
RCS file: /cvs/src/games/monop/houses.c,v
retrieving revision 1.10
diff -u -p -r1.10 houses.c
--- games/monop/houses.c 8 Jan 2016 18:20:33 -0000 1.10
+++ games/monop/houses.c 10 Jun 2017 21:22:54 -0000
@@ -110,7 +110,7 @@ buy_h(MON *mnp)
int i;
MON *mp;
int price;
- shrt input[3],temp[3];
+ short input[3],temp[3];
int tot, tot2;
PROP *pp;
int nhous, nhot;
@@ -245,7 +245,7 @@ sell_h(MON *mnp)
int i;
MON *mp;
int price;
- shrt input[3],temp[3];
+ short input[3],temp[3];
int tot;
PROP *pp;
Index: games/monop/monop.h
===================================================================
RCS file: /cvs/src/games/monop/monop.h,v
retrieving revision 1.8
diff -u -p -r1.8 monop.h
--- games/monop/monop.h 8 Jan 2016 18:19:47 -0000 1.8
+++ games/monop/monop.h 10 Jun 2017 21:22:54 -0000
@@ -32,11 +32,6 @@
* @(#)monop.h 8.1 (Berkeley) 5/31/93
*/
-#ifdef __CHAR_UNSIGNED__
-#define shrt short
-#else
-#define shrt char
-#endif
#define bool int8_t
#define TRUE (1)
@@ -72,8 +67,8 @@
struct sqr_st { /* structure for square
*/
char *name; /* place name */
- shrt owner; /* owner number */
- shrt type; /* place type */
+ short owner; /* owner number */
+ short type; /* place type */
struct prp_st *desc; /* description struct */
int cost; /* cost */
};
@@ -82,10 +77,10 @@ typedef struct sqr_st SQUARE;
struct mon_st { /* monopoly description structure
*/
char *name; /* monop. name (color) */
- shrt owner; /* owner of monopoly */
- shrt num_in; /* # in monopoly */
- shrt num_own; /* # owned (-1: not poss. monop)*/
- shrt h_cost; /* price of houses */
+ short owner; /* owner of monopoly */
+ short num_in; /* # in monopoly */
+ short num_own; /* # owned (-1: not poss. monop)*/
+ short h_cost; /* price of houses */
char *not_m; /* name if not monopoly */
char *mon_n; /* name if a monopoly */
char sqnums[3]; /* Square numbers (used to init)*/
@@ -101,8 +96,8 @@ typedef struct mon_st MON;
struct prp_st { /* property description structure
*/
bool morg; /* set if mortgaged */
bool monop; /* set if monopoly */
- shrt square; /* square description */
- shrt houses; /* number of houses */
+ short square; /* square description */
+ short houses; /* number of houses */
MON *mon_desc; /* name of color */
int rent[6]; /* rents */
};
@@ -116,11 +111,11 @@ typedef struct own_st OWN;
struct plr_st { /* player description structure
*/
char *name; /* owner name */
- shrt num_gojf; /* # of get-out-of-jail-free's */
- shrt num_rr; /* # of railroads owned */
- shrt num_util; /* # of water works/elec. co. */
- shrt loc; /* location on board */
- shrt in_jail; /* count of turns in jail */
+ short num_gojf; /* # of get-out-of-jail-free's */
+ short num_rr; /* # of railroads owned */
+ short num_util; /* # of water works/elec. co. */
+ short loc; /* location on board */
+ short in_jail; /* count of turns in jail */
int money; /* amount of money */
OWN *own_list; /* start of property list */
};
@@ -183,7 +178,7 @@ void printhold(int);
/* prop.c */
void buy(int, SQUARE *);
void add_list(int, OWN **, int);
-void del_list(int, OWN **, shrt);
+void del_list(int, OWN **, short);
void bid(void);
int prop_worth(PLAY *);
Index: games/monop/morg.c
===================================================================
RCS file: /cvs/src/games/monop/morg.c,v
retrieving revision 1.8
diff -u -p -r1.8 morg.c
--- games/monop/morg.c 8 Jan 2016 18:20:33 -0000 1.8
+++ games/monop/morg.c 10 Jun 2017 21:22:54 -0000
@@ -58,7 +58,7 @@ static char *names[MAX_PRP+2],
0
};
-static shrt square[MAX_PRP+2];
+static short square[MAX_PRP+2];
static int num_good, got_houses;
Index: games/monop/prop.c
===================================================================
RCS file: /cvs/src/games/monop/prop.c,v
retrieving revision 1.11
diff -u -p -r1.11 prop.c
--- games/monop/prop.c 8 Jan 2016 18:20:33 -0000 1.11
+++ games/monop/prop.c 10 Jun 2017 21:22:54 -0000
@@ -83,7 +83,7 @@ add_list(int plr, OWN **head, int op_sqr
* This routine deletes property from the list.
*/
void
-del_list(int plr, OWN **head, shrt op_sqr)
+del_list(int plr, OWN **head, short op_sqr)
{
OWN *op, *last_op;
