some buggy compiler get confused with duplicated labels used in enum tcp_state and fsm.h, prepending PPP's ones

This commit is contained in:
Sylvain Rochet 2012-07-09 22:12:14 +02:00
parent b4df26a75d
commit 0797ab6bc6

View File

@ -769,7 +769,7 @@ static int ipv6cp_nakci(fsm *f, u_char *p, int len, int treat_as_reject) {
/* /*
* OK, the Nak is good. Now we can update state. * OK, the Nak is good. Now we can update state.
*/ */
if (f->state != OPENED) if (f->state != PPP_FSM_OPENED)
*go = try; *go = try;
return 1; return 1;
@ -837,7 +837,7 @@ static int ipv6cp_rejci(fsm *f, u_char *p, int len) {
/* /*
* Now we can update state. * Now we can update state.
*/ */
if (f->state != OPENED) if (f->state != PPP_FSM_OPENED)
*go = try; *go = try;
return 1; return 1;
@ -1327,13 +1327,13 @@ ipv6cp_script_done(arg)
ipv6cp_script_pid = 0; ipv6cp_script_pid = 0;
switch (ipv6cp_script_state) { switch (ipv6cp_script_state) {
case s_up: case s_up:
if (ipv6cp_fsm[0].state != OPENED) { if (ipv6cp_fsm[0].state != PPP_FSM_OPENED) {
ipv6cp_script_state = s_down; ipv6cp_script_state = s_down;
ipv6cp_script(_PATH_IPV6DOWN); ipv6cp_script(_PATH_IPV6DOWN);
} }
break; break;
case s_down: case s_down:
if (ipv6cp_fsm[0].state == OPENED) { if (ipv6cp_fsm[0].state == PPP_FSM_OPENED) {
ipv6cp_script_state = s_up; ipv6cp_script_state = s_up;
ipv6cp_script(_PATH_IPV6UP); ipv6cp_script(_PATH_IPV6UP);
} }