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

Fix libssh2 preprocessor symbol definition check

Browse Source
This commit is contained in:
Yang Tse 2009-05-09 15:32:59 +00:00
parent 1345226bc9
commit ddb0b8d8b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ssh.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -29,7 +29,7 @@
# error "SCP/SFTP protocols require libssh2 0.16 or later" # error "SCP/SFTP protocols require libssh2 0.16 or later"
#endif #endif
#if (LIBSSH2_VERSION_NUM >= 0x001300) #if defined(LIBSSH2_VERSION_NUM) && (LIBSSH2_VERSION_NUM >= 0x001300)
/* libssh2 0.19 was the planned release version for a while before it was /* libssh2 0.19 was the planned release version for a while before it was
decided to instead become 1.0. Thus >= 0x001300 should still work fine decided to instead become 1.0. Thus >= 0x001300 should still work fine
for snapshots done during the 0.19 days as well as things released once for snapshots done during the 0.19 days as well as things released once
@ -39,7 +39,7 @@
# undef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS # undef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS
#endif #endif
#if (LIBSSH2_VERSION_NUM >= 0x010000) #if defined(LIBSSH2_VERSION_NUM) && (LIBSSH2_VERSION_NUM >= 0x010000)
/* libssh2_sftp_seek64() has only ever been provided by libssh2 1.0 or /* libssh2_sftp_seek64() has only ever been provided by libssh2 1.0 or
later */ later */
# define HAVE_LIBSSH2_SFTP_SEEK64 1 # define HAVE_LIBSSH2_SFTP_SEEK64 1
@ -64,6 +64,7 @@ ssize_t Curl_sftp_recv(struct connectdata *conn, int sockindex,
#define Curl_ssh_enabled(conn,prot) (conn->protocol & prot) #define Curl_ssh_enabled(conn,prot) (conn->protocol & prot)
#else /* USE_LIBSSH2 */ #else /* USE_LIBSSH2 */
#define Curl_ssh_enabled(x,y) 0 #define Curl_ssh_enabled(x,y) 0
#define Curl_scp_send(a,b,c,d) 0 #define Curl_scp_send(a,b,c,d) 0
#define Curl_sftp_send(a,b,c,d) 0 #define Curl_sftp_send(a,b,c,d) 0