X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Falign.h;h=8f227eb9ecb49b04cd4d48f1ef763c4a8d6acabb;hb=d63241543f82756a2fcdaeb05db54f77e688024c;hp=1b8810599382eb20db273d11d8e8c381055626de;hpb=d2428e875af8666473fb689429eaf1022862510d;p=lttng-ust.git

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 1b881059..8f227eb9 100644
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -33,9 +33,13 @@
 #define PAGE_SIZE		sysconf(_SC_PAGE_SIZE)
 #endif
 
+#ifndef PAGE_MASK	/* FreeBSD and macOS defines their own PAGE_MASK. */
 #define PAGE_MASK		(~(PAGE_SIZE - 1))
+#endif
 #define __ALIGN_MASK(v, mask)	(((v) + (mask)) & ~(mask))
+#ifndef ALIGN		/* FreeBSD and macOS defines their own ALIGN. */
 #define ALIGN(v, align)		__ALIGN_MASK(v, (__typeof__(v)) (align) - 1)
+#endif
 #define PAGE_ALIGN(addr)	ALIGN(addr, PAGE_SIZE)
 
 /**
@@ -66,7 +70,7 @@
 	({								       \
 		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
-		(((align_drift) - (alignment)) & ((alignment) - 1);	       \
+		(((align_drift) - (alignment)) & ((alignment) - 1));	       \
 	})
 
 #endif /* _UST_ALIGN_H */