Fix build on arm32 (#1108)

On arm32, size_t and long are 32 bits in size, exposing these bugs.

diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc
index 257ad28d27ebc60c3ac0823bfcfa30950e49c7c3..ff78a6e2ee59692d8c4d032316553ac0173ee44b 100644 (file)
--- 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 edc0c35467bc663fe6171a00b4180b78c09db1a0..66fce2d89fec033a52568d00f5716d34afea9a37 100644 (file)
--- 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"