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 1b45d92e5eaf4f521ff6103533e06d9748c7c126..38bf7f8901ba4d911bcd5668c38d154291558548 100644 (file)
--- 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 55c866c824b9d2545a83e09bafed25b127cf1b6f..5ef531e13b5643915db446f16de1557a9bc0f9c2 100644 (file)
--- 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 5aa8fc5417c31c19b457310bb78b19bf8f7e1644..6b115abeede46b34b3c9974a06e6666353367174 100644 (file)
--- 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;