X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace2%2Fplugin%2Fplugin-dev.h;h=6c4e0b52dc79a01fbb7d2e102f5dd9c91ff74979;hp=b266a92b3688aefd28b0c19fe5da8cab32dcae97;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hpb=15caa1ca4fac30bd196602bd136e48fda3892de2

diff --git a/include/babeltrace2/plugin/plugin-dev.h b/include/babeltrace2/plugin/plugin-dev.h
index b266a92b..6c4e0b52 100644
--- a/include/babeltrace2/plugin/plugin-dev.h
+++ b/include/babeltrace2/plugin/plugin-dev.h
@@ -29,9 +29,6 @@
 
 #include <stdint.h>
 
-/* For enum bt_plugin_status */
-#include <babeltrace2/plugin/plugin-const.h>
-
 /* For bt_component_class_type */
 #include <babeltrace2/graph/component-class-const.h>
 
@@ -40,6 +37,14 @@
 #include <babeltrace2/graph/component-class-filter.h>
 #include <babeltrace2/graph/component-class-sink.h>
 
+/* For bt_self_plugin */
+#include <babeltrace2/types.h>
+
+/* For __BT_FUNC_STATUS_* */
+#define __BT_FUNC_STATUS_ENABLE
+#include <babeltrace2/func-status.h>
+#undef __BT_FUNC_STATUS_ENABLE
+
 /*
  * _BT_HIDDEN: set the hidden attribute for internal functions
  * On Windows, symbols are local unless explicitly exported,
@@ -63,15 +68,13 @@ extern "C" {
 #define __BT_PLUGIN_VERSION_MINOR	0
 
 /* Plugin initialization function type */
-typedef enum bt_self_plugin_status {
-	BT_SELF_PLUGIN_STATUS_OK = 0,
-	BT_SELF_PLUGIN_STATUS_NOMEM = -12,
-	BT_SELF_PLUGIN_STATUS_ERROR = -1,
-} bt_self_plugin_status;
+typedef enum bt_plugin_init_func_status {
+	BT_PLUGIN_INIT_FUNC_STATUS_OK		= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_INIT_FUNC_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_PLUGIN_INIT_FUNC_STATUS_ERROR	= __BT_FUNC_STATUS_ERROR,
+} bt_plugin_init_func_status;
 
-typedef struct bt_self_plugin bt_self_plugin;
-
-typedef bt_self_plugin_status (*bt_plugin_init_func)(
+typedef bt_plugin_init_func_status (*bt_plugin_init_func)(
 		bt_self_plugin *plugin);
 
 /* Plugin exit function type */
@@ -1476,4 +1479,6 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
 }
 #endif
 
+#include <babeltrace2/undef-func-status.h>
+
 #endif /* BABELTRACE_PLUGIN_PLUGIN_DEV_H */