From 1d1b0d45948878fc1621c464bec7b46ea52b03bd Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Tue, 11 May 2021 20:10:51 +0900 Subject: [PATCH] bin/network/telnetd: Fix multiple definitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix multiple definitions of 'terminaltype' and 'line' when linking. Pointed out by gcc11. Change-Id: I85552e2d243bd5db5f80806d92e6fa87bc41eb44 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3903 Reviewed-by: Jérôme Duval --- src/bin/network/telnetd/ext.h | 2 +- src/bin/network/telnetd/sys_term.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/network/telnetd/ext.h b/src/bin/network/telnetd/ext.h index c29f6f1a85..e1c7e3c8da 100644 --- a/src/bin/network/telnetd/ext.h +++ b/src/bin/network/telnetd/ext.h @@ -62,7 +62,7 @@ extern int auth_level; extern slcfun slctab[NSLC + 1]; /* slc mapping table */ -char *terminaltype; +extern char *terminaltype; /* * I/O data buffers, pointers, and counters. diff --git a/src/bin/network/telnetd/sys_term.c b/src/bin/network/telnetd/sys_term.c index e0165f3734..5404e7b092 100644 --- a/src/bin/network/telnetd/sys_term.c +++ b/src/bin/network/telnetd/sys_term.c @@ -398,7 +398,6 @@ spcset(int func, cc_t *valp, cc_t **valpp) * Returns the file descriptor of the opened pty. */ char alpha[] = "0123456789abcdefghijklmnopqrstuv"; -char line[16]; int getpty(int *ptynum __unused) @@ -1330,7 +1329,7 @@ scrub_env(void) char **cpp, **cpp2; const char **p; - + for (cpp2 = cpp = environ; *cpp; cpp++) { int reject_it = 0;