summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-09-06 13:40:43 +0200
committerRichard Levitte <levitte@openssl.org>2021-09-07 23:32:37 +0200
commit2e5cdbc18a1a26bfc817070a52689886fa0669c2 (patch)
tree201b7418479fef769c086474723e0547e080e7f1
parented96022218e71efcf50c69cd6997ed85a2c37ffe (diff)
VMS: Compensate for compiler type incompatibility
The compiler says that 'unsigned long long' isn't the same as 'unsigned __int64'. Sure, and considering that crypto/rand/rand_vms.c is specific VMS only code, it's easy to just change the type to the exact same as what's specified in the system headers. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15613)
-rw-r--r--crypto/rand/rand_vms.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index 61c2f10299..fe516c3ca5 100644
--- a/crypto/rand/rand_vms.c
+++ b/crypto/rand/rand_vms.c
@@ -484,7 +484,7 @@ int rand_pool_add_nonce_data(RAND_POOL *pool)
struct {
pid_t pid;
CRYPTO_THREAD_ID tid;
- uint64_t time;
+ unsigned __int64_t time;
} data = { 0 };
/*
@@ -582,7 +582,7 @@ int rand_pool_add_additional_data(RAND_POOL *pool)
{
struct {
CRYPTO_THREAD_ID tid;
- uint64_t time;
+ unsigned __int64_t time;
} data = { 0 };
/*