generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust some libssh2 preprocessor symbol definition checks

Browse Source
This commit is contained in:
Yang Tse 2008-11-29 16:39:56 +00:00
parent e35e2ea6ec
commit c036f6ae2d
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ssh.c
View File

@ -36,17 +36,6 @@
#include <libssh2.h>
#include <libssh2_sftp.h>
#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000)
#error "this requires libssh2 0.16 or later"
#endif
#if !defined(HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION) && \
(LIBSSH2_VERSION_NUM >= 0x001300)
/* this is just a check for non-configure based systems to get this properly
setup if libssh2 0.19+ is used */
#define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION 1
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@ -2070,7 +2059,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn)
bool block;
result = ssh_statemach_act(conn, &block);
#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION
#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS
if((CURLE_OK == result) && block) {
int dir = libssh2_session_block_directions(sshc->ssh_session);
curl_socket_t sock = conn->sock[FIRSTSOCKET];

18
lib/ssh.h
View File

@ -1,6 +1,5 @@
#ifndef __SSH_H
#define __SSH_H
#ifndef HEADER_CURL_SSH_H
#define HEADER_CURL_SSH_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@ -25,6 +24,17 @@
***************************************************************************/
#ifdef USE_LIBSSH2
#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000)
# error "SCP/SFTP protocols require libssh2 0.16 or later"
#endif
#if (LIBSSH2_VERSION_NUM >= 0x001300)
# ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS
# define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS 1
# endif
#endif
extern const struct Curl_handler Curl_handler_scp;
extern const struct Curl_handler Curl_handler_sftp;
@ -49,4 +59,4 @@ ssize_t Curl_sftp_recv(struct connectdata *conn, int sockindex,
#endif /* USE_LIBSSH2 */
#endif /* __SSH_H */
#endif /* HEADER_CURL_SSH_H */