X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt.i;h=49adfbfdf9b410fd6f719f48e5d58706c3bb9cdd;hb=19bb8b5a08e1ee2aadd42bf11f7ed8a62f36bd5b;hp=f9fb451218a53166fe91d97a8ef5361b909f78af;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt.i b/src/bindings/python/bt2/bt2/native_bt.i
index f9fb4512..49adfbfd 100644
--- a/src/bindings/python/bt2/bt2/native_bt.i
+++ b/src/bindings/python/bt2/bt2/native_bt.i
@@ -32,15 +32,19 @@
 #define BT_LOG_TAG "BT2-PY"
 #include "logging.h"
 
+/*
+ * Include before `<babeltrace2/func-status.h>` because
+ * `<babeltrace2/babeltrace.h>` removes the `__BT_IN_BABELTRACE_H`
+ * definition.
+ */
 #include <babeltrace2/babeltrace.h>
 
 /*
  * This is not part of the API, but because those bindings reside within
  * the project, we take the liberty to use them.
  */
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 #include "common/assert.h"
 #include "py-common/py-common.h"
@@ -180,11 +184,17 @@ typedef int bt_bool;
 	$result = $1;
 }
 
+/*
+ * Define `__BT_IN_BABELTRACE_H` to allow specific headers to be
+ * included. This remains defined as long as we don't include the main
+ * header, `<babeltrace2/babeltrace.h>`.
+ */
+#define __BT_IN_BABELTRACE_H
+
 /* Property enumeration */
 %include <babeltrace2/property.h>
 
 /* Common function status codes */
-#define __BT_FUNC_STATUS_ENABLE
 %include <babeltrace2/func-status.h>
 
 /* Per-module interface files */
@@ -206,6 +216,7 @@ typedef int bt_bool;
 %include "native_bt_plugin.i"
 %include "native_bt_port.i"
 %include "native_bt_query_exec.i"
+%include "native_bt_integer_range_set.i"
 %include "native_bt_stream.i"
 %include "native_bt_stream_class.i"
 %include "native_bt_trace.i"