diff options
author | alfred <alfred@FreeBSD.org> | 2002-05-28 19:23:47 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-05-28 19:23:47 +0000 |
commit | 197cf7d2ba28470f2a8229755320aff1c6f22184 (patch) | |
tree | 7ee0aa518d99e25bc97eba167e9540f0806b4181 /usr.bin/ee | |
parent | a7dd0de84ac7e23d8e7701371397f76a745caf36 (diff) | |
download | FreeBSD-src-197cf7d2ba28470f2a8229755320aff1c6f22184.zip FreeBSD-src-197cf7d2ba28470f2a8229755320aff1c6f22184.tar.gz |
Assume __STDC__, remove non-__STDC__ code.
Diffstat (limited to 'usr.bin/ee')
-rw-r--r-- | usr.bin/ee/ee.c | 8 | ||||
-rw-r--r-- | usr.bin/ee/new_curse.c | 47 |
2 files changed, 3 insertions, 52 deletions
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index 6caad25..ced9c01 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -540,14 +540,6 @@ char *more_above_str, *more_below_str; char *chinese_cmd, *nochinese_cmd; -#ifndef __STDC__ -#ifndef HAS_STDLIB -extern char *malloc(); -extern char *realloc(); -extern char *getenv(); -FILE *fopen(); /* declaration for open function */ -#endif /* HAS_STDLIB */ -#endif /* __STDC__ */ int main(argc, argv) /* beginning of main program */ diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c index c99186c..f3a124b 100644 --- a/usr.bin/ee/new_curse.c +++ b/usr.bin/ee/new_curse.c @@ -73,11 +73,7 @@ statis const char rcsid[] = #include <stdlib.h> #endif -#if defined(__STDC__) #include <stdarg.h> -#else -#include <varargs.h> -#endif #ifdef HAS_UNISTD #include <unistd.h> @@ -663,30 +659,13 @@ static char nc_scrolling_ability = FALSE; #ifdef CAP -#if __STDC__ || defined(__cplusplus) -#define P_(s) s -#else -#define P_(s) () -#endif /* __STDC__ */ - -int tc_Get_int P_((int)); -void CAP_PARSE P_((void)); -void Find_term P_((void)); - -#undef P_ +int tc_Get_int(int); +void CAP_PARSE(void); +void Find_term(void); #endif /* CAP */ -#ifndef __STDC__ -#ifndef HAS_STDLIB -extern char *fgets(); -extern char *malloc(); -extern char *getenv(); -FILE *fopen(); /* declaration for open function */ -#endif /* HAS_STDLIB */ -#endif /* __STDC__ */ - #ifdef SIGWINCH /* @@ -2828,33 +2807,15 @@ WINDOW *window; } } -#ifndef __STDC__ -void -wprintw(va_alist) -va_dcl -#else /* __STDC__ */ void wprintw(WINDOW *window, const char *format, ...) -#endif /* __STDC__ */ { -#ifndef __STDC__ - WINDOW *window; - char *format; va_list ap; -#else - va_list ap; -#endif int value; char *fpoint; char *wtemp; -#ifndef __STDC__ - va_start(ap); - window = va_arg(ap, WINDOW *); - format = va_arg(ap, char *); -#else /* __STDC__ */ va_start(ap, format); -#endif /* __STDC__ */ fpoint = (char *) format; while (*fpoint != (char) NULL) @@ -2899,9 +2860,7 @@ wprintw(WINDOW *window, const char *format, ...) else waddch(window, *fpoint++); } -#ifdef __STDC__ va_end(ap); -#endif /* __STDC__ */ } void |