Split CF_HDR section to CF_HDR (only includes) and CF_DEFINES (defines,

C declarations etc.).

diff --git a/conf/gen_parser.m4 b/conf/gen_parser.m4
index 70f2c2e839430e79c65a8c38c1dbf19fb72eb9cb..74385f3210a8fdb498db17672d4d16dabd8549b1 100644 (file)
--- a/conf/gen_parser.m4
+++ b/conf/gen_parser.m4
@@ -19,6 +19,7 @@ m4_define(DNL, `m4_dnl')
 # Define macros for defining sections
 m4_define(CF_ZONE, `m4_divert($1)/* $2 from m4___file__ */')
 m4_define(CF_HDR, `CF_ZONE(1, Headers)')
+m4_define(CF_DEFINES, `CF_ZONE(1, Defines)')
 m4_define(CF_DECLS, `CF_ZONE(2, Declarations)')
 m4_define(CF_GRAMMAR, `CF_ZONE(3, Grammar)')
 m4_define(CF_CODE, `CF_ZONE(4, C Code)')

diff --git a/filter/config.Y b/filter/config.Y
index 50a5685afee1124df2a178bbd105e8b7da193055..38ee16a65389674274ca4184b771cbac17b30312 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -16,6 +16,8 @@
 
 CF_HDR
 
+CF_DEFINES
+
 #define P(a,b) ((a<<8) | b)
 
 CF_DECLS

diff --git a/nest/config.Y b/nest/config.Y
index 24223dba733d3b470c412ab845baf17189ed187e..a909028831127527a99013c3e2a4839add802034 100644 (file)
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -8,13 +8,15 @@
 
 CF_HDR
 
-static struct proto_config *this_proto;
-static struct iface_patt *this_ipatt;
-
 #include "nest/rt-dev.h"
 #include "nest/password.h"
 #include "nest/cmds.h"
 
+CF_DEFINES
+
+static struct proto_config *this_proto;
+static struct iface_patt *this_ipatt;
+
 CF_DECLS
 
 CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)

diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index ebd57266ca89bb1d130a8049e65ea31a5a04a062..a8e65e34c10fa750e2e299c42a810188d4bc56f3 100644 (file)
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -17,6 +17,8 @@ CF_HDR
 #include "proto/rip/rip.h"
 #include "nest/iface.h"
 
+CF_DEFINES
+
 #define RIP_CFG ((struct rip_proto_config *) this_proto)
 #define RIP_IPATT ((struct rip_patt *) this_ipatt)
 

diff --git a/proto/static/config.Y b/proto/static/config.Y
index 1e2d7a86cb9e4f89d4f72afe278f24976ab43b76..12d7934f99078429d9069a4a2c089280ec224b01 100644 (file)
--- a/proto/static/config.Y
+++ b/proto/static/config.Y
@@ -10,6 +10,8 @@ CF_HDR
 
 #include "proto/static/static.h"
 
+CF_DEFINES
+
 static struct static_route *this_srt;
 
 CF_DECLS

diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 01264d55d6396fae3db3c5e5237fcd08d955ade1..b5ca3c0b7c49c7f0d4dc4a93bc718c45fd7f6ea8 100644 (file)
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -10,6 +10,8 @@ CF_HDR
 
 #include "lib/krt.h"
 
+CF_DEFINES
+
 #define THIS_KRT ((struct krt_config *) this_proto)
 #define THIS_KIF ((struct kif_config *) this_proto)