Fix build when configuring with --disable-lttng-ust

Mark trace_ust_list_tracker_pids as static inline to eliminate
"multiple definition" error.

Fix ust_app_global_update() stub to reflect the signature change
introduced by a9ad0c8f

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index fa91b6ae9fcc6fa17c86e4d9dc823ee404c373ea..c4dbe06c56c3dd7f3a5c57bcc754d814286b89c4 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -305,6 +305,7 @@ int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid)
 {
        return 0;
 }
+static inline
 ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
                int32_t **_pids)
 {

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 567c79e044ef77bdef54ebfdd6b750be91a26e61..66cda8c081518024feb120fdbf7b2f33be54ff03 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -421,7 +421,7 @@ int ust_app_ht_alloc(void)
        return 0;
 }
 static inline
-void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
 {}
 static inline
 int ust_app_disable_channel_glb(struct ltt_ust_session *usess,