i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin/network/telnetd: Fix multiple definitions

Browse Source 
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 <[email protected]>
This commit is contained in:
Murai Takashi
2021-05-12 12:50:45 +00:00
committed by Jérôme Duval
parent a65f6a2308
commit 1d1b0d4594
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/network/telnetd/ext.h
+1 -1
View File
@@ -62,7 +62,7 @@ extern int auth_level;
extern slcfun slctab[NSLC + 1]; /* slc mapping table */ extern slcfun slctab[NSLC + 1]; /* slc mapping table */
char *terminaltype; extern char *terminaltype;
/* /*
* I/O data buffers, pointers, and counters. * I/O data buffers, pointers, and counters.
src/bin/network/telnetd/sys_term.c
+1 -2
View File
@@ -398,7 +398,6 @@ spcset(int func, cc_t *valp, cc_t **valpp)
* Returns the file descriptor of the opened pty. * Returns the file descriptor of the opened pty.
*/ */
char alpha[] = "0123456789abcdefghijklmnopqrstuv"; char alpha[] = "0123456789abcdefghijklmnopqrstuv";
char line[16];
int int
getpty(int *ptynum __unused) getpty(int *ptynum __unused)
@@ -1330,7 +1329,7 @@ scrub_env(void)
char **cpp, **cpp2; char **cpp, **cpp2;
const char **p; const char **p;
for (cpp2 = cpp = environ; *cpp; cpp++) { for (cpp2 = cpp = environ; *cpp; cpp++) {
int reject_it = 0; int reject_it = 0;