Use standard AUTHORS section header. From YOMURA Masanori in private mail

[bsdgames-darwin.git] / sail / extern.h

diff --git a/sail/extern.h b/sail/extern.h
index a7b683573e878c26bb8ea45f39106dbe689798cb..f22884061185f788ddadb0bff0cd0e72636b1766 100644 (file)
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.22 2001/01/04 03:51:24 jwise Exp $ */
+/*     $NetBSD: extern.h,v 1.27 2004/02/08 00:32:48 jsm Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,6 +31,8 @@
  *     @(#)externs.h   8.1 (Berkeley) 5/31/93
  */
 
+#include <sys/types.h>
+
 #include "machdep.h"
 
        /* program mode */
@@ -44,9 +42,9 @@ extern int mode;
 #define MODE_LOGGER    3
 
        /* command line flags */
-extern char randomize;                 /* -x, give first available ship */
-extern char longfmt;                   /* -l, print score in long format */
-extern char nobells;                   /* -b, don't ring bell before Signal */
+extern int randomize;                  /* -x, give first available ship */
+extern int longfmt;                    /* -l, print score in long format */
+extern int nobells;                    /* -b, don't ring bell before Signal */
 
        /* other initial modes */
 extern gid_t gid;
@@ -54,7 +52,6 @@ extern gid_t egid;
 
 #define dieroll()              ((random()) % 6 + 1)
 #define sqr(a)         ((a) * (a))
-#define abs(a)         ((a) > 0 ? (a) : -(a))
 #define min(a,b)       ((a) < (b) ? (a) : (b))
 
 #define grappled(a)    ((a)->file->ngrap)
@@ -290,10 +287,10 @@ extern int turn;
 extern int game;
 extern int alive;
 extern int people;
-extern char hasdriver;
+extern int hasdriver;
 
 /* assorted.c */
-void table (int, int, int, struct ship *, struct ship *, int);
+void table (struct ship *, struct ship *, int, int, int, int);
 void Cleansnag (struct ship *, struct ship *, int, int);
 
 /* dr_1.c */
@@ -321,7 +318,7 @@ void ungrap (struct ship *, struct ship *);
 void grap (struct ship *, struct ship *);
 
 /* dr_5.c */
-void subtract (struct ship *, int, int [3], struct ship *, int);
+void subtract (struct ship *, struct ship *, int, int [3], int);
 int mensent (struct ship *, struct ship *, int[3], struct ship **, int *,
     int);