From: Ben Gras <ben@minix3.org>
Date: Mon, 12 Jul 2010 20:09:03 +0000 (+0000)
Subject: elle: minor changes to compile with non-ack.
X-Git-Tag: v3.1.8~255
X-Git-Url: http://zhaoyanbai.com/repos/man.dnssec-keygen.html?a=commitdiff_plain;h=dd19f8cd07429db0c7415ce6730f24e1ff0adb6a;p=minix.git

elle: minor changes to compile with non-ack.
---

diff --git a/commands/elle/Makefile b/commands/elle/Makefile
index 8f26e3409..8cc771897 100644
--- a/commands/elle/Makefile
+++ b/commands/elle/Makefile
@@ -1,9 +1,5 @@
 # Makefile for elle
 
-# XXX: Can only be built with ACK currently
-CC:=${CC:C/^gcc/cc/}
-COMPILER_TYPE:=ack
-
 PROGS=	ellec elle
 SRCS.elle= eemain.c eecmds.c eesite.c eevini.c eedisp.c eeterm.c eeerr.c  \
       eeques.c eebuff.c eefile.c eefed.c eeedit.c eebit.c eef1.c \
diff --git a/commands/elle/eefd.c b/commands/elle/eefd.c
index 8c169fbdb..1335d578e 100644
--- a/commands/elle/eefd.c
+++ b/commands/elle/eefd.c
@@ -9,6 +9,8 @@
 
 #include "elle.h"
 
+static void moveborder(int);
+
 
 #if FX_NEWWIN
 /* EFUN: "New Window" */
@@ -118,7 +120,6 @@ f_scdnwind()
 /* EFUN: "Move to Window Top" (not EMACS) - from IMAGEN config */
 f_mvwtop()
 {
-	extern moveborder();
 	moveborder(1);
 }
 #endif /*FX_MVWTOP*/
@@ -127,7 +128,6 @@ f_mvwtop()
 /* EFUN: "Move to Window Bottom" (not EMACS) - from IMAGEN config */
 f_mvwbot()
 {
-	extern moveborder();
 	moveborder(0);
 }
 #endif /*FX_MVWBOT*/
@@ -202,7 +202,7 @@ register int n;
 #endif /* FX_SC%%WIND */
 
 #if FX_MVWTOP || FX_MVWBOT	/* Guts for above two functions */
-static
+static void
 moveborder(top)
 int top;
 {
diff --git a/commands/elle/eemain.c b/commands/elle/eemain.c
index f457858ee..7241da74e 100644
--- a/commands/elle/eemain.c
+++ b/commands/elle/eemain.c
@@ -437,6 +437,8 @@ f_pshinf()
 	redp(RD_SCREEN|RD_MODE);	/* Done, redisplay */
 }
 
+
+#if 0
 /* Miscellaneous utility routines - memory alloc/free and string hacking.
  * If this page becomes overly large, it can be split off into a separate
  * file called E_MISC.
@@ -447,6 +449,7 @@ char *s;	/* Note that STRCPY's return val must be its 1st arg */
 {	char *strcpy();
 	return(strcpy(memalloc((SBMO)(strlen(s)+1)), s));
 }
+#endif
 
 char *
 memalloc(size)
diff --git a/commands/elle/eeproto.h b/commands/elle/eeproto.h
index f1c5220e2..e2628c6f4 100644
--- a/commands/elle/eeproto.h
+++ b/commands/elle/eeproto.h
@@ -341,7 +341,6 @@ _PROTOTYPE( int ring_bell, (void) );
 _PROTOTYPE( int f_retsup, (void) );
 _PROTOTYPE( int f_wfexit, (void) );
 _PROTOTYPE( int f_pshinf, (void) );
-_PROTOTYPE( char *strdup, (char *s) );
 _PROTOTYPE( char *memalloc, (SBMO size) );
 _PROTOTYPE( int chkfree, (SBMA ptr) );
 _PROTOTYPE( int ustrcmp, (char *str1, char *str2) );