From patchwork Sat May 2 18:37:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Gilbert X-Patchwork-Id: 11524069 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC00813B2 for ; Sat, 2 May 2020 18:37:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEB522084D for ; Sat, 2 May 2020 18:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgEBShi (ORCPT ); Sat, 2 May 2020 14:37:38 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:39488 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727880AbgEBShi (ORCPT ); Sat, 2 May 2020 14:37:38 -0400 From: Mike Gilbert To: dash@vger.kernel.org Cc: Jeroen Roovers , Mike Gilbert Subject: [PATCH] input: Fix compiling against libedit with -fno-common Date: Sat, 2 May 2020 14:37:06 -0400 Message-Id: <20200502183706.2719782-1-floppym@gentoo.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: dash-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dash@vger.kernel.org From: Jeroen Roovers 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 --- 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);