From 9599289ae03639bf829f8fdb80ac3280ab9e1628 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 8 Oct 2013 13:10:16 -0700 Subject: [PATCH] Use HAVE_TI_MODE in portable-jane.h to use (or not) int128_t --- .../poly1305/donna/portable-jane.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/libsodium/crypto_onetimeauth/poly1305/donna/portable-jane.h b/src/libsodium/crypto_onetimeauth/poly1305/donna/portable-jane.h index 309d46d1..e4a01162 100644 --- a/src/libsodium/crypto_onetimeauth/poly1305/donna/portable-jane.h +++ b/src/libsodium/crypto_onetimeauth/poly1305/donna/portable-jane.h @@ -669,21 +669,9 @@ /* 0400-uint128-100-clang.h */ -#if defined(CPU_64BITS) && (defined(COMPILER_CLANG) && (COMPILER_CLANG >= 30100)) - #define HAVE_NATIVE_UINT128 - typedef unsigned __int128 uint128_t; -#endif - -/* 0400-uint128-100-gcc.h */ - -#if (defined(CPU_64BITS) && defined(COMPILER_GCC)) && (!defined(COMPILER_CLANG) || (COMPILER_CLANG < 30100)) - #if defined(__SIZEOF_INT128__) - #define HAVE_NATIVE_UINT128 - typedef unsigned __int128 uint128_t; - #elif (COMPILER_GCC >= 40400) - #define HAVE_NATIVE_UINT128 - typedef unsigned uint128_t __attribute__((mode(TI))); - #endif +#ifdef HAVE_TI_MODE +# define HAVE_NATIVE_UINT128 +typedef unsigned uint128_t __attribute__((mode(TI))); #endif /* 0400-uint128-100-msvc.h */