X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=11eab6b6b0a44169e41eca4f9353095d654987aa;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=20d50f596914ad9e704a99261636e1d03ba0a462;hpb=67d2ce028c96b6a3b3614b393d8928663bce4490;p=babeltrace.git
diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index 20d50f59..11eab6b6 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -1,10 +1,10 @@
-#ifndef BABELTRACE_BABELTRACE_H
-#define BABELTRACE_BABELTRACE_H
+#ifndef BABELTRACE2_BABELTRACE_H
+#define BABELTRACE2_BABELTRACE_H
/*
* Babeltrace API
*
- * Copyright 2010-2018 EfficiOS Inc.
+ * Copyright 2010-2019 EfficiOS Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,22 @@
* SOFTWARE.
*/
+/*
+ * Tell the specific headers that they are included from this header.
+ *
+ * Do NOT define `__BT_IN_BABELTRACE_H` in user code.
+ */
+#ifndef __BT_IN_BABELTRACE_H
+# define __BT_IN_BABELTRACE_H
+#endif
+
+/* Need by some of the following included headers */
+#include
+
/* Core API */
+#include
+#include
+#include
#include
#include
#include
@@ -59,12 +74,7 @@
#include
#include
-/* Plugin and plugin development API */
-#include
-#include
-#include
-
-/* Graph, component, and message API */
+/* Component class API */
#include
#include
#include
@@ -73,13 +83,30 @@
#include
#include
#include
+#include
+#include
+#include
+
+/* Component API */
#include
#include
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/* Message iterator API */
+#include
+#include
+#include
+#include
+
+/* Message API */
#include
#include
#include
@@ -87,39 +114,50 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
+#include
#include
#include
+
+/* Graph API */
+#include
+#include
+#include
#include
#include
#include
-#include
+
+/* Query executor API */
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#endif /* BABELTRACE_BABELTRACE_H */
+/* Plugin API */
+#include
+#include
+
+/* Plugin development */
+#include
+
+/* Cancel private definitions */
+#undef __BT_FUNC_STATUS_OVERFLOW
+#undef __BT_FUNC_STATUS_INVALID_PARAMS
+#undef __BT_FUNC_STATUS_INVALID_OBJECT
+#undef __BT_FUNC_STATUS_MEMORY_ERROR
+#undef __BT_FUNC_STATUS_LOADING_ERROR
+#undef __BT_FUNC_STATUS_ERROR
+#undef __BT_FUNC_STATUS_OK
+#undef __BT_FUNC_STATUS_END
+#undef __BT_FUNC_STATUS_NOT_FOUND
+#undef __BT_FUNC_STATUS_AGAIN
+#undef __BT_FUNC_STATUS_UNSUPPORTED
+#undef __BT_FUNC_STATUS_CANCELED
+#undef __BT_IN_BABELTRACE_H
+
+#endif /* BABELTRACE2_BABELTRACE_H */