From 33a5019b18f104c901470a237b7c34f6a0b93fb0 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Mon, 8 Nov 2021 20:57:00 +0100 Subject: [PATCH] Failed to compile on OmniOS due to TCP_INFO --- CHANGES | 5 +++++ VERSION | 2 +- filan.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 882ec01..1941793 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@  +Corrections: + Socat 1.7.4.2 did not compile on OmniOS (and probably other OpenSolaris + distributions) + Thanks to Andy Fiddaman for sending a patch + ####################### V 1.7.4.2: Corrections: diff --git a/VERSION b/VERSION index b3f7c6e..0a15046 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.7.4.2" +"1.7.4.2+" diff --git a/filan.c b/filan.c index 3465f7c..a733a0a 100644 --- a/filan.c +++ b/filan.c @@ -897,12 +897,14 @@ int tcpan(int fd, FILE *outfile) { ++optname; } +#ifdef TCP_INFO tcpan2(fd, outfile); +#endif return 0; } #endif /* WITH_TCP */ -#if WITH_TCP +#if WITH_TCP && defined(TCP_INFO) int tcpan2(int fd, FILE *outfile) { struct tcp_info tcpinfo; -- 2.11.4.GIT