From: Max Bachmann <kontakt@maxbachmann.de>
Date: Thu, 7 Dec 2023 02:48:58 +0000 (+0100)
Subject: remove duplicated typedef for u64
X-Git-Tag: openssl-3.3.0-alpha1~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84356a02fe248cfd490b6ee2fa269c09410a5afb;p=thirdparty%2Fopenssl.git

remove duplicated typedef for u64

This typedef is already created in aes_local.h as `typedef uint64_t u64;`.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22969)
---

diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 8e54e80a6c9..3e5b24ed193 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -81,13 +81,10 @@ static void prefetch256(const void *table)
 #define GETU32(p) (*((u32*)(p)))
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-typedef unsigned __int64 u64;
 #define U64(C)  C##UI64
 #elif defined(__arch64__)
-typedef unsigned long u64;
 #define U64(C)  C##UL
 #else
-typedef unsigned long long u64;
 #define U64(C)  C##ULL
 #endif