From: Damien Miller Date: Sat, 17 Oct 2020 00:33:13 +0000 (+1100) Subject: fix netcat build problem X-Git-Tag: V_8_5_P1~238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afbd9ec9e2dbad04834ce7ce53e58740434f32a5;p=thirdparty%2Fopenssh-portable.git fix netcat build problem --- diff --git a/regress/netcat.c b/regress/netcat.c index d583176f1..20ec3f595 100644 --- a/regress/netcat.c +++ b/regress/netcat.c @@ -69,6 +69,9 @@ # include #endif +/* rename to avoid collision in libssh */ +#define timeout_connect netcat_timeout_connect + /* Telnet options from arpa/telnet.h */ #define IAC 255 #define DONT 254