diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-12 22:24:39 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-13 02:29:25 +0000 |
| commit | e314c340736830a6fc0260cf72cc51ea0c227e9d (patch) | |
| tree | 60ff08a98cbb8c468d328b3f3f327581ca3e0c37 | |
| parent | 03ed5e990668a57836d599d2093e762813058362 (diff) | |
fix warnings on 32 bit builds
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
| -rw-r--r-- | include/openssl/e_os2.h | 6 | ||||
| -rw-r--r-- | test/dtlsv1listentest.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 04e1c05d8a..519b8ce65a 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -317,7 +317,11 @@ typedef unsigned __int64 uint64_t; * isn't available or did not define it, just go with hard-coded. */ # ifndef PRIu64 -# define PRIu64 "lu" +# ifdef SIXTY_FOUR_BIT_LONG +# define PRIu64 "lu" +# else +# define PRIu64 "llu" +# endif # endif /* ossl_inline: portable inline definition usable in public headers */ diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c index d12d93a22f..78ac83ab4a 100644 --- a/test/dtlsv1listentest.c +++ b/test/dtlsv1listentest.c @@ -377,7 +377,7 @@ int main(void) char *data; long datalen; int ret, success = 0; - size_t i; + long i; ctx = SSL_CTX_new(DTLS_server_method()); if (ctx == NULL || peer == NULL) @@ -397,7 +397,7 @@ int main(void) SSL_set_wbio(ssl, outbio); success = 1; - for (i = 0; i < OSSL_NELEM(testpackets) && success; i++) { + for (i = 0; i < (long)OSSL_NELEM(testpackets) && success; i++) { inbio = BIO_new_mem_buf((char *)testpackets[i].in, testpackets[i].inlen); if (inbio == NULL) { |