From c85dc05436b022d3861ff3be5e69aacefee68e25 Mon Sep 17 00:00:00 2001 From: Carlo Bramini Date: Fri, 16 Aug 2024 08:58:28 +0000 Subject: [PATCH] CYGWIN: fix build. Signed-off-by: Carlo Bramini Reviewed-by: Jakub Jelen (cherry picked from commit e2986003039e1fb7f2762e4dbc5902dce0358f4a) --- src/misc.c | 4 ++-- src/ttyopts.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/misc.c b/src/misc.c index 6ae7cdf1..7fe243f5 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1971,7 +1971,7 @@ char *ssh_strreplace(const char *src, const char *pattern, const char *replace) */ char *ssh_strerror(int err_num, char *buf, size_t buflen) { -#if defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE) +#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)) && defined(_GNU_SOURCE) /* GNU extension on Linux */ return strerror_r(err_num, buf, buflen); #else @@ -1989,7 +1989,7 @@ char *ssh_strerror(int err_num, char *buf, size_t buflen) buf[0] = '\0'; } return buf; -#endif /* defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE) */ +#endif /* ((defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)) && defined(_GNU_SOURCE) */ } /** diff --git a/src/ttyopts.c b/src/ttyopts.c index f6557884..58851916 100644 --- a/src/ttyopts.c +++ b/src/ttyopts.c @@ -264,7 +264,9 @@ encode_termios_opts(struct termios *attr, unsigned char *buf, size_t buflen) SSH_ENCODE_LOCAL_OPT(IEXTEN) SSH_ENCODE_LOCAL_OPT(ECHOCTL) SSH_ENCODE_LOCAL_OPT(ECHOKE) +#ifdef PENDIN SSH_ENCODE_LOCAL_OPT(PENDIN) +#endif #undef SSH_ENCODE_LOCAL_OPT #define SSH_ENCODE_CC_OPT(opt) SSH_ENCODE_OPT(TTY_OP_##opt, attr->c_cc[opt])