Normalize long int and short int to just long and short.

include/prototypes.h

@@ -794,7 +794,7 @@ extern void do_fallout(register struct sctstr *, register int);
 extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);
 extern void produce_sect(int natnum, int etu, int *bp,
-			 long int (*p_sect)[2], int sector_type);
+			 long (*p_sect)[2], int sector_type);
 /* ship.c */
 extern int prod_ship(int, int, int *, int);
 extern int feed_ship(struct shpstr *, int, int *, int);

src/lib/commands/budg.c

@@ -52,14 +52,14 @@
 #include "budg.h"
 #include "commands.h"
 
-static void calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs,
+static void calc_all(long (*p_sect)[2], int *taxes, int *Ncivs,
 		     int *Nuws, int *bars, int *Nbars, int *mil,
 		     int *ships, int *sbuild, int *nsbuild, int *smaint,
 		     int *units, int *lbuild, int *nlbuild, int *lmaint,
 		     int *planes, int *pbuild, int *npbuild, int *pmaint);
 static int change_prio(struct natstr *np, char code, char *newval);
 static char *dotsprintf(char *buf, char *format, int data);
-static void prexpense(long int cash, int *expensesp, int priority, int amount);
+static void prexpense(long cash, int *expensesp, int priority, int amount);
 
 int
 budg(void)
@@ -418,7 +418,7 @@ dotsprintf(char *buf, char *format, int data)
 }
 
 static void
-prexpense(long int cash, int *expensesp, int priority, int amount)
+prexpense(long cash, int *expensesp, int priority, int amount)
 {
     if (cash > *expensesp) {
 	if (priority) {

src/lib/commands/desi.c

@@ -45,7 +45,7 @@
 #include "commands.h"
 
 static long do_desi(struct natstr *natp, char *sects, char *deschar,
-		    long int cash, int for_real);
+		    long cash, int for_real);
 
 int
 desi(void)
@@ -67,7 +67,7 @@ desi(void)
 }
 
 static long
-do_desi(struct natstr *natp, char *sects, char *deschar, long int cash,
+do_desi(struct natstr *natp, char *sects, char *deschar, long cash,
 	int for_real)
 {
     int n;

src/lib/lwp/sel.c

@@ -118,7 +118,7 @@ lwpWakeupFd(struct lwpProc *proc)
 }
 
 void
-lwpSleepUntil(long int until)
+lwpSleepUntil(long until)
 {
     lwpStatus(LwpCurrent, "sleeping for %ld sec", until - time(0));
     LwpCurrent->runtime = until;

src/lib/subs/chkmoney.c

@@ -38,7 +38,7 @@
 #include "prototypes.h"
 
 int
-chkmoney(long int cost, long int cash, char *argp)
+chkmoney(long cost, long cash, char *argp)
 {
     char buf[1024];
     char *p;
@@ -57,7 +57,7 @@ chkmoney(long int cost, long int cash, char *argp)
 }
 
 int
-check_cost(int looping, int cost, long int cash, int *warnedp,
+check_cost(int looping, int cost, long cash, int *warnedp,
 	   char *argp)
 {
     char buf[1024];

src/lib/subs/lostsub.c

@@ -45,7 +45,7 @@
 static int findlost(char, natid, short, coord, coord, int);
 
 void
-makelost(char type, natid owner, short int id, coord x, coord y)
+makelost(char type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -70,7 +70,7 @@ makelost(char type, natid owner, short int id, coord x, coord y)
 }
 
 void
-makenotlost(char type, natid owner, short int id, coord x, coord y)
+makenotlost(char type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -93,7 +93,7 @@ makenotlost(char type, natid owner, short int id, coord x, coord y)
  * Else return -1.
  */
 static int
-findlost(char type, natid owner, short int id, coord x, coord y, int free)
+findlost(char type, natid owner, short id, coord x, coord y, int free)
 {
     struct loststr lost;
     int n;

src/lib/subs/mission.c

@@ -847,7 +847,7 @@ nameofitem(struct genitem *gp, int type)
 }
 
 char *
-mission_name(short int mission)
+mission_name(short mission)
 {
     switch (mission) {
     case MI_INTERDICT:

src/lib/update/main.c

@@ -61,7 +61,7 @@ long tpops[MAXNOC];
 
 int update_pending = 0;
 
-static void do_prod(int, int, int, int *, long int (*)[2], int *, int *,
+static void do_prod(int, int, int, int *, long (*)[2], int *, int *,
 		    int *, int *, int *, int *);
 
 /*ARGSUSED*/
@@ -210,7 +210,7 @@ update_main(void *unused)
 }
 
 static void
-do_prod(int sector_type, int etu, int n, int *bp, long int (*p_sect)[2],
+do_prod(int sector_type, int etu, int n, int *bp, long (*p_sect)[2],
 	int *ship_build, int *ship_maint, int *plane_build,
 	int *plane_maint, int *land_build, int *land_maint)
 {

src/lib/update/sect.c

@@ -270,7 +270,7 @@ decay_fallout(struct sctstr *sp, int etus)
  *
  */
 void
-produce_sect(int natnum, int etu, int *bp, long int (*p_sect)[2],
+produce_sect(int natnum, int etu, int *bp, long (*p_sect)[2],
 	     int sector_type)
 {
     struct sctstr *sp;