diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-05-02 13:09:04 +0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-05-02 13:09:04 +0400 |
| commit | 6ef9d8328bd09d3b6a19be83bf46724c806cb1ce (patch) | |
| tree | 69d41b8bec58f00e593b1aa419a3eb378321ff32 /crypto/bio | |
| parent | 5a9c441c6e739ef0e3585e7aaa544fdf074a1ad4 (diff) | |
Merge in changes from the 0.9.6-stable branch.
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/b_print.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index b4f7a85f2e..91a049406e 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -109,7 +109,11 @@ #endif #if HAVE_LONG_LONG -#define LLONG long long +# if defined(WIN32) && !defined(__GNUC__) +# define LLONG _int64 +# else +# define LLONG long long +# endif #else #define LLONG long #endif @@ -152,7 +156,7 @@ static void _dopr(char **sbuffer, char **buffer, /* some handy macros */ #define char_to_int(p) (p - '0') -#define MAX(p,q) ((p >= q) ? p : q) +#define OSSL_MAX(p,q) ((p >= q) ? p : q) static void _dopr( @@ -503,13 +507,13 @@ fmtint( convert[place] = 0; zpadlen = max - place; - spadlen = min - MAX(max, place) - (signvalue ? 1 : 0); + spadlen = min - OSSL_MAX(max, place) - (signvalue ? 1 : 0); if (zpadlen < 0) zpadlen = 0; if (spadlen < 0) spadlen = 0; if (flags & DP_F_ZERO) { - zpadlen = MAX(zpadlen, spadlen); + zpadlen = OSSL_MAX(zpadlen, spadlen); spadlen = 0; } if (flags & DP_F_MINUS) @@ -641,7 +645,7 @@ fmtfp( (caps ? "0123456789ABCDEF" : "0123456789abcdef")[fracpart % 10]; fracpart = (fracpart / 10); - } while (fracpart && (fplace < 20)); + } while (fplace < max); if (fplace == 20) fplace--; fconvert[fplace] = 0; |