cleanup: Remove redefinition of CHAR_BIT

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

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index dafb69349caead11160faafd82069a12662f4be0..b451eae626f427058cd0e77dc686b2a31795a705 100644 (file)
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -1,39 +1,29 @@
-#ifndef _LTTNG_TRACER_H
-#define _LTTNG_TRACER_H
-
 /*
- * Copyright (C) 2005-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This contains the core definitions for the Linux Trace Toolkit.
+ * SPDX-License-Identifier: MIT
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * This contains the core definitions for the Linux Trace Toolkit.
  */
 
-#include <lttng/config.h>
+#ifndef _LTTNG_UST_TRACER_H
+#define _LTTNG_UST_TRACER_H
+
+#include <lttng/ust-arch.h>
+#include <lttng/ust-compiler.h>
+#include <lttng/ust-config.h>
+#include <lttng/ust-utils.h>
 #include <lttng/ust-version.h>
 
-#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
+#ifndef LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
 /* Align data on its natural alignment */
 #define RING_BUFFER_ALIGN
 #endif
 
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
-#endif
-
 #ifdef RING_BUFFER_ALIGN
 #define lttng_alignof(type)    __alignof__(type)
 #else
 #define lttng_alignof(type)    1
 #endif
 
-#define lttng_is_signed_type(type)           (((type)(-1)) < 0)
-
-#endif /* _LTTNG_TRACER_CORE_H */
+#endif /* _LTTNG_UST_TRACER_H */