Fix include of if/terminal_config_defs.h - depending on the compile order it cannot...

Signed-off-by: Moritz Hoffmann <moritzho@inf.ethz.ch>

diff --git a/include/term/client/defs.h b/include/term/client/defs.h
index 0213ba0..54bbd47 100644 (file)
--- a/include/term/client/defs.h
+++ b/include/term/client/defs.h
@@ -20,7 +20,6 @@
 #include <collections/list.h>
 #include <errors/errno.h>
 #include <if/terminal_defs.h>
-#include <if/terminal_config_defs.h>
 #include <term/defs.h>
 
 #include <stdbool.h>

diff --git a/lib/barrelfish/terminal.c b/lib/barrelfish/terminal.c
index fc18f3c..66ea079 100644 (file)
--- a/lib/barrelfish/terminal.c
+++ b/lib/barrelfish/terminal.c
@@ -17,6 +17,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/terminal.h>
+#include <if/terminal_config_defs.h>
 #include <term/client/client_blocking.h>
 
 struct terminal_state {

diff --git a/lib/term/client/client.c b/lib/term/client/client.c
index e2db03e..aef861e 100644 (file)
--- a/lib/term/client/client.c
+++ b/lib/term/client/client.c
@@ -14,6 +14,7 @@
  */
 
 #include <barrelfish/barrelfish.h>
+#include <if/terminal_config_defs.h>
 #include <term/client/client.h>
 
 #include "filter_priv.h"

diff --git a/lib/term/client/client_blocking.c b/lib/term/client/client_blocking.c
index 62934e4..07994c7 100644 (file)
--- a/lib/term/client/client_blocking.c
+++ b/lib/term/client/client_blocking.c
@@ -21,6 +21,7 @@
 #include <if/octopus_defs.h>
 #include <if/octopus_rpcclient_defs.h>
 #include <if/terminal_defs.h>
+#include <if/terminal_config_defs.h>
 #include <octopus/getset.h>
 #include <octopus/trigger.h>
 #include <term/client/client_blocking.h>

diff --git a/lib/term/client/default_triggers.c b/lib/term/client/default_triggers.c
index fc59d8f..0d8a8d3 100644 (file)
--- a/lib/term/client/default_triggers.c
+++ b/lib/term/client/default_triggers.c
@@ -15,6 +15,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/waitset.h>
+#include <if/terminal_config_defs.h>
 #include <term/client/default_triggers.h>
 
 static void term_trigger_kill_handler(void *arg)

diff --git a/lib/term/client/filter.c b/lib/term/client/filter.c
index 1547315..fb5bb84 100644 (file)
--- a/lib/term/client/filter.c
+++ b/lib/term/client/filter.c
@@ -18,6 +18,7 @@
 #include <stdint.h>
 
 #include <barrelfish/barrelfish.h>
+#include <if/terminal_config_defs.h>
 #include <collections/list.h>
 #include <term/client/client.h>
 #include <term/client/filter.h>

diff --git a/lib/term/client/trigger.c b/lib/term/client/trigger.c
index 78ec50d..dfac8a7 100644 (file)
--- a/lib/term/client/trigger.c
+++ b/lib/term/client/trigger.c
@@ -17,6 +17,7 @@
 #include <stdint.h>
 
 #include <barrelfish/barrelfish.h>
+#include <if/terminal_config_defs.h>
 #include <term/client/client.h>
 #include <term/client/trigger.h>