From c23885c1923c1b7d7fd6d503aa67d12d0254f629 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 31 Jul 2022 21:32:19 +0000 Subject: [PATCH] Fix build on arm32 (#1108) On arm32, size_t and long are 32 bits in size, exposing these bugs. --- src/security/PeerOptions.cc | 2 +- src/tests/stub_libstore.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc index 257ad28d27..ff78a6e2ee 100644 --- a/src/security/PeerOptions.cc +++ b/src/security/PeerOptions.cc @@ -334,7 +334,7 @@ static struct ssl_option { #endif #if defined(SSL_OP_ALL) { - "ALL", (long)SSL_OP_ALL + "ALL", SSL_OP_ALL }, #endif #if defined(SSL_OP_SINGLE_DH_USE) diff --git a/src/tests/stub_libstore.cc b/src/tests/stub_libstore.cc index edc0c35467..66fce2d89f 100644 --- a/src/tests/stub_libstore.cc +++ b/src/tests/stub_libstore.cc @@ -145,7 +145,7 @@ StoreSearch *NewLocalSearch() STUB_RETVAL(nullptr) #include "store/SwapMetaIn.h" size_t Store::UnpackSwapMetaSize(const SBuf &) STUB_RETVAL(0) -uint64_t Store::UnpackIndexSwapMeta(const MemBuf &, StoreEntry &, cache_key *) STUB_RETVAL(0) +size_t Store::UnpackIndexSwapMeta(const MemBuf &, StoreEntry &, cache_key *) STUB_RETVAL(0) void Store::UnpackHitSwapMeta(char const *, ssize_t, StoreEntry &) STUB #include "store/SwapMetaOut.h" -- 2.47.2