[master] eccb26a Revert alignment to sizeof(void*). When I have a chance, I'll add the necessary #ifdef for the sparc64/32bit_userland thing.

Poul-Henning Kamp phk at FreeBSD.org
Fri May 22 16:36:06 CEST 2015


commit eccb26ae2f1bfb8c842943042c880e0812b88ab5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri May 22 14:35:23 2015 +0000

    Revert alignment to sizeof(void*).  When I have a chance, I'll add
    the necessary #ifdef for the sparc64/32bit_userland thing.

diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index b7b6c25..b268082 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -130,7 +130,7 @@ void VSM_common_ageupdate(const struct vsm_sc *sc);
  * Pointer aligment magic
  */
 
-#define PALGN	    (sizeof(uintmax_t) - 1)	/* size of alignment */
+#define PALGN	    (sizeof(void *) - 1)	/* size of alignment */
 #define PAOK(p)	    (((uintptr_t)(p) & PALGN) == 0)	/* is aligned */
 #define PRNDDN(p)   ((uintptr_t)(p) & ~PALGN)		/* Round down */
 #define PRNDUP(p)   (((uintptr_t)(p) + PALGN) & ~PALGN)	/* Round up */



More information about the varnish-commit mailing list