aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2019-11-17 15:04:37 -0500
committerJay Satiro <raysatiro@yahoo.com>2019-11-17 23:27:39 -0500
commit1f6a18685ef46c900f493179337492995312cbf6 (patch)
tree626fd513dedc75581eb87b4d3a4e5e76eeaa84d8 /lib
parent0a906a45aff21d2fd4a493b5a117050d0919e4cf (diff)
lib: Move lib/ssh.h -> lib/vssh/ssh.h
Follow-up to 5b2d703 which moved ssh source files to vssh. Closes https://github.com/curl/curl/pull/4609
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.inc6
-rw-r--r--lib/easy.c2
-rw-r--r--lib/sendf.c2
-rw-r--r--lib/url.c2
-rw-r--r--lib/urldata.h2
-rw-r--r--lib/version.c2
-rw-r--r--lib/vssh/ssh.h (renamed from lib/ssh.h)0
7 files changed, 9 insertions, 7 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 72ef428ee..3a561d4d1 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -43,6 +43,8 @@ LIB_VQUIC_HFILES = vquic/ngtcp2.h vquic/quiche.h
LIB_VSSH_CFILES = vssh/libssh2.c vssh/libssh.c
+LIB_VSSH_HFILES = vssh/ssh.h
+
LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c \
@@ -72,7 +74,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
http_negotiate.h inet_pton.h amigaos.h strtoofft.h strerror.h \
inet_ntop.h curlx.h curl_memory.h curl_setup.h transfer.h select.h \
easyif.h multiif.h parsedate.h tftp.h sockaddr.h splay.h strdup.h \
- socks.h ssh.h curl_base64.h curl_addrinfo.h curl_sspi.h \
+ socks.h curl_base64.h curl_addrinfo.h curl_sspi.h \
slist.h nonblock.h curl_memrchr.h imap.h pop3.h smtp.h pingpong.h \
rtsp.h curl_threads.h warnless.h curl_hmac.h curl_rtmp.h \
curl_gethostname.h gopher.h http_proxy.h non-ascii.h asyn.h \
@@ -89,4 +91,4 @@ LIB_RCFILES = libcurl.rc
CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \
$(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES)
HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \
- $(LIB_VQUIC_HFILES)
+ $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES)
diff --git a/lib/easy.c b/lib/easy.c
index fc5eceb6a..1d02c0cc1 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -72,7 +72,7 @@
#include "warnless.h"
#include "multiif.h"
#include "sigpipe.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
#include "setopt.h"
#include "http_digest.h"
#include "system_win32.h"
diff --git a/lib/sendf.c b/lib/sendf.c
index 5913ea406..000fbb164 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -36,7 +36,7 @@
#include "sendf.h"
#include "connect.h"
#include "vtls/vtls.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
#include "easyif.h"
#include "multiif.h"
#include "non-ascii.h"
diff --git a/lib/url.c b/lib/url.c
index 4f4120146..99a8b1359 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -106,7 +106,7 @@ bool curl_win32_idn_to_ascii(const char *in, char **out);
#include "http2.h"
#include "file.h"
#include "curl_ldap.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
#include "imap.h"
#include "url.h"
#include "connect.h"
diff --git a/lib/urldata.h b/lib/urldata.h
index f9365b2e6..da7e58f45 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -124,7 +124,7 @@ typedef ssize_t (Curl_recv)(struct connectdata *conn, /* connection data */
#include "smtp.h"
#include "ftp.h"
#include "file.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
#include "http.h"
#include "rtsp.h"
#include "smb.h"
diff --git a/lib/version.c b/lib/version.c
index cfd09e36d..6405d369d 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -26,7 +26,7 @@
#include "urldata.h"
#include "vtls/vtls.h"
#include "http2.h"
-#include "ssh.h"
+#include "vssh/ssh.h"
#include "quic.h"
#include "curl_printf.h"
diff --git a/lib/ssh.h b/lib/vssh/ssh.h
index 3213c5a52..3213c5a52 100644
--- a/lib/ssh.h
+++ b/lib/vssh/ssh.h