Skip to content

Commit 4279674

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23761: build: use __SIZEOF_INT128__ for checking __int128 availability
e9440ae build: use __SIZEOF_INT128__ for checking __int128 availability (fanquake) Pull request description: We already use this in the blockfilter code, https://github.com/bitcoin/bitcoin/blob/bf66e258a84e18935fde3ebb9a4b0392bf883222/src/blockfilter.cpp#L34-L36 so not sure we need to maintain two different ways of testing for the same functionality. Consolidate on testing for `__SIZEOF_INT128__`, which we already use, is supported by the compilers we care about, and is also used by libsecp256k1. ACKs for top commit: sipa: utACK e9440ae Zero-1729: crACK e9440ae Tree-SHA512: 8aeef1734486a863b5091123bb5f9ba8868b1e2b4b35114586e3eb5862a38d4a1518ed069f37f41cb5e5ce2f6c87d95671996366d5ee990e0c90f268a8978ba3
2 parents c8fac37 + e9440ae commit 4279674

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -837,9 +837,6 @@ if test "$use_lcov_branch" != "no"; then
837837
AC_SUBST(LCOV_OPTS, "$LCOV_OPTS --rc lcov_branch_coverage=1")
838838
fi
839839

840-
dnl Check for __int128
841-
AC_CHECK_TYPES([__int128])
842-
843840
dnl Check for endianness
844841
AC_C_BIGENDIAN
845842

src/crypto/muhash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Num3072
2424
public:
2525
static constexpr size_t BYTE_SIZE = 384;
2626

27-
#ifdef HAVE___INT128
27+
#ifdef __SIZEOF_INT128__
2828
typedef unsigned __int128 double_limb_t;
2929
typedef uint64_t limb_t;
3030
static constexpr int LIMBS = 48;

0 commit comments

Comments
 (0)