[master] 648b6895f 32-bit polish for previous commit.

Poul-Henning Kamp phk at FreeBSD.org
Tue Dec 6 13:55:06 UTC 2022


commit 648b6895fb76abfeafb44b203afbd1cf4bd3ba55
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 6 13:54:02 2022 +0000

    32-bit polish for previous commit.

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 42d4b9337..5242b0726 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -76,7 +76,7 @@ static vlu_f vsm_vlu_func;
 #define VSM_PRIV_SHIFT							\
 	(sizeof (uint64_t) * 4)
 #define VSM_PRIV_MASK							\
-	((1UL << VSM_PRIV_SHIFT) - 1)
+	((1ULL << VSM_PRIV_SHIFT) - 1)
 #define VSM_PRIV_LOW(u)							\
 	((uint64_t)(u) & VSM_PRIV_MASK)
 #define VSM_PRIV_HIGH(u)						\
@@ -792,7 +792,7 @@ vsm_findseg(const struct vsm *vd, const struct vsm_fantom *vf)
 {
 	struct vsm_set *vs;
 	struct vsm_seg *vg;
-	uintptr_t x;
+	uint64_t x;
 
 	x = VSM_PRIV_HIGH(vf->priv);
 	if (x == vd->serial) {


More information about the varnish-commit mailing list