From: Richard Levitte <levitte@openssl.org>
Date: Mon, 6 Sep 2021 11:40:43 +0000 (+0200)
Subject: VMS: Compensate for compiler type incompatibility
X-Git-Tag: OpenSSL_1_1_1m~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e5cdbc18a1a26bfc817070a52689886fa0669c2;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index 61c2f102997..fe516c3ca56 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 };
 
     /*