summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ce3d25d)
Removes SSIZE_MAX definition from bss_bio.c and changes that file to use
OSSL_SSIZE_MAX.
No need to account for OPENSSL_SYS_VXWORKS, since that never actually
gets defined anywhere. It must be a historical artifact.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Ben Laurie <ben@openssl.org>
-/* VxWorks defines SSIZE_MAX with an empty value causing compile errors */
-#if defined(OPENSSL_SYS_VXWORKS)
-# undef SSIZE_MAX
-#endif
-#ifndef SSIZE_MAX
-# define SSIZE_MAX INT_MAX
-#endif
-
static int bio_new(BIO *bio);
static int bio_free(BIO *bio);
static int bio_read(BIO *bio, char *buf, int size);
static int bio_new(BIO *bio);
static int bio_free(BIO *bio);
static int bio_read(BIO *bio, char *buf, int size);
struct bio_bio_st *b, *peer_b;
ossl_ssize_t num, available;
struct bio_bio_st *b, *peer_b;
ossl_ssize_t num, available;
- if (num_ > SSIZE_MAX)
- num = SSIZE_MAX;
+ if (num_ > OSSL_SSIZE_MAX)
+ num = OSSL_SSIZE_MAX;
else
num = (ossl_ssize_t) num_;
else
num = (ossl_ssize_t) num_;
struct bio_bio_st *b;
ossl_ssize_t num, space;
struct bio_bio_st *b;
ossl_ssize_t num, space;
- if (num_ > SSIZE_MAX)
- num = SSIZE_MAX;
+ if (num_ > OSSL_SSIZE_MAX)
+ num = OSSL_SSIZE_MAX;
else
num = (ossl_ssize_t) num_;
else
num = (ossl_ssize_t) num_;
# ifdef _WIN32
# ifdef _WIN64
# define ossl_ssize_t __int64
# ifdef _WIN32
# ifdef _WIN64
# define ossl_ssize_t __int64
+# define OSSL_SSIZE_MAX _I64_MAX
# else
# define ossl_ssize_t int
# else
# define ossl_ssize_t int
+# define OSSL_SSIZE_MAX INT_MAX
# endif
# endif
# if defined(__ultrix) && !defined(ssize_t)
# define ossl_ssize_t int
# endif
# endif
# if defined(__ultrix) && !defined(ssize_t)
# define ossl_ssize_t int
+# define OSSL_SSIZE_MAX INT_MAX
# endif
# ifndef ossl_ssize_t
# define ossl_ssize_t ssize_t
# endif
# ifndef ossl_ssize_t
# define ossl_ssize_t ssize_t
+# define OSSL_SSIZE_MAX SSIZE_MAX
# endif
# ifdef DEBUG_UNUSED
# endif
# ifdef DEBUG_UNUSED