From 73f94b3ce6a9531a7c4d8b178b417fa58da35d66 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 17 Mar 2021 15:19:37 -0400 Subject: [PATCH] Namespace lttng/bug.h as lttng/ust-bug.h Since the 'lttng/' header directory is shared between ust and tools, namespace this common name header with 'ust-' to match the same pattern as the other files. Change-Id: I08e853d9edcce218a9bd57717316a557f49200d7 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/Makefile.am | 2 +- include/lttng/align.h | 2 +- include/lttng/{bug.h => ust-bug.h} | 4 ++-- liblttng-ust/lttng-tracer-core.h | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) rename include/lttng/{bug.h => ust-bug.h} (95%) diff --git a/include/Makefile.am b/include/Makefile.am index 420ce3db..a113bf13 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,7 +23,7 @@ nobase_include_HEADERS = \ lttng/ust-endian.h \ lttng/ringbuffer-context.h \ lttng/align.h \ - lttng/bug.h \ + lttng/ust-bug.h \ lttng/ust-error.h \ lttng/tracef.h \ lttng/lttng-ust-tracef.h \ diff --git a/include/lttng/align.h b/include/lttng/align.h index 6384a00a..fbe87f19 100644 --- a/include/lttng/align.h +++ b/include/lttng/align.h @@ -7,7 +7,7 @@ #ifndef _LTTNG_ALIGN_H #define _LTTNG_ALIGN_H -#include +#include /** * lttng_ust_offset_align - Calculate the offset needed to align an object on diff --git a/include/lttng/bug.h b/include/lttng/ust-bug.h similarity index 95% rename from include/lttng/bug.h rename to include/lttng/ust-bug.h index c1a7c793..0b388c14 100644 --- a/include/lttng/bug.h +++ b/include/lttng/ust-bug.h @@ -4,8 +4,8 @@ * Copyright (C) 2010-2011 Mathieu Desnoyers */ -#ifndef _LTTNG_BUG_H -#define _LTTNG_BUG_H +#ifndef _LTTNG_UST_BUG_H +#define _LTTNG_UST_BUG_H #include #include diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h index 2ab8bc7c..a292dae5 100644 --- a/liblttng-ust/lttng-tracer-core.h +++ b/liblttng-ust/lttng-tracer-core.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include -- 2.34.1