X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fstream.h;h=eb7d57fe84438816f30c607c1c9c6708fbdd4fa9;hp=69829280c904e5cb4f7b3c65a01e9469853ae4a6;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hpb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a

diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace/ctf-ir/stream.h
index 69829280..eb7d57fe 100644
--- a/include/babeltrace/ctf-ir/stream.h
+++ b/include/babeltrace/ctf-ir/stream.h
@@ -1,62 +1,2 @@
-#ifndef BABELTRACE_CTF_IR_STREAM_H
-#define BABELTRACE_CTF_IR_STREAM_H
-
-/*
- * BabelTrace - CTF IR: Stream
- *
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * The Common Trace Format (CTF) Specification is available at
- * http://www.efficios.com/ctf
- */
-
-/* For enum bt_property_availability */
-#include <babeltrace/property.h>
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_stream;
-struct bt_stream_class;
-
-extern struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class);
-
-extern struct bt_stream *bt_stream_create_with_id(
-		struct bt_stream_class *stream_class, uint64_t id);
-
-extern struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream);
-
-extern const char *bt_stream_get_name(struct bt_stream *stream);
-
-extern int bt_stream_set_name(struct bt_stream *stream, const char *name);
-
-extern uint64_t bt_stream_get_id(struct bt_stream *stream);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_CTF_IR_STREAM_H */
+/* Pre-2.0 CTF writer backward compatibility */
+#include <babeltrace/ctf-writer/stream.h>