diff options
| author | Martin Mares <mj@ucw.cz> | 2000-04-28 15:11:10 +0000 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2000-04-28 15:11:10 +0000 |
| commit | 2edb31b097018be00f29cb7647432c4c2c8b99ba (patch) | |
| tree | 8ce8b05508d6c044c5c1f60888e7ae0fbc80e628 | |
| parent | decc99fbbdba3394a5c611e2914b4d74aa6742a9 (diff) | |
Split CF_HDR section to CF_HDR (only includes) and CF_DEFINES (defines,
C declarations etc.).
| -rw-r--r-- | conf/gen_parser.m4 | 1 | ||||
| -rw-r--r-- | filter/config.Y | 2 | ||||
| -rw-r--r-- | nest/config.Y | 8 | ||||
| -rw-r--r-- | proto/rip/config.Y | 2 | ||||
| -rw-r--r-- | proto/static/config.Y | 2 | ||||
| -rw-r--r-- | sysdep/unix/krt.Y | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/conf/gen_parser.m4 b/conf/gen_parser.m4 index 70f2c2e8..74385f32 100644 --- 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 50a5685a..38ee16a6 100644 --- 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 24223dba..a9090288 100644 --- 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 ebd57266..a8e65e34 100644 --- 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 1e2d7a86..12d7934f 100644 --- 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 01264d55..b5ca3c0b 100644 --- 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) |