Python build fix

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/bindings/python/babeltrace/python-complements.c b/bindings/python/babeltrace/python-complements.c
index b9a11f1410d880cee18e777b3e8846269ce938b0..d0daf34b410942d13803e45f5f0caccf9e4e8c0c 100644 (file)
--- a/bindings/python/babeltrace/python-complements.c
+++ b/bindings/python/babeltrace/python-complements.c
@@ -19,8 +19,8 @@
  */
 
 #include "python-complements.h"
-#include <babeltrace/ctf-writer/event-types-internal.h>
-#include <babeltrace/ctf-writer/event-fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf/events-internal.h>

diff --git a/formats/ctf/ir/packet.c b/formats/ctf/ir/packet.c
index 22948b3b4d2765a7d5be597b69a3e72baf077137..0fd1853d0a586c1fe0a2e1c79c7bacd88612b1ec 100644 (file)
--- a/formats/ctf/ir/packet.c
+++ b/formats/ctf/ir/packet.c
@@ -31,7 +31,6 @@
 #include <babeltrace/ctf-ir/trace.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
 #include <babeltrace/object-internal.h>

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 9cba9c5d3bffa81eadd982d8f32c262bba83eebf..44cfb8bb8f8dcf50a5d8c4b97ff28e7047ea40a4 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -32,7 +32,6 @@
 #include <babeltrace/ctf-ir/event-internal.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/fields-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>

diff --git a/include/babeltrace/ctf-ir/event-class-internal.h b/include/babeltrace/ctf-ir/event-class-internal.h
index 61b289e02747ce4eb2efb88c19397e407b7d3164..7621046081bd007069da77a767e14726c2efc049 100644 (file)
--- a/include/babeltrace/ctf-ir/event-class-internal.h
+++ b/include/babeltrace/ctf-ir/event-class-internal.h
@@ -33,7 +33,6 @@
 #include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <glib.h>
 

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index cdbaef107719adc437a1c2f7132980e4d1d42c39..c3243f52791adc034aafbce7f6f969954d232a8a 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -33,7 +33,6 @@
 #include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/object-internal.h>
 #include <glib.h>

diff --git a/include/babeltrace/ctf-ir/packet-internal.h b/include/babeltrace/ctf-ir/packet-internal.h
index 275524ba9bc2de47a6278f2024c05feed96b66f7..fb355cce837d7ce3a69bb61eddddebd9a9a8786c 100644 (file)
--- a/include/babeltrace/ctf-ir/packet-internal.h
+++ b/include/babeltrace/ctf-ir/packet-internal.h
@@ -26,7 +26,6 @@
  */
 
 #include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 

diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index d7d77e6b761d867cfd4799ab91dfdc2ae9b9e896..c5cdeb32ae5d4a722d250699ccf4295f21af2c41 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -27,7 +27,6 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/event-fields.h>

diff --git a/include/babeltrace/ctf-writer/stream.h b/include/babeltrace/ctf-writer/stream.h
index 73515b90ec6704247a9410deb5b0d679b0f85bc0..c9244caf905f5c373788b668353e583ab1a15936 100644 (file)
--- a/include/babeltrace/ctf-writer/stream.h
+++ b/include/babeltrace/ctf-writer/stream.h
@@ -30,9 +30,10 @@
  * http://www.efficios.com/ctf
  */
 
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 
+struct bt_ctf_stream;
+
 #ifdef __cplusplus
 extern "C" {
 #endif