From f4e57537eda6120c0d1b9c46bbb8d510ce6e09d9 Mon Sep 17 00:00:00 2001
From: pmf <pmf@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Fri, 30 May 2008 15:15:23 +0000
Subject: [PATCH] liblttvtraceread: try to fix #include mess

git-svn-id: http://ltt.polymtl.ca/svn@2925 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/ltt/event.c       | 2 ++
 ltt/branches/poly/ltt/event.h       | 3 ++-
 ltt/branches/poly/ltt/ltt-private.h | 2 --
 ltt/branches/poly/ltt/trace.h       | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c
index bce0b8d8..42a62318 100644
--- a/ltt/branches/poly/ltt/event.c
+++ b/ltt/branches/poly/ltt/event.c
@@ -27,6 +27,8 @@
 #include <ltt/event.h>
 #include <ltt/ltt-types.h>
 #include <ltt/ltt-private.h>
+#include <ltt/marker.h>
+#include <ltt/marker-field.h>
 
 /*****************************************************************************
  *Function name
diff --git a/ltt/branches/poly/ltt/event.h b/ltt/branches/poly/ltt/event.h
index 697b400e..2574a271 100644
--- a/ltt/branches/poly/ltt/event.h
+++ b/ltt/branches/poly/ltt/event.h
@@ -7,7 +7,8 @@
 #include <endian.h>
 #include <ltt/ltt.h>
 #include <ltt/time.h>
-#include <ltt/marker.h>
+
+struct marker_field;
 
 /*
  * Structure LttEvent and LttEventPosition must begin with the _exact_ same
diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index fd64eed6..b26d078e 100644
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -25,8 +25,6 @@
 #include <ltt/ltt.h>
 #include <endian.h>
 #include <ltt/event.h>
-#include <ltt/marker.h>
-#include <ltt/trace.h>
 
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
diff --git a/ltt/branches/poly/ltt/trace.h b/ltt/branches/poly/ltt/trace.h
index 20ba498c..e87032df 100644
--- a/ltt/branches/poly/ltt/trace.h
+++ b/ltt/branches/poly/ltt/trace.h
@@ -21,6 +21,7 @@
 #define TRACE_H
 
 #include <ltt/ltt.h>
+#include <ltt/ltt-private.h>
 #include <stdint.h>
 #include <glib.h>
 
-- 
2.34.1