diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-07-20 22:50:45 +0200 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-07-23 09:06:22 +0200 |
commit | f7448eeb1ce1cfc0b95766f52af891e90fe9e8e8 (patch) | |
tree | 31c53d708bcd23b2082f7a14b82547bf9629c3dc | |
parent | d411260a685e4a6308e2faa7a859087671849c7c (diff) | |
download | libssh-f7448eeb1ce1cfc0b95766f52af891e90fe9e8e8.tar.gz libssh-f7448eeb1ce1cfc0b95766f52af891e90fe9e8e8.tar.xz libssh-f7448eeb1ce1cfc0b95766f52af891e90fe9e8e8.zip |
Fix sol8 + ss11 compile errors.
Thanks to tysonite@gmail.com.
-rw-r--r-- | include/libssh/priv.h | 12 | ||||
-rw-r--r-- | sample.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 51e89c6b..958b0d04 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -174,7 +174,11 @@ void hmac_final(HMACCTX ctx,unsigned char *hashmacbuf,unsigned int *len); struct string_struct { u32 size; unsigned char string[MAX_PACKET_LEN]; -} __attribute__ ((packed)); +} +#if !defined(__SUNPRO_C) +__attribute__ ((packed)) +#endif +; /** Describes a buffer state at a moment */ @@ -719,6 +723,12 @@ int match_hostname(const char *host, const char *pattern, unsigned int len); /* log.c */ +#ifndef __FUNCTION__ +#if defined(__SUNPRO_C) +#define __FUNCTION__ __func__ +#endif +#endif + #define _enter_function(sess) \ do {\ if((sess)->log_verbosity >= SSH_LOG_FUNCTIONS){ \ @@ -556,8 +556,10 @@ int main(int argc, char **argv){ else batch_shell(session); } +#ifdef WITH_SFTP else - do_sftp(session); + do_sftp(session); +#endif if(!sftp && !cmds[0]) do_cleanup(0); ssh_disconnect(session); |