From 8e559f5f8c1a928f6dae8543640886758469683c Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 2 May 2020 14:37:06 -0400 Subject: input: Fix compiling against libedit with -fno-common With -fno-common, which will be enabled by default in GCC 10, we see this error: ld: input.o:(.bss+0x0): multiple definition of `el'; histedit.o:(.bss+0x8): first defined here To fix this, simply remove the definition as it is not needed. Signed-off-by: Jeroen Roovers Signed-off-by: Mike Gilbert Signed-off-by: Herbert Xu --- src/input.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/input.c b/src/input.c index 177fd0a..4a9b267 100644 --- a/src/input.c +++ b/src/input.c @@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ]; /* buffer for top level input file */ struct parsefile *parsefile = &basepf; /* current input file */ int whichprompt; /* 1 == PS1, 2 == PS2 */ -#ifndef SMALL -EditLine *el; /* cookie for editline package */ -#endif - STATIC void pushfile(void); static int preadfd(void); static void setinputfd(int fd, int push); -- cgit 1.4.1