aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-05-09 15:32:59 +0000
committerYang Tse <yangsita@gmail.com>2009-05-09 15:32:59 +0000
commitddb0b8d8b8b7be2c31d6d77cee9065eff4cb1833 (patch)
tree969774f23458286f1fdb728f1a28619ace8de3ea /lib
parent1345226bc95cc1a674ad3d3ef945cb5b6c4b264b (diff)
Fix libssh2 preprocessor symbol definition check
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssh.h b/lib/ssh.h
index 00fe7173e..38f91a151 100644
--- a/lib/ssh.h
+++ b/lib/ssh.h
@@ -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
* 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"
#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
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
@@ -39,7 +39,7 @@
# undef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS
#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
later */
# 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)
#else /* USE_LIBSSH2 */
+
#define Curl_ssh_enabled(x,y) 0
#define Curl_scp_send(a,b,c,d) 0
#define Curl_sftp_send(a,b,c,d) 0