diff options
| author | Kozlov Dmitry <dima@server> | 2011-05-30 11:24:27 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <dima@server> | 2011-05-30 11:24:27 +0400 |
| commit | 276beb78cea777ff8d81d9f5a4cd107c5a3dc2aa (patch) | |
| tree | f50c4e781ba13c3ee59382a4466cfafa31ef464a /accel-pppd/ctrl/pppoe | |
| parent | 01afc34e830f2adf94c191a3c4f2761888dae53b (diff) | |
| download | accel-ppp-276beb78cea777ff8d81d9f5a4cd107c5a3dc2aa.tar.gz accel-ppp-276beb78cea777ff8d81d9f5a4cd107c5a3dc2aa.zip | |
rewrited initialization procedure (fix gcc-4.6 builds)
Diffstat (limited to 'accel-pppd/ctrl/pppoe')
| -rw-r--r-- | accel-pppd/ctrl/pppoe/cli.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/mac_filter.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c index 9929f669..37aec3a2 100644 --- a/accel-pppd/ctrl/pppoe/cli.c +++ b/accel-pppd/ctrl/pppoe/cli.c @@ -189,7 +189,7 @@ static int set_ac_name_exec(const char *cmd, char * const *f, int f_cnt, void *c //=================================== -static void __init init(void) +static void init(void) { cli_register_simple_cmd2(show_stat_exec, NULL, 2, "show", "stat"); cli_register_simple_cmd2(intf_exec, intf_help, 2, "pppoe", "interface"); @@ -203,3 +203,4 @@ static void __init init(void) cli_register_simple_cmd2(show_ac_name_exec, NULL, 3, "pppoe", "show", "AC-Name"); } +DEFINE_INIT(22, init); diff --git a/accel-pppd/ctrl/pppoe/mac_filter.c b/accel-pppd/ctrl/pppoe/mac_filter.c index 9b101c67..8d72c31d 100644 --- a/accel-pppd/ctrl/pppoe/mac_filter.c +++ b/accel-pppd/ctrl/pppoe/mac_filter.c @@ -244,7 +244,7 @@ static void cmd_help(char * const *fields, int fields_cnt, void *client) cli_send(client, "pppoe mac-filter show - show current mac-filter list\r\n"); } -static void __init init(void) +static void init(void) { const char *opt = conf_get_opt("pppoe", "mac-filter"); if (!opt || mac_filter_load(opt)) @@ -253,3 +253,4 @@ static void __init init(void) cli_register_simple_cmd2(cmd_exec, cmd_help, 2, "pppoe", "mac-filter"); } +DEFINE_INIT(20, init); diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index c7612e25..cd1d2560 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1241,7 +1241,7 @@ static int init_secret(struct pppoe_serv_t *serv) return 0; } -static void __init pppoe_init(void) +static void pppoe_init(void) { struct conf_sect_t *s = conf_get_section("pppoe"); struct conf_option_t *opt; @@ -1288,3 +1288,4 @@ static void __init pppoe_init(void) conf_ac_name = _strdup("accel-ppp"); } +DEFINE_INIT(21, pppoe_init); |