X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/b2c40c5606888fb0f424ed2d7c7cbfcc747ae9bf..3748e584d42e73bc48d6b26c52a093ad7d77732c:/sail/extern.h

diff --git a/sail/extern.h b/sail/extern.h
index 21ea2428..164e852e 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.24 2001/01/04 06:16:51 jwise Exp $ */
+/*	$NetBSD: extern.h,v 1.28 2006/03/18 01:43:52 abs 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 */
@@ -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)
@@ -151,8 +148,8 @@ struct logs {
 };
 
 struct BP {
-	short turnsent;
 	struct ship *toship;
+	short turnsent;
 	short mensent;
 };