bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-23 07:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed deny_severity,allow_severity defs from filan.c and procan.c to make gcc version 10 happy

Browse source
This commit is contained in:
Gerhard Rieger 2020-11-14 17:33:58 +01:00
parent b62ff0c005
commit a850582908
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -12,6 +12,14 @@ Corrections:
quotes quotes
Test: UNBALANCED_QUOTE Test: UNBALANCED_QUOTE
Porting:
In gcc version 10 the default changed from -fcommon to -fno-common.
Consequently, linking filan and procan failed with error
"multiple definition of `deny_severity'" and `allow_severity'
Fixed by removing definitions in filan.c and procan.c
Debian issue 957823
Thanks to László Böszörményi and others for reporting this issue.
Testing: Testing:
test.sh now produces a list of tests that could not be performed for test.sh now produces a list of tests that could not be performed for
any reason. This helps to analyse these cases. any reason. This helps to analyse these cases.

4
filan.c
View file

@ -28,10 +28,6 @@ struct sockopt {
static int filan_streams_analyze(int fd, FILE *outfile); static int filan_streams_analyze(int fd, FILE *outfile);
/* dirty workaround so we dont get an error on AIX when being linked with
libwrap */
int allow_severity, deny_severity;
/* global variables for configuring filan */ /* global variables for configuring filan */
bool filan_followsymlinks; bool filan_followsymlinks;
bool filan_rawoutput; bool filan_rawoutput;

4
procan.c
View file

@ -19,10 +19,6 @@
#include "procan.h" #include "procan.h"
/* dirty workaround so we dont get an error on AIX when getting linked with
libwrap */
int allow_severity, deny_severity;
int procan(FILE *outfile) { int procan(FILE *outfile) {