Move compat macros in 'lttng/align.h' to a private header

[lttng-ust.git] / include / lttng / align.h

diff --git a/include/lttng/align.h b/include/lttng/align.h
index e46c03015b39aa712024d45111ef93d44d8278b8..6384a00a7c4d86acaf37b9a1e5e92aa4f54cec8e 100644 (file)
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -4,30 +4,10 @@
  * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _UST_ALIGN_H
-#define _UST_ALIGN_H
+#ifndef _LTTNG_ALIGN_H
+#define _LTTNG_ALIGN_H
 
 #include <lttng/bug.h>
-#include <unistd.h>
-#include <limits.h>
-
-#ifdef __FreeBSD__
-#include <machine/param.h>
-#endif
-
-#ifdef _SC_PAGE_SIZE
-#define LTTNG_UST_PAGE_SIZE    sysconf(_SC_PAGE_SIZE)
-#elif defined(PAGE_SIZE)
-#define LTTNG_UST_PAGE_SIZE    PAGE_SIZE
-#else
-#error "Please add page size detection for your OS."
-#endif
-
-#define LTTNG_UST_PAGE_MASK    (~(LTTNG_UST_PAGE_SIZE - 1))
-
-#define __LTTNG_UST_ALIGN_MASK(v, mask)        (((v) + (mask)) & ~(mask))
-#define LTTNG_UST_ALIGN(v, align)      __LTTNG_UST_ALIGN_MASK(v, (__typeof__(v)) (align) - 1)
-#define LTTNG_UST_PAGE_ALIGN(addr)     LTTNG_UST_ALIGN(addr, LTTNG_UST_PAGE_SIZE)
 
 /**
  * lttng_ust_offset_align - Calculate the offset needed to align an object on
@@ -60,36 +40,4 @@
                (((align_drift) - (alignment)) & ((alignment) - 1));           \
        })
 
-/*
- * Non-namespaced defines for backwards compatibility,
- * introduced in 2.13, should be removed in the future.
- */
-
-/* Cygwin limits.h defines its own PAGE_SIZE */
-#ifndef PAGE_SIZE
-#define PAGE_SIZE      LTTNG_UST_PAGE_SIZE
-#endif
-
-/* FreeBSD and macOS defines their own PAGE_MASK. */
-#ifndef PAGE_MASK
-#define PAGE_MASK      LTTNG_UST_PAGE_MASK
-#endif
-
-/* FreeBSD machine/param.h defines its own ALIGN */
-#ifndef ALIGN
-#define ALIGN          LTTNG_UST_ALIGN
-#endif
-
-#ifndef PAGE_ALIGN
-#define PAGE_ALIGN     LTTNG_UST_PAGE_ALIGN
-#endif
-
-#ifndef offset_align
-#define offset_align lttng_ust_offset_align
-#endif
-
-#ifndef offset_align_floor
-#define offset_align_floor lttng_ust_offset_align_floor
-#endif
-
-#endif /* _UST_ALIGN_H */
+#endif /* _LTTNG_ALIGN_H */