diff options
| author | Jeroen Roovers <jer@gentoo.org> | 2020-05-02 14:37:06 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-05-15 16:24:38 +1000 |
| commit | 8e559f5f8c1a928f6dae8543640886758469683c (patch) | |
| tree | c7cd60522aecee329f49b0300e2b2edfe27d3db6 | |
| parent | shell: mktokens relative TMPDIR (diff) | |
| download | dash-8e559f5f8c1a928f6dae8543640886758469683c.tar.gz dash-8e559f5f8c1a928f6dae8543640886758469683c.zip | |
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 <jer@gentoo.org> Signed-off-by: Mike Gilbert <floppym@gentoo.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | src/input.c | 4 |
1 files changed, 0 insertions, 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); |