From 4cb26dfbd763c06d99bf1069e2d1f3a569858e32 Mon Sep 17 00:00:00 2001
From: JP Ikaheimonen <jp_ikaheimonen@mentor.com>
Date: Tue, 7 May 2013 15:53:33 -0400
Subject: [PATCH] Move memstream.h and uuid.h to include/babeltrace/compat
 directory

As preparation for a new compatibility layer, the files memstream.h
and uuid.h are moved to include/babeltrace/compat.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 converter/babeltrace-log.c                             | 2 +-
 formats/ctf/Makefile.am                                | 3 +--
 formats/ctf/ctf.c                                      | 4 ++--
 formats/ctf/metadata/ctf-visitor-generate-io-struct.c  | 2 +-
 include/Makefile.am                                    | 3 ++-
 {formats/ctf => include/babeltrace/compat}/memstream.h | 0
 include/babeltrace/{ => compat}/uuid.h                 | 0
 include/babeltrace/ctf-ir/metadata.h                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename {formats/ctf => include/babeltrace/compat}/memstream.h (100%)
 rename include/babeltrace/{ => compat}/uuid.h (100%)

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 563a90f5..52a2fe1d 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -45,7 +45,7 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <babeltrace/endian.h>
 
 #define USEC_PER_SEC 1000000UL
diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
index d803b69a..6dcc1bb3 100644
--- a/formats/ctf/Makefile.am
+++ b/formats/ctf/Makefile.am
@@ -9,8 +9,7 @@ libbabeltrace_ctf_la_SOURCES = \
 	events.c \
 	iterator.c \
 	callbacks.c \
-	events-private.h \
-	memstream.h
+	events-private.h
 
 # Request that the linker keeps all static libraries objects.
 libbabeltrace_ctf_la_LDFLAGS = \
diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 9706f7a3..b27f2ec8 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -33,7 +33,7 @@
 #include <babeltrace/ctf/events-internal.h>
 #include <babeltrace/trace-handle-internal.h>
 #include <babeltrace/context-internal.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <babeltrace/endian.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -51,7 +51,7 @@
 #include "metadata/ctf-parser.h"
 #include "metadata/ctf-ast.h"
 #include "events-private.h"
-#include "memstream.h"
+#include <babeltrace/compat/memstream.h>"
 
 #define LOG2_CHAR_BIT	3
 
diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 0002fe4f..23c4f2f4 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -36,7 +36,7 @@
 #include <babeltrace/list.h>
 #include <babeltrace/types.h>
 #include <babeltrace/ctf/metadata.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <babeltrace/endian.h>
 #include <babeltrace/ctf/events-internal.h>
 #include "ctf-scanner.h"
diff --git a/include/Makefile.am b/include/Makefile.am
index 6a65b5cf..eee2ac10 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -31,6 +31,7 @@ noinst_HEADERS = \
 	babeltrace/ctf/types.h \
 	babeltrace/ctf/callbacks-internal.h \
 	babeltrace/trace-handle-internal.h \
-	babeltrace/uuid.h \
+	babeltrace/compat/uuid.h \
+	babeltrace/compat/memstream.h \
 	babeltrace/endian.h \
 	babeltrace/mmap-align.h
diff --git a/formats/ctf/memstream.h b/include/babeltrace/compat/memstream.h
similarity index 100%
rename from formats/ctf/memstream.h
rename to include/babeltrace/compat/memstream.h
diff --git a/include/babeltrace/uuid.h b/include/babeltrace/compat/uuid.h
similarity index 100%
rename from include/babeltrace/uuid.h
rename to include/babeltrace/compat/uuid.h
diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 3d684fb6..5e92984d 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -33,7 +33,7 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
-- 
2.34.1