Use more void and system headers.

3 files changed, 35 insertions, 11 deletions

diff --git a/editors/mg2a/distinfo b/editors/mg2a/distinfo
index 76bc06451ef..42ee1fa6c0a 100644
--- a/editors/mg2a/distinfo
+++ b/editors/mg2a/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/01/24 20:38:55 joerg Exp $
+$NetBSD: distinfo,v 1.10 2012/12/25 21:10:55 joerg Exp $
 
 SHA1 (mg2a.tar.Z) = c96f890f217eaacb78117f9c73f1ea3709ca8d3f
 RMD160 (mg2a.tar.Z) = 7083ec8b49eb89d1389dabfb915859af2bb40ee1
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = d10d168a9f224cd2dfd15fe28876f55e7073e4d2
 SHA1 (patch-ab) = c62b733dc0247ddff65a544c4a5f9593ee324472
 SHA1 (patch-ac) = 6ef1d0bc88241756cdd3a66050ebfaaf353edcdb
 SHA1 (patch-ad) = d83892a713d75d830f553e58632d2fde55e53cc4
-SHA1 (patch-ae) = 025873e653403c6c2141db351bd058c6ed2c2e99
+SHA1 (patch-ae) = 13c976df16c34acffc14615d29ad91a3bdacd716
 SHA1 (patch-af) = fa6e22c0d2c12ca349af2887b606954e4e016269
 SHA1 (patch-ag) = e8bcbc0cba9cdf989b93d280e108de167281f262
 SHA1 (patch-ah) = 1041e9060e70fbe3e483823a4ab38018c8ce2069
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = fc3d195c0fb3c68cac29c0d7506068b5bca9a847
 SHA1 (patch-aj) = b219efdc662459602d491cf0e700434a661ce1d7
 SHA1 (patch-al) = b8595b33d45b73b709bcdbf1d2e255d57f02735b
 SHA1 (patch-am) = 3544b6609262899aabd0c0b7a29fdaeee3413d5f
-SHA1 (patch-an) = faf386a6ba58793f286aae1e372e318d77f6daa3
+SHA1 (patch-an) = 77e7d17b8581b9ed72b3d514783bd41557d9b310
 SHA1 (patch-ao) = ebe3ad41e0ad49aa4ea6fe571dbf360af8c70a96
 SHA1 (patch-ap) = 49aca14c3ee0b1c3c84f3920eb875ec8700f9128
 SHA1 (patch-aq) = 1deef2a00054de186cd73f7d864c5764a41dc2b0
diff --git a/editors/mg2a/patches/patch-ae b/editors/mg2a/patches/patch-ae
index bae07ecfcb9..c8d0964a7b4 100644
--- a/editors/mg2a/patches/patch-ae
+++ b/editors/mg2a/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2000/07/10 18:26:54 tron Exp $
+$NetBSD: patch-ae,v 1.3 2012/12/25 21:10:56 joerg Exp $
 
---- sys/default/tty.c.orig	Sun Jul  3 10:50:35 1988
-+++ sys/default/tty.c	Wed May 31 16:36:31 2000
-@@ -144,7 +144,8 @@
+--- sys/default/tty.c.orig	1988-07-03 17:50:35.000000000 +0000
++++ sys/default/tty.c
+@@ -144,7 +144,8 @@ ttinit() {
  #endif
  
  	if(CM == NULL || UP == NULL)
@@ -12,3 +12,21 @@ $NetBSD: patch-ae,v 1.2 2000/07/10 18:26:54 tron Exp $
  	ttresize();			/* set nrow & ncol	*/
  
  	/* watch out for empty capabilities (sure to be wrong)	*/
+@@ -259,7 +260,7 @@ ttbeep() {
+  * If no scrolling region, use a set
+  * of insert and delete line sequences
+  */
+-ttinsl(row, bot, nchunk) {
++void ttinsl(int row, int bot, int nchunk) {
+     register int	i, nl;
+ 
+     if (row == bot) {		/* Case of one line insert is	*/
+@@ -298,7 +299,7 @@ ttinsl(row, bot, nchunk) {
+  * lines.  The presence of the echo area makes a
+  * boundry condition go away.
+  */
+-ttdell(row, bot, nchunk)
++void ttdell(int row, int bot, int nchunk)
+ {
+     register int	i, nl;
+ 
diff --git a/editors/mg2a/patches/patch-an b/editors/mg2a/patches/patch-an
index f9d30f4ff6d..fc4ba4de880 100644
--- a/editors/mg2a/patches/patch-an
+++ b/editors/mg2a/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2005/12/09 15:26:52 joerg Exp $
+$NetBSD: patch-an,v 1.3 2012/12/25 21:10:56 joerg Exp $
 
 --- def.h.orig	1988-07-03 17:50:05.000000000 +0000
 +++ def.h
@@ -11,8 +11,14 @@ $NetBSD: patch-an,v 1.2 2005/12/09 15:26:52 joerg Exp $
  extern	int	nrow;
  extern	int	ncol;
  extern	int	ttrow;
-@@ -308,4 +308,3 @@ extern	VOID	lchange();
+@@ -306,6 +306,7 @@ extern	VOID	lchange();
+ /*
+  * Standard I/O.
   */
- extern	char	*strcpy();
- extern	char	*strcat();
+-extern	char	*strcpy();
+-extern	char	*strcat();
 -extern	char	*malloc();
++void ttinsl(int, int, int);
++void ttdell(int, int, int);
++
++#include <string.h>