diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2002-05-15 02:29:22 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2002-05-15 02:29:22 +0000 |
| commit | 4df88d25cb3419048d1bcf9740d37d4c459aef22 (patch) | |
| tree | 97858aa44644bc9b64d1775a8bbccfb5baca24d3 /lib/libcrypto/bio/bss_bio.c | |
| parent | 998d0d156e423800e9a2fa1a482c0726f14201c2 (diff) | |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'lib/libcrypto/bio/bss_bio.c')
| -rw-r--r-- | lib/libcrypto/bio/bss_bio.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c index 78c6ab4fdd9..a5da4730317 100644 --- a/lib/libcrypto/bio/bss_bio.c +++ b/lib/libcrypto/bio/bss_bio.c @@ -22,7 +22,12 @@ #include <openssl/err.h> #include <openssl/crypto.h> -#include "openssl/e_os.h" +#include "e_os.h" + +/* VxWorks defines SSIZE_MAX with an empty value causing compile errors */ +#if defined(OPENSSL_SYS_VSWORKS) +# undef SSIZE_MAX +#endif #ifndef SSIZE_MAX # define SSIZE_MAX INT_MAX #endif @@ -474,7 +479,8 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr) break; case BIO_C_GET_WRITE_BUF_SIZE: - num = (long) b->size; + ret = (long) b->size; + break; case BIO_C_MAKE_BIO_PAIR: { |