From 2adb7ad28124fdbc0ad61bcada1c7dbceb03e9ab Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 17 Mar 2021 16:07:10 -0400
Subject: [PATCH] ust-elf.h should be private, with public symbols

The symbols belonging to ust-elf.h need to be public, because
liblttng-ust-dl uses them, but the header per se should be internal.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I04495249c0c8b80b251dbf2a7f5488d093a6d999
---
 include/Makefile.am                | 2 +-
 include/{lttng => }/ust-elf.h      | 0
 liblttng-ust-dl/lttng-ust-dl.c     | 2 +-
 liblttng-ust/lttng-ust-elf.c       | 2 +-
 liblttng-ust/lttng-ust-statedump.c | 2 +-
 tests/unit/ust-elf/ust-elf.c       | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/{lttng => }/ust-elf.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 9fa16492..420ce3db 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -31,7 +31,6 @@ nobase_include_HEADERS = \
 	lttng/lttng-ust-tracelog.h \
 	lttng/ust-clock.h \
 	lttng/ust-getcpu.h \
-	lttng/ust-elf.h \
 	lttng/ust-libc-wrapper.h \
 	lttng/urcu/pointer.h \
 	lttng/urcu/urcu-ust.h \
@@ -54,6 +53,7 @@ noinst_HEADERS = \
 	ust-bitmap.h \
 	ust-comm.h \
 	ust-compat.h \
+	ust-elf.h \
 	ust-tid.h \
 	ust-bitfield.h \
 	ust-dlfcn.h \
diff --git a/include/lttng/ust-elf.h b/include/ust-elf.h
similarity index 100%
rename from include/lttng/ust-elf.h
rename to include/ust-elf.h
diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 7d78f1d0..657c27cc 100644
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 
 #include <ust-dlfcn.h>
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include <lttng/ust-events.h>
 #include <ust-helper.h>
 #include "usterr-signal-safe.h"
diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index fc4029c9..ebc231e0 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <ust-helper.h>
 #include <lttng/align.h>
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 91d8e279..98b80b35 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include <ust-helper.h>
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
diff --git a/tests/unit/ust-elf/ust-elf.c b/tests/unit/ust-elf/ust-elf.c
index 3ab1573e..a1230b20 100644
--- a/tests/unit/ust-elf/ust-elf.c
+++ b/tests/unit/ust-elf/ust-elf.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <lttng/ust-elf.h>
+#include <ust-elf.h>
 #include "tap.h"
 
 #define NUM_ARCH 4
-- 
2.34.1