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 234e75c084a2d47fbfe3226c63b06605875eb8d5..b451eae626f427058cd0e77dc686b2a31795a705 100644 (file)
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -1,47 +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 library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * This contains the core definitions for the Linux Trace Toolkit.
  */
 
-#include <lttng/config.h>
+#ifndef _LTTNG_UST_TRACER_H
+#define _LTTNG_UST_TRACER_H
 
-#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
+#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 LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
 /* Align data on its natural alignment */
 #define RING_BUFFER_ALIGN
 #endif
 
-#define LTTNG_UST_VERSION 0
-#define LTTNG_UST_PATCHLEVEL 9
-#define LTTNG_UST_SUBLEVEL 1
-
-#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 */