octopus: remove include to flounder file in public include
authorReto Achermann <reto.achermann@inf.ethz.ch>
Sat, 22 Jul 2017 15:30:28 +0000 (17:30 +0200)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Sun, 23 Jul 2017 07:01:09 +0000 (09:01 +0200)
Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

include/octopus_server/query.h
include/octopus_server/service.h
lib/net/Hakefile
lib/net/arp.c
lib/net/dhcp.c
usr/skb/octopus/predicates.c

index 1f011d7..3929964 100644 (file)
@@ -19,7 +19,7 @@
 #define OCTOPUS_QUERY_H_
 
 #include <barrelfish/barrelfish.h>
-#include <if/octopus_defs.h>
+
 
 #include <octopus_server/service.h>
 #include <octopus/parser/ast.h>
index 104f186..1d59c54 100644 (file)
@@ -17,7 +17,6 @@
 #define OCTOPUS_SERVICE_H_
 
 #include <barrelfish/barrelfish.h>
-#include <if/octopus_defs.h>
 #include <octopus/definitions.h>
 
 struct oct_reply_state;
index 8214e6d..b5c62a5 100644 (file)
@@ -15,7 +15,7 @@
     cFiles       = [ "net.c", "netbufs.c",  "netif.c", "pbuf.c", "dhcp.c",
                      "net_filter.c", "arp.c" ],
     flounderBindings = [ "net_filter"],
-    flounderDefs = [ "net_filter" ],
+    flounderDefs = [ "net_filter", "octopus" ],
     flounderExtraDefs = [ ("net_filter",["rpcclient"]) ],
     addLibraries = libDeps [ "lwip2", "devif", "devif_backend_idc",
                              "devif_backend_solarflare", "devif_backend_e10k",
index b06632f..0e01eb9 100644 (file)
@@ -24,8 +24,8 @@
 
 #include <netif/etharp.h>
 
+#include <if/octopus_defs.h>
 #include <octopus/octopus.h>
-#include <octopus_server/service.h>
 #include <octopus/trigger.h>
 
 
index cf56472..73465f4 100644 (file)
@@ -21,7 +21,7 @@
 #include <lwip/timeouts.h>
 
 #include <octopus/octopus.h>
-#include <octopus_server/service.h>
+
 
 #include <net_interfaces/flags.h>
 #include "networking_internal.h"
index e8146ff..386a812 100644 (file)
@@ -21,6 +21,7 @@
 #include <include/skb_server.h>
 #include <collections/hash_table.h>
 
+#include <if/octopus_defs.h>
 #include <octopus_server/debug.h>
 #include <octopus_server/service.h>
 #include <octopus/trigger.h> // for trigger modes