summaryrefslogtreecommitdiffstats
path: root/crypto/cryptlib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-05-13 18:47:13 +0200
committerDr. Stephen Henson <steve@openssl.org>2015-05-14 03:06:17 +0200
commit1c7b2c0ed5d02d0d60179e0df0c49ef3f659fa77 (patch)
tree52805eb42218a21d4127faa2b154fe95a3b14a90 /crypto/cryptlib.c
parentAllow use of standard integer types. (diff)
downloadopenssl-1c7b2c0ed5d02d0d60179e0df0c49ef3f659fa77.tar.xz
openssl-1c7b2c0ed5d02d0d60179e0df0c49ef3f659fa77.zip
use unit64_t for CPUID and timestamp code
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/cryptlib.c')
-rw-r--r--crypto/cryptlib.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 3742ff2947..69883ab929 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -134,11 +134,7 @@ unsigned int *OPENSSL_ia32cap_loc(void)
# if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
# define OPENSSL_CPUID_SETUP
-# if defined(_WIN32)
-typedef unsigned __int64 IA32CAP;
-# else
-typedef unsigned long long IA32CAP;
-# endif
+typedef uint64_t IA32CAP;
void OPENSSL_cpuid_setup(void)
{
static int trigger = 0;