From: Mike Gilbert <floppym@gentoo.org>
To: dash@vger.kernel.org
Cc: Jeroen Roovers <jer@gentoo.org>, Mike Gilbert <floppym@gentoo.org>
Subject: [PATCH] input: Fix compiling against libedit with -fno-common
Date: Sat, 2 May 2020 14:37:06 -0400 [thread overview]
Message-ID: <20200502183706.2719782-1-floppym@gentoo.org> (raw)
From: Jeroen Roovers <jer@gentoo.org>
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>
---
src/input.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/input.c b/src/input.c
index ae0c4c8..e84eca8 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);
--
2.25.1
next reply other threads:[~2020-05-02 18:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 18:37 Mike Gilbert [this message]
2020-05-15 6:30 ` [PATCH] input: Fix compiling against libedit with -fno-common Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200502183706.2719782-1-floppym@gentoo.org \
--to=floppym@gentoo.org \
--cc=dash@vger.kernel.org \
--cc=jer@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).