From 6bd9392ed14dabcfadc64772e972c76e8752c199 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 6 Apr 2021 16:45:50 -0400 Subject: [PATCH] Move wait.h to 'src/common/' It defines a generic macro that is only currently used in liblttng-ust-ctl. Change-Id: I9ed217176cf261f4fc410ba1655d0e9c0bf9ff07 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- src/common/Makefile.am | 3 ++- src/{lib/lttng-ust => common}/wait.h | 0 src/lib/lttng-ust-ctl/ustctl.c | 2 +- src/lib/lttng-ust/Makefile.am | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{lib/lttng-ust => common}/wait.h (100%) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6e155f7d..177ef070 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -16,7 +16,8 @@ noinst_HEADERS = \ macros.h \ patient.h \ procname.h \ - safe-snprintf.h + safe-snprintf.h \ + wait.h noinst_HEADERS += \ compat/dlfcn.h \ diff --git a/src/lib/lttng-ust/wait.h b/src/common/wait.h similarity index 100% rename from src/lib/lttng-ust/wait.h rename to src/common/wait.h diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c index 076c92f8..e4434bc0 100644 --- a/src/lib/lttng-ust-ctl/ustctl.c +++ b/src/lib/lttng-ust-ctl/ustctl.c @@ -25,7 +25,7 @@ #include "common/ringbuffer/backend.h" #include "common/ringbuffer/frontend.h" #include "lib/lttng-ust/ust-events-internal.h" -#include "lib/lttng-ust/wait.h" +#include "common/wait.h" #include "lib/lttng-ust/lttng-rb-clients.h" #include "lib/lttng-ust/clock.h" #include "lib/lttng-ust/getenv.h" diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am index bca09ad8..df0ae8d0 100644 --- a/src/lib/lttng-ust/Makefile.am +++ b/src/lib/lttng-ust/Makefile.am @@ -80,7 +80,6 @@ liblttng_ust_runtime_la_SOURCES = \ tracepoint-internal.h \ ust-events-internal.h \ clock.h \ - wait.h \ jhash.h \ lttng-ust-uuid.h \ error.h \ -- 2.34.1