.gitignore: add some more IDE / tools related file

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

diff --git a/src/common/align.h b/src/common/align.h
index 0d4c0150aed189cb7f14bf49308fddc783cf0920..bf8acd6e4aef1b300e8f18cc37741ff1b0627f0a 100644 (file)
--- a/src/common/align.h
+++ b/src/common/align.h
@@ -4,8 +4,8 @@
  * Copyright 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _BABELTRACE_ALIGN_H
-#define _BABELTRACE_ALIGN_H
+#ifndef BABELTRACE_COMMON_ALIGN_H
+#define BABELTRACE_COMMON_ALIGN_H
 
 #include "compat/compiler.h"
 #include "compat/limits.h"
@@ -19,41 +19,4 @@
                        ((__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 bt_object_align(obj)           BT_PTR_ALIGN(obj, __alignof__(*(obj)))
-#define bt_object_align_floor(obj)     BT_PTR_ALIGN_FLOOR(obj, __alignof__(*(obj)))
-
-/**
- * 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.
- *
- * Returns the offset that must be added to align towards higher
- * addresses.
- */
-#define offset_align(align_drift, alignment)                                  \
-       ({                                                                     \
-               MAYBE_BUILD_BUG_ON((alignment) == 0                            \
-                                  || ((alignment) & ((alignment) - 1)));      \
-               (((alignment) - (align_drift)) & ((alignment) - 1));           \
-       })
-
-/**
- * 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 bt_offset_align_floor(align_drift, alignment)                         \
-       ({                                                                     \
-               MAYBE_BUILD_BUG_ON((alignment) == 0                            \
-                                  || ((alignment) & ((alignment) - 1)));      \
-               (((align_drift) - (alignment)) & ((alignment) - 1));           \
-       })
-
-#endif /* _BABELTRACE_ALIGN_H */
+#endif /* BABELTRACE_COMMON_ALIGN_H */