X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Falign.h;h=6384a00a7c4d86acaf37b9a1e5e92aa4f54cec8e;hb=0af0bdb2f1059112521da3e2d067262f78e783d7;hp=94d0d6e3f3adb02ae03524f245e70d85ac1bfb53;hpb=a60d70e608a727038ebc27e493aac65b49932146;p=lttng-ust.git

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 94d0d6e3..6384a00a 100644
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -1,58 +1,43 @@
-#ifndef _UST_ALIGN_H
-#define _UST_ALIGN_H
-
 /*
- * lttng/align.h
- *
- * (C) Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <lttng/bug.h>
+#ifndef _LTTNG_ALIGN_H
+#define _LTTNG_ALIGN_H
 
-/*
- * 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)))
+#include <lttng/bug.h>
 
 /**
- * offset_align - Calculate the offset needed to align an object on its natural
- *                alignment towards higher addresses.
+ * lttng_ust_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)				       \
+#define lttng_ust_offset_align(align_drift, alignment)			       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
 		(((alignment) - (align_drift)) & ((alignment) - 1));	       \
 	})
 
 /**
- * offset_align_floor - Calculate the offset needed to align an object
- *                      on its natural alignment towards lower addresses.
+ * lttng_ust_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 lttng_ust_offset_align_floor(align_drift, alignment)		       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		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 /* _LTTNG_ALIGN_H */