port: namespace align.h with BT_ prefix

[babeltrace.git] / src / common / align.h

diff --git a/src/common/align.h b/src/common/align.h
index d27b5b5368cc8b4079cdb7be1a46fb8a3c0d8898..c76393f0618b7e08f7a50b4ff42987bd6f91b4db 100644 (file)
--- a/src/common/align.h
+++ b/src/common/align.h
@@ -26,24 +26,24 @@
 #include "compat/compiler.h"
 #include "compat/limits.h"
 
-#define ALIGN(x, a)            __ALIGN_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_MASK(x, mask)  (((x) + (mask)) & ~(mask))
-#define PTR_ALIGN(p, a)                ((typeof(p)) ALIGN((unsigned long) (p), a))
-#define ALIGN_FLOOR(x, a)      __ALIGN_FLOOR_MASK(x, (typeof(x)) (a) - 1)
-#define __ALIGN_FLOOR_MASK(x, mask)    ((x) & ~(mask))
-#define PTR_ALIGN_FLOOR(p, a) \
-                       ((typeof(p)) ALIGN_FLOOR((unsigned long) (p), a))
-#define IS_ALIGNED(x, a)       (((x) & ((typeof(x)) (a) - 1)) == 0)
+#define BT_ALIGN(x, a)         __BT_ALIGN_MASK(x, (typeof(x))(a) - 1)
+#define __BT_ALIGN_MASK(x, mask)       (((x) + (mask)) & ~(mask))
+#define BT_PTR_ALIGN(p, a)             ((typeof(p)) BT_ALIGN((unsigned long) (p), a))
+#define BT_ALIGN_FLOOR(x, a)   __BT_ALIGN_FLOOR_MASK(x, (typeof(x)) (a) - 1)
+#define __BT_ALIGN_FLOOR_MASK(x, mask) ((x) & ~(mask))
+#define BT_PTR_ALIGN_FLOOR(p, a) \
+                       ((typeof(p)) BT_ALIGN_FLOOR((unsigned long) (p), a))
+#define BT_IS_ALIGNED(x, a)    (((x) & ((typeof(x)) (a) - 1)) == 0)
 
 /*
  * Align pointer on natural object alignment.
  */
-#define object_align(obj)      PTR_ALIGN(obj, __alignof__(*(obj)))
-#define object_align_floor(obj)        PTR_ALIGN_FLOOR(obj, __alignof__(*(obj)))
+#define bt_object_align(obj)           BT_PTR_ALIGN(obj, __alignof__(*(obj)))
+#define bt_object_align_floor(obj)     BT_PTR_ALIGN_FLOOR(obj, __alignof__(*(obj)))
 
 /**
- * offset_align - Calculate the offset needed to align an object on its natural
- *                alignment towards higher addresses.
+ * bt_offset_align - Calculate the offset needed to align an object on its
+ *                   natural alignment towards higher addresses.
  * @align_drift:  object offset from an "alignment"-aligned address.
  * @alignment:    natural object alignment. Must be non-zero, power of 2.
  *
@@ -58,14 +58,14 @@
        })
 
 /**
- * offset_align_floor - Calculate the offset needed to align an object
- *                      on its natural alignment towards lower addresses.
+ * bt_offset_align_floor - Calculate the offset needed to align an object
+ *                         on its natural alignment towards lower addresses.
  * @align_drift:  object offset from an "alignment"-aligned address.
  * @alignment:    natural object alignment. Must be non-zero, power of 2.
  *
  * Returns the offset that must be substracted to align towards lower addresses.
  */
-#define offset_align_floor(align_drift, alignment)                            \
+#define bt_offset_align_floor(align_drift, alignment)                         \
        ({                                                                     \
                MAYBE_BUILD_BUG_ON((alignment) == 0                            \
                                   || ((alignment) & ((alignment) - 1)));      \