Make this build with WARNS=4 by not reusing names from ctype.h.

[bsdgames-darwin.git] / sail / pl_4.c

diff --git a/sail/pl_4.c b/sail/pl_4.c
index 56c6dba80fd42c85fc9df0a103b7f35474c468bb..7958b56ee118a87f4df856a4c0b7b88be8620445 100644 (file)
--- a/sail/pl_4.c
+++ b/sail/pl_4.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_4.c,v 1.10 2001/01/04 02:43:32 jwise Exp $  */
+/*     $NetBSD: pl_4.c,v 1.15 2004/11/05 21:30:32 dsl 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.
  *
@@ -38,18 +34,15 @@
 #if 0
 static char sccsid[] = "@(#)pl_4.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_4.c,v 1.10 2001/01/04 02:43:32 jwise Exp $");
+__RCSID("$NetBSD: pl_4.c,v 1.15 2004/11/05 21:30:32 dsl Exp $");
 #endif
 #endif /* not lint */
 
+#include <sys/types.h>
+#include <ctype.h>
+#include "extern.h"
 #include "player.h"
 
-void   changesail(void);
-void   acceptsignal(void);
-void   lookout(void);
-const char     *saywhat(struct ship *, int);
-void   eyeball(struct ship *);
-
 void
 changesail(void)
 {
@@ -102,7 +95,7 @@ lookout(void)
        sgetstr("What ship? ", buf, sizeof buf);
        foreachship(sp) {
                c = *countryname[sp->nationality];
-               if ((c == *buf || tolower(c) == *buf || colours(sp) == *buf)
+               if ((tolower((unsigned char)c) == *buf || colours(sp) == *buf)
                    && (sp->file->stern == buf[1] || sterncolour(sp) == buf[1]
                        || buf[1] == '?')) {
                        eyeball(sp);