From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 31 Mar 2015 20:02:17 +0000 (-0400)
Subject: Fix build when configuring with --disable-lttng-ust
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3646a0515bbdc4aac3853f2a464e73dd99783b34;p=lttng-tools.git

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 fa91b6ae9..c4dbe06c5 100644
--- 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 567c79e04..66cda8c08 100644
--- 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,