shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 10:40:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

CYGWIN: fix build.

Browse Source 
Signed-off-by: Carlo Bramini <carlo_bramini@users.sourceforge.net>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit e298600303)
This commit is contained in:
Carlo Bramini
2024-08-16 08:58:28 +00:00
committed by Jakub Jelen
parent 8d0d3d4d7b
commit c85dc05436
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc.c
View File

@@ -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) 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 */ /* GNU extension on Linux */
return strerror_r(err_num, buf, buflen); return strerror_r(err_num, buf, buflen);
#else #else
@@ -1989,7 +1989,7 @@ char *ssh_strerror(int err_num, char *buf, size_t buflen)
buf[0] = '\0'; buf[0] = '\0';
} }
return buf; return buf;
#endif /* defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE) */ #endif /* ((defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)) && defined(_GNU_SOURCE) */
} }
/** /**

2
src/ttyopts.c
View File

@@ -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(IEXTEN)
SSH_ENCODE_LOCAL_OPT(ECHOCTL) SSH_ENCODE_LOCAL_OPT(ECHOCTL)
SSH_ENCODE_LOCAL_OPT(ECHOKE) SSH_ENCODE_LOCAL_OPT(ECHOKE)
#ifdef PENDIN
SSH_ENCODE_LOCAL_OPT(PENDIN) SSH_ENCODE_LOCAL_OPT(PENDIN)
#endif
#undef SSH_ENCODE_LOCAL_OPT #undef SSH_ENCODE_LOCAL_OPT
#define SSH_ENCODE_CC_OPT(opt) SSH_ENCODE_OPT(TTY_OP_##opt, attr->c_cc[opt]) #define SSH_ENCODE_CC_OPT(opt) SSH_ENCODE_OPT(TTY_OP_##opt, attr->c_cc[opt])