sgw: move 'struct sgw_egress_if' type into a separate include file

Some egress types will be added later on and the global types file
doesn't really need the types anyway.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/olsrd_jsoninfo.c
index 84d0a03..e489fa7 100644 (file)
--- a/lib/jsoninfo/src/olsrd_jsoninfo.c
+++ b/lib/jsoninfo/src/olsrd_jsoninfo.c
@@ -86,6 +86,7 @@
 #include "lq_plugin.h"
 #include "common/autobuf.h"
 #include "gateway.h"
+#include "egressTypes.h"
 
 #include "olsrd_jsoninfo.h"
 #include "olsrd_plugin.h"

diff --git a/src/cfgparser/cfgfile_gen.c b/src/cfgparser/cfgfile_gen.c
index bb2b007..0029b50 100644 (file)
--- a/src/cfgparser/cfgfile_gen.c
+++ b/src/cfgparser/cfgfile_gen.c
@@ -43,6 +43,7 @@
 #include "../ipcalc.h"
 #include "../net_olsr.h"
 #include "../common/autobuf.h"
+#include "../egressTypes.h"
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/src/cfgparser/olsrd_conf.c b/src/cfgparser/olsrd_conf.c
index 5e627c5..c610d5e 100644 (file)
--- a/src/cfgparser/olsrd_conf.c
+++ b/src/cfgparser/olsrd_conf.c
@@ -45,6 +45,7 @@
 #include "defs.h"
 #include "net_olsr.h"
 #include "olsr.h"
+#include "egressTypes.h"
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/src/cfgparser/oparse.y b/src/cfgparser/oparse.y
index 3def782..e9b8e47 100644 (file)
--- a/src/cfgparser/oparse.y
+++ b/src/cfgparser/oparse.y
@@ -47,6 +47,7 @@
 #include "../net_olsr.h"
 #include "../link_set.h"
 #include "../olsr.h"
+#include "../egressTypes.h"
 
 #include <stddef.h>
 #include <stdio.h>

diff --git a/src/egressTypes.h b/src/egressTypes.h
new file mode 100644 (file)
index 0000000..240e5be
--- /dev/null
+++ b/src/egressTypes.h
@@ -0,0 +1,19 @@
+#ifndef EGRESSTYPES_H
+#define EGRESSTYPES_H
+
+#ifdef __linux__
+
+/* Plugin includes */
+
+/* OLSRD includes */
+
+/* System includes */
+
+struct sgw_egress_if {
+  char *name;
+  struct sgw_egress_if *next;
+};
+
+#endif /* __linux__ */
+
+#endif /* EGRESSTYPES_H */

diff --git a/src/gateway.c b/src/gateway.c
index b39e5c8..0e68aac 100644 (file)
--- a/src/gateway.c
+++ b/src/gateway.c
@@ -22,6 +22,7 @@
 #include "gateway_default_handler.h"
 #include "gateway_list.h"
 #include "gateway.h"
+#include "egressTypes.h"
 
 #include <assert.h>
 #include <net/if.h>

diff --git a/src/olsr_cfg.h b/src/olsr_cfg.h
index 8a0bd84..839d417 100644 (file)
--- a/src/olsr_cfg.h
+++ b/src/olsr_cfg.h
@@ -262,11 +262,6 @@ struct plugin_entry {
   struct plugin_entry *next;
 };
 
-struct sgw_egress_if {
-  char *name;
-  struct sgw_egress_if *next;
-};
-
 /*
  * The config struct
  */