projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port: Silence macro redefinition warnings on FreeBSD
[lttng-ust.git]
/
include
/
lttng
/
align.h
diff --git
a/include/lttng/align.h
b/include/lttng/align.h
index 1b8810599382eb20db273d11d8e8c381055626de..8f227eb9ecb49b04cd4d48f1ef763c4a8d6acabb 100644
(file)
--- a/
include/lttng/align.h
+++ b/
include/lttng/align.h
@@
-33,9
+33,13
@@
#define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
#endif
#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))
#define PAGE_MASK (~(PAGE_SIZE - 1))
+#endif
#define __ALIGN_MASK(v, mask) (((v) + (mask)) & ~(mask))
#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)
#define ALIGN(v, align) __ALIGN_MASK(v, (__typeof__(v)) (align) - 1)
+#endif
#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
/**
#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
/**
@@
-66,7
+70,7
@@
({ \
LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \
|| ((alignment) & ((alignment) - 1))); \
({ \
LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \
|| ((alignment) & ((alignment) - 1))); \
- (((align_drift) - (alignment)) & ((alignment) - 1)
;
\
+ (((align_drift) - (alignment)) & ((alignment) - 1)
);
\
})
#endif /* _UST_ALIGN_H */
})
#endif /* _UST_ALIGN_H */
This page took
0.028074 seconds
and
4
git commands to generate.