elle: minor changes to compile with non-ack.

This commit is contained in:
Ben Gras 2010-07-12 20:09:03 +00:00
parent bcaf746508
commit dd19f8cd07
4 changed files with 6 additions and 8 deletions

View file

@ -1,9 +1,5 @@
# Makefile for elle # Makefile for elle
# XXX: Can only be built with ACK currently
CC:=${CC:C/^gcc/cc/}
COMPILER_TYPE:=ack
PROGS= ellec elle PROGS= ellec elle
SRCS.elle= eemain.c eecmds.c eesite.c eevini.c eedisp.c eeterm.c eeerr.c \ 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 \ eeques.c eebuff.c eefile.c eefed.c eeedit.c eebit.c eef1.c \

View file

@ -9,6 +9,8 @@
#include "elle.h" #include "elle.h"
static void moveborder(int);
#if FX_NEWWIN #if FX_NEWWIN
/* EFUN: "New Window" */ /* EFUN: "New Window" */
@ -118,7 +120,6 @@ f_scdnwind()
/* EFUN: "Move to Window Top" (not EMACS) - from IMAGEN config */ /* EFUN: "Move to Window Top" (not EMACS) - from IMAGEN config */
f_mvwtop() f_mvwtop()
{ {
extern moveborder();
moveborder(1); moveborder(1);
} }
#endif /*FX_MVWTOP*/ #endif /*FX_MVWTOP*/
@ -127,7 +128,6 @@ f_mvwtop()
/* EFUN: "Move to Window Bottom" (not EMACS) - from IMAGEN config */ /* EFUN: "Move to Window Bottom" (not EMACS) - from IMAGEN config */
f_mvwbot() f_mvwbot()
{ {
extern moveborder();
moveborder(0); moveborder(0);
} }
#endif /*FX_MVWBOT*/ #endif /*FX_MVWBOT*/
@ -202,7 +202,7 @@ register int n;
#endif /* FX_SC%%WIND */ #endif /* FX_SC%%WIND */
#if FX_MVWTOP || FX_MVWBOT /* Guts for above two functions */ #if FX_MVWTOP || FX_MVWBOT /* Guts for above two functions */
static static void
moveborder(top) moveborder(top)
int top; int top;
{ {

View file

@ -437,6 +437,8 @@ f_pshinf()
redp(RD_SCREEN|RD_MODE); /* Done, redisplay */ redp(RD_SCREEN|RD_MODE); /* Done, redisplay */
} }
#if 0
/* Miscellaneous utility routines - memory alloc/free and string hacking. /* Miscellaneous utility routines - memory alloc/free and string hacking.
* If this page becomes overly large, it can be split off into a separate * If this page becomes overly large, it can be split off into a separate
* file called E_MISC. * file called E_MISC.
@ -447,6 +449,7 @@ char *s; /* Note that STRCPY's return val must be its 1st arg */
{ char *strcpy(); { char *strcpy();
return(strcpy(memalloc((SBMO)(strlen(s)+1)), s)); return(strcpy(memalloc((SBMO)(strlen(s)+1)), s));
} }
#endif
char * char *
memalloc(size) memalloc(size)

View file

@ -341,7 +341,6 @@ _PROTOTYPE( int ring_bell, (void) );
_PROTOTYPE( int f_retsup, (void) ); _PROTOTYPE( int f_retsup, (void) );
_PROTOTYPE( int f_wfexit, (void) ); _PROTOTYPE( int f_wfexit, (void) );
_PROTOTYPE( int f_pshinf, (void) ); _PROTOTYPE( int f_pshinf, (void) );
_PROTOTYPE( char *strdup, (char *s) );
_PROTOTYPE( char *memalloc, (SBMO size) ); _PROTOTYPE( char *memalloc, (SBMO size) );
_PROTOTYPE( int chkfree, (SBMA ptr) ); _PROTOTYPE( int chkfree, (SBMA ptr) );
_PROTOTYPE( int ustrcmp, (char *str1, char *str2) ); _PROTOTYPE( int ustrcmp, (char *str1, char *str2) );