Fix sol8 + ss11 compile errors.

Thanks to tysonite@gmail.com.
This commit is contained in:
Andreas Schneider
2009-07-20 22:50:45 +02:00
parent 2aec79ce36
commit 8843d8b68d
2 changed files with 14 additions and 2 deletions

View File

@@ -175,7 +175,11 @@ void hmac_final(HMACCTX ctx,unsigned char *hashmacbuf,unsigned int *len);
struct string_struct { struct string_struct {
u32 size; u32 size;
unsigned char string[MAX_PACKET_LEN]; unsigned char string[MAX_PACKET_LEN];
} __attribute__ ((packed)); }
#if !defined(__SUNPRO_C)
__attribute__ ((packed))
#endif
;
/** Describes a buffer state at a moment /** Describes a buffer state at a moment
*/ */
@@ -804,6 +808,12 @@ int ssh_execute_message_callbacks(SSH_SESSION *session);
/* log.c */ /* log.c */
#ifndef __FUNCTION__
#if defined(__SUNPRO_C)
#define __FUNCTION__ __func__
#endif
#endif
#define _enter_function(sess) \ #define _enter_function(sess) \
do {\ do {\
if((sess)->log_verbosity >= SSH_LOG_FUNCTIONS){ \ if((sess)->log_verbosity >= SSH_LOG_FUNCTIONS){ \

View File

@@ -555,8 +555,10 @@ int main(int argc, char **argv){
else else
batch_shell(session); batch_shell(session);
} }
#ifdef WITH_SFTP
else else
do_sftp(session); do_sftp(session);
#endif
if(!sftp && !cmds[0]) if(!sftp && !cmds[0])
do_cleanup(0); do_cleanup(0);
ssh_disconnect(session); ssh_disconnect(session);