X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fplugin%2Fplugin-dev.h;h=e2b03be09434678f946c6ed34ae2aafbb5d017bf;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=b266a92b3688aefd28b0c19fe5da8cab32dcae97;hpb=c594ab036e1797da45594dce8dfc07d90f2bb81f;p=babeltrace.git

diff --git a/include/babeltrace2/plugin/plugin-dev.h b/include/babeltrace2/plugin/plugin-dev.h
index b266a92b..e2b03be0 100644
--- a/include/babeltrace2/plugin/plugin-dev.h
+++ b/include/babeltrace2/plugin/plugin-dev.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_PLUGIN_PLUGIN_DEV_H
-#define BABELTRACE_PLUGIN_PLUGIN_DEV_H
+#ifndef BABELTRACE2_PLUGIN_PLUGIN_DEV_H
+#define BABELTRACE2_PLUGIN_PLUGIN_DEV_H
 
 /*
  * This is the header that you need to include for the development of
@@ -27,10 +27,11 @@
  * SOFTWARE.
  */
 
-#include <stdint.h>
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
 
-/* For enum bt_plugin_status */
-#include <babeltrace2/plugin/plugin-const.h>
+#include <stdint.h>
 
 /* For bt_component_class_type */
 #include <babeltrace2/graph/component-class-const.h>
@@ -40,6 +41,9 @@
 #include <babeltrace2/graph/component-class-filter.h>
 #include <babeltrace2/graph/component-class-sink.h>
 
+/* For bt_self_plugin */
+#include <babeltrace2/types.h>
+
 /*
  * _BT_HIDDEN: set the hidden attribute for internal functions
  * On Windows, symbols are local unless explicitly exported,
@@ -63,15 +67,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 struct bt_self_plugin bt_self_plugin;
+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 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 +1478,4 @@ struct __bt_plugin_component_class_descriptor_attribute const * const *__bt_get_
 }
 #endif
 
-#endif /* BABELTRACE_PLUGIN_PLUGIN_DEV_H */
+#endif /* BABELTRACE2_PLUGIN_PLUGIN_DEV_H */