From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 21 May 2015 19:06:53 +0000 (-0400)
Subject: More build fixes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fd0f910d5f0b83402a2f86d45a228beef5af4083;p=deliverable%2Fbabeltrace.git

More build fixes

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

diff --git a/include/babeltrace/plugin/source-internal.h b/include/babeltrace/plugin/source-internal.h
index 1b45d92e5..38bf7f890 100644
--- a/include/babeltrace/plugin/source-internal.h
+++ b/include/babeltrace/plugin/source-internal.h
@@ -29,6 +29,7 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/plugin/plugin-internal.h>
+#include <babeltrace/plugin/plugin-system.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,7 +39,7 @@ struct bt_plugin_source {
 	struct bt_plugin parent;
 
 	/* Plug-in implementation callbacks */
-	bt_plugin_source_iterator_create_func create_iterator;
+	bt_plugin_source_iterator_create_cb create_iterator;
 };
 
 #ifdef __cplusplus
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 55c866c82..5ef531e13 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,7 +7,6 @@ lib_LTLIBRARIES = libbabeltrace-plugin.la
 # Plug-in system library
 libbabeltrace_plugin_la_SOURCES = \
 	plugin.c \
-	filter.c \
 	source.c \
 	sink.c \
 	iterator.c
diff --git a/plugins/source.c b/plugins/source.c
index 5aa8fc541..6b115abee 100644
--- a/plugins/source.c
+++ b/plugins/source.c
@@ -26,6 +26,7 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/compiler.h>
 #include <babeltrace/plugin/source-internal.h>
 #include <babeltrace/plugin/plugin-internal.h>
 
@@ -43,7 +44,7 @@ void bt_plugin_source_destroy(struct bt_plugin *plugin)
 }
 
 struct bt_plugin *bt_plugin_source_create(const char *name,
-		void *private_data, bt_plugin_destroy_func destroy_func,
+		void *private_data, bt_plugin_destroy_cb destroy_func,
 		bt_plugin_source_iterator_create_cb iterator_create_cb)
 {
 	struct bt_plugin_source *source = NULL;