From 99c224361380ccb108774d5b32dc3571b722a048 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@NetBSD.org>
Date: Sat, 25 Jul 1998 10:52:14 +0000
Subject: Rename internal move() to move_ship(), as per PR 5841 by Joseph Myers
 <jsm@octomino.demon.co.uk>.

---
 sail/dr_2.c   | 8 ++++----
 sail/extern.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sail')

diff --git a/sail/dr_2.c b/sail/dr_2.c
index 30c9e4a6..accd9de3 100644
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_2.c,v 1.6 1997/10/13 21:03:18 christos Exp $	*/
+/*	$NetBSD: dr_2.c,v 1.7 1998/07/25 10:52:14 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dr_2.c,v 1.6 1997/10/13 21:03:18 christos Exp $");
+__RCSID("$NetBSD: dr_2.c,v 1.7 1998/07/25 10:52:14 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -170,7 +170,7 @@ char onlytemp;
 	row = fp->row;
 	col = fp->col;
 	drift = fp->drift;
-	move(movement, ship, &fp->dir, &fp->row, &fp->col, &drift);
+	move_ship(movement, ship, &fp->dir, &fp->row, &fp->col, &drift);
 	if (!*movement)
 		(void) strcpy(movement, "d");
 
@@ -190,7 +190,7 @@ char onlytemp;
 }
 
 void
-move(p, ship, dir, row, col, drift)
+move_ship(p, ship, dir, row, col, drift)
 char *p;
 struct ship *ship;
 unsigned char *dir;
diff --git a/sail/extern.h b/sail/extern.h
index a1b0768f..c35ea7c8 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.6 1998/03/29 04:57:19 mrg Exp $ */
+/*	$NetBSD: extern.h,v 1.7 1998/07/25 10:52:14 hubertf Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -317,7 +317,7 @@ void prizecheck __P((void));
 int strend __P((char *));
 void closeon __P((struct ship *, struct ship *, char[], int, int, int));
 int score __P((char[], struct ship *, struct ship *, int));
-void move __P((char *, struct ship *, unsigned char *, short *, short *, char *));
+void move_ship __P((char *, struct ship *, unsigned char *, short *, short *, char *));
 void try __P((char[], char [], int, int, int, int, int, struct ship *,
     struct ship *, int *, int));
 void rmend __P((char *));
-- 
cgit v1.2.3-56-ge451