$OpenBSD: patch-aa,v 1.2 2001/02/27 22:32:26 naddy Exp $
--- mmv.c.orig	Tue Feb 27 23:12:39 2001
+++ mmv.c	Tue Feb 27 23:13:11 2001
@@ -88,7 +88,6 @@ on the command line.\n";
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef MSDOS
 /* for MS-DOS (under Turbo C 1.5)*/
@@ -121,12 +120,12 @@ extern unsigned _stklen = 10000;
 #else
 /* for various flavors of UN*X */
 
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 
 extern char *getenv();
-extern long lseek();
 extern char *malloc();
 
 #ifdef DIRENT
@@ -176,7 +175,6 @@ extern char *strcpy(), *strchr();
 
 #else
 /* for System V and BSD */
-#include <string.h>
 #include <sys/signal.h>
 #include <fcntl.h>
 #endif
@@ -370,7 +368,7 @@ static int movealias(/* REP *first, REP 
 static int snap(/* REP *first, REP *p */);
 static void showdone(/* REP *fin */);
 static void breakout(/*  */);
-static int breakrep(/* */);
+static void breakrep(/* */);
 static void breakstat(/* */);
 static void quit(/*  */);
 static int copymove(/* REP *p */);
@@ -389,7 +387,6 @@ static void cleanup(/*  */);
 static int getstat(/* char *full, FILEINFO *f */);
 static int dwritable(/* HANDLE *h */);
 static int fwritable(/* char *hname, FILEINFO *f */);
-static void memmove(/* void *to, void *from, int k */);
 #endif
 #ifndef RENAME
 static int rename(/* char *from, char *to */);
@@ -2550,10 +2547,9 @@ static void breakout()
 }
 
 
-static int breakrep()
+static void breakrep()
 {
 	gotsig = 1;
-	return(1);
 }
 
 
@@ -2832,7 +2828,7 @@ static void chgive(p, k)
 }
 
 
-#ifndef MSDOS
+#if 0
 static void memmove(to, from, k)
 	char *to, *from;
 	unsigned k;
