diff --git a/lsh/src/argp/argp-fmtstream.c b/lsh/src/argp/argp-fmtstream.c index af607ae..53f595b 100755 --- a/lsh/src/argp/argp-fmtstream.c +++ b/lsh/src/argp/argp-fmtstream.c @@ -389,6 +389,8 @@ __argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...) weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) #endif +#if __MC68K__ + /* Duplicate the inline definitions in argp-fmtstream.h, for compilers * that don't do inlining. */ size_t @@ -472,4 +474,6 @@ __argp_fmtstream_point (argp_fmtstream_t __fs) return __fs->point_col >= 0 ? __fs->point_col : 0; } +#endif /* __MC68K__ */ + #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ diff --git a/macssh/source/parse/authencrypt.c b/macssh/source/parse/authencrypt.c index 2d3c635..fbe66c5 100755 --- a/macssh/source/parse/authencrypt.c +++ b/macssh/source/parse/authencrypt.c @@ -390,7 +390,7 @@ short encrypt_suboption (tnParams **aedata, unsigned char *subbuffer, long suble } -void decrypt (tnParams *tn, unsigned char *buf, long len) +void kdecrypt (tnParams *tn, unsigned char *buf, long len) { short s; @@ -412,7 +412,7 @@ void decrypt (tnParams *tn, unsigned char *buf, long len) } -void encrypt (tnParams *tn, unsigned char *buf, long len) +void kencrypt (tnParams *tn, unsigned char *buf, long len) { tn->data = len; tn->ebuf = buf; diff --git a/macssh/source/parse/authencrypt.proto.h b/macssh/source/parse/authencrypt.proto.h index c1c1ed4..061b73a 100755 --- a/macssh/source/parse/authencrypt.proto.h +++ b/macssh/source/parse/authencrypt.proto.h @@ -5,8 +5,8 @@ Boolean auth_encrypt_init(void); void auth_suboption(tnParams **aedata, unsigned char *subbuffer, long sublength, unsigned char *sendbuffer, unsigned long *sendlength, char *cname, Boolean hisencrypt, Boolean myencrypt, unsigned short port, Boolean forward, char *username); void auth_encrypt_end(tnParams **aedata); short encrypt_suboption(tnParams **aedata, unsigned char *subbuffer, long sublength, unsigned char *sendbuffer, unsigned long *sendlength, char *cname, Boolean hisencrypt, Boolean myencrypt); -void decrypt(tnParams *tn, unsigned char *buf, long value); -void encrypt(tnParams *tn, unsigned char *buf, long len); +void kdecrypt(tnParams *tn, unsigned char *buf, long value); +void kencrypt(tnParams *tn, unsigned char *buf, long len); void qlink(void **flist, void *fentry); void *qunlink(void **flist, void *fentry); void DestroyTickets(void); \ No newline at end of file