diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-26 23:49:38 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-26 23:49:38 +0000 |
| commit | afd51bd38b89484b93a777434674486ea2e4d761 (patch) | |
| tree | c9d4aeb710f82815c5308dc6ce0b6a8e8fd08c84 /bin | |
| parent | 5b51ed28a6f04b49b8fa01674c5c7cc25a08c4e5 (diff) | |
Remove EXTERN from edit.[ch], from Michael McConville.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ksh/edit.c | 5 | ||||
| -rw-r--r-- | bin/ksh/edit.h | 27 |
2 files changed, 4 insertions, 28 deletions
diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c index 2e00727b1e5..02a0b14d0a6 100644 --- a/bin/ksh/edit.c +++ b/bin/ksh/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.44 2015/09/18 07:28:24 nicm Exp $ */ +/* $OpenBSD: edit.c,v 1.45 2015/09/26 23:49:37 nicm Exp $ */ /* * Command line editing - common code @@ -10,14 +10,13 @@ #include "sh.h" #include "tty.h" -#define EXTERN #include "edit.h" -#undef EXTERN #include <sys/ioctl.h> #include <ctype.h> #include <libgen.h> #include <sys/stat.h> +X_chars edchars; static void x_sigwinch(int); volatile sig_atomic_t got_sigwinch; diff --git a/bin/ksh/edit.h b/bin/ksh/edit.h index 0f76d5b4c64..210511f8715 100644 --- a/bin/ksh/edit.h +++ b/bin/ksh/edit.h @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.h,v 1.9 2011/05/30 17:14:35 martynas Exp $ */ +/* $OpenBSD: edit.h,v 1.10 2015/09/26 23:49:37 nicm Exp $ */ /* NAME: * edit.h - globals for edit modes @@ -14,15 +14,6 @@ * */ -/* some useful #defines */ -#ifdef EXTERN -# define I__(i) = i -#else -# define I__(i) -# define EXTERN extern -# define EXTERN_DEFINED -#endif - #define BEL 0x07 /* tty driver characters we are interested in */ @@ -35,7 +26,7 @@ typedef struct { int eof; } X_chars; -EXTERN X_chars edchars; +extern X_chars edchars; /* x_cf_glob() flags */ #define XCF_COMMAND BIT(0) /* Do command completion */ @@ -70,17 +61,3 @@ int x_vi(char *, size_t); #else # define D__(x) #endif - -/* This lot goes at the END */ -/* be sure not to interfere with anyone else's idea about EXTERN */ -#ifdef EXTERN_DEFINED -# undef EXTERN_DEFINED -# undef EXTERN -#endif -#undef I__ -/* - * Local Variables: - * version-control:t - * comment-column:40 - * End: - */ |