summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch
blob: 01b23898e71ed2bcd2b64747fda33faca9869fff (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Mon, 3 Feb 2020 13:18:13 +0100
Subject: [PATCH 1/3] Drop superfluous global variable definitions

The file minicom.c, by including the minicom.h header, already defines
the global variables 'dial_user' and 'dial_pass'. The object file
minicom.o is always linked to dial.o. Thus the definitions in dial.c
can be dropped.

This fixes linking with gcc 10 which uses -fno-common by default,
disallowing multiple global variable definitions.

Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/db269bba2a68fde03f5df45ac8372a8f1248ca96]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 src/dial.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/dial.c b/src/dial.c
index eada5ee..d9d481f 100644
--- a/src/dial.c
+++ b/src/dial.c
@@ -146,8 +146,6 @@ static int newtype;
 /* Access to ".dialdir" denied? */
 static int dendd = 0;
 static char *tagged;
-char *dial_user;
-char *dial_pass;
 
 /* Change the baud rate.  Treat all characters in the given array as if
  * they were key presses within the comm parameters dialog (C-A P) and
-- 
2.24.1