pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/mg2a Remove malloc prototype, add ereply proto...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b8a049af0e64
branches: trunk
changeset: 504340:b8a049af0e64
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Dec 09 15:26:52 2005 +0000
description:
Remove malloc prototype, add ereply prototype. This fixes prototype
signature errors from GCC 3.4+.
diffstat:
editors/mg2a/distinfo | 6 +++---
editors/mg2a/patches/patch-an | 13 +++++++++----
editors/mg2a/patches/patch-ao | 28 +++++++++++++++++++---------
3 files changed, 31 insertions(+), 16 deletions(-)
diffs (120 lines):
diff -r b3cabc37e928 -r b8a049af0e64 editors/mg2a/distinfo
--- a/editors/mg2a/distinfo Fri Dec 09 15:04:19 2005 +0000
+++ b/editors/mg2a/distinfo Fri Dec 09 15:26:52 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/09 15:26:52 joerg Exp $
SHA1 (mg2a.tar.Z) = c96f890f217eaacb78117f9c73f1ea3709ca8d3f
RMD160 (mg2a.tar.Z) = 7083ec8b49eb89d1389dabfb915859af2bb40ee1
@@ -16,5 +16,5 @@
SHA1 (patch-ak) = 5562aca00c8631dfb18bdadbb6a2d1fe1a11c295
SHA1 (patch-al) = b8595b33d45b73b709bcdbf1d2e255d57f02735b
SHA1 (patch-am) = 3544b6609262899aabd0c0b7a29fdaeee3413d5f
-SHA1 (patch-an) = 69f7c9bf33805f94cdfcb0793833be032bb26bed
-SHA1 (patch-ao) = 83090ee4aef4c12385169a5ab4e7f29febc7c3ac
+SHA1 (patch-an) = faf386a6ba58793f286aae1e372e318d77f6daa3
+SHA1 (patch-ao) = ebe3ad41e0ad49aa4ea6fe571dbf360af8c70a96
diff -r b3cabc37e928 -r b8a049af0e64 editors/mg2a/patches/patch-an
--- a/editors/mg2a/patches/patch-an Fri Dec 09 15:04:19 2005 +0000
+++ b/editors/mg2a/patches/patch-an Fri Dec 09 15:26:52 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2003/09/22 20:22:37 tron Exp $
+$NetBSD: patch-an,v 1.2 2005/12/09 15:26:52 joerg Exp $
---- def.h.orig 1988-07-03 19:50:05.000000000 +0200
-+++ def.h 2003-09-22 21:31:40.000000000 +0200
-@@ -288,7 +288,7 @@
+--- def.h.orig 1988-07-03 17:50:05.000000000 +0000
++++ def.h
+@@ -288,7 +288,7 @@ extern WINDOW *popbuf();
extern WINDOW *wpopup();
extern LINE *lalloc();
extern LINE *lallocx();
@@ -11,3 +11,8 @@
extern int nrow;
extern int ncol;
extern int ttrow;
+@@ -308,4 +308,3 @@ extern VOID lchange();
+ */
+ extern char *strcpy();
+ extern char *strcat();
+-extern char *malloc();
diff -r b3cabc37e928 -r b8a049af0e64 editors/mg2a/patches/patch-ao
--- a/editors/mg2a/patches/patch-ao Fri Dec 09 15:04:19 2005 +0000
+++ b/editors/mg2a/patches/patch-ao Fri Dec 09 15:26:52 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 2003/09/22 20:22:37 tron Exp $
+$NetBSD: patch-ao,v 1.2 2005/12/09 15:26:52 joerg Exp $
---- echo.c.orig 1988-07-03 19:50:08.000000000 +0200
-+++ echo.c 2003-09-22 22:20:46.000000000 +0200
+--- echo.c.orig 1988-07-03 17:50:08.000000000 +0000
++++ echo.c
@@ -6,23 +6,15 @@
* of the display screen. Used by the entire
* known universe.
@@ -28,7 +28,17 @@
static VOID eformat();
static VOID eputi();
static VOID eputl();
-@@ -111,20 +103,13 @@
+@@ -30,6 +22,9 @@ static VOID eputs();
+ static VOID eputc();
+ static int complt();
+
++int ereply(char *, char *, int, ...);
++
++
+ int epresf = FALSE; /* Stuff in echo line flag. */
+ /*
+ * Erase the echo line.
+@@ -111,20 +106,13 @@ eyesno(sp) char *sp; {
* place. This is always a new message, there is no auto
* completion, and the return is echoed as such.
*/
@@ -52,7 +62,7 @@
va_end(pvar);
return i;
}
-@@ -138,24 +123,18 @@
+@@ -138,24 +126,18 @@ va_dcl
* new prompt), an EFFUNC (autocomplete), or EFCR (echo
* the carriage return as CR).
*/
@@ -83,7 +93,7 @@
register int cpos;
register int i;
register int c;
-@@ -425,22 +404,18 @@
+@@ -425,22 +407,18 @@ getxtra(lp1, lp2, cpos, wflag) register
* echo line. The formatting is done by a call
* to the standard formatting routine.
*/
@@ -109,7 +119,7 @@
va_end(pvar);
tteeol();
ttflush();
-@@ -459,7 +434,7 @@
+@@ -459,7 +437,7 @@ va_dcl
static VOID
eformat(fp, ap)
register char *fp;
@@ -118,7 +128,7 @@
{
register int c;
char kname[NKNAME];
-@@ -473,7 +448,7 @@
+@@ -473,7 +451,7 @@ register va_list *ap;
c = *fp++;
switch (c) {
case 'c':
@@ -127,7 +137,7 @@
eputs(kname);
break;
-@@ -488,22 +463,22 @@
+@@ -488,22 +466,22 @@ register va_list *ap;
break;
case 'd':
Home |
Main Index |
Thread Index |
Old Index