From ccb172ed7509c1cedb1a52e8d29e1d605608405f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 10 Aug 2008 18:00:11 +0300 Subject: [PATCH] Renamed MSG to PROC_MSG to avoid conflicts with MinGW winuser.h --- src/eap_peer/eap_ikev2.c | 10 +++++----- src/eap_peer/eap_tnc.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/eap_peer/eap_ikev2.c b/src/eap_peer/eap_ikev2.c index d8c7b1f7d..bb49a662d 100644 --- a/src/eap_peer/eap_ikev2.c +++ b/src/eap_peer/eap_ikev2.c @@ -22,7 +22,7 @@ struct eap_ikev2_data { struct ikev2_responder_data ikev2; - enum { WAIT_START, MSG, WAIT_FRAG_ACK, DONE, FAIL } state; + enum { WAIT_START, PROC_MSG, WAIT_FRAG_ACK, DONE, FAIL } state; struct wpabuf *in_buf; struct wpabuf *out_buf; size_t out_used; @@ -38,8 +38,8 @@ static const char * eap_ikev2_state_txt(int state) switch (state) { case WAIT_START: return "WAIT_START"; - case MSG: - return "MSG"; + case PROC_MSG: + return "PROC_MSG"; case WAIT_FRAG_ACK: return "WAIT_FRAG_ACK"; case DONE: @@ -391,7 +391,7 @@ static struct wpabuf * eap_ikev2_process(struct eap_sm *sm, void *priv, return NULL; } wpa_printf(MSG_DEBUG, "EAP-IKEV2: Fragment acknowledged"); - eap_ikev2_state(data, MSG); + eap_ikev2_state(data, PROC_MSG); return eap_ikev2_build_msg(data, ret, id); } @@ -433,7 +433,7 @@ static struct wpabuf * eap_ikev2_process(struct eap_sm *sm, void *priv, data->out_used = 0; } - eap_ikev2_state(data, MSG); + eap_ikev2_state(data, PROC_MSG); return eap_ikev2_build_msg(data, ret, id); } diff --git a/src/eap_peer/eap_tnc.c b/src/eap_peer/eap_tnc.c index b2705f733..0a3a01c2a 100644 --- a/src/eap_peer/eap_tnc.c +++ b/src/eap_peer/eap_tnc.c @@ -21,7 +21,7 @@ struct eap_tnc_data { - enum { WAIT_START, MSG, WAIT_FRAG_ACK, DONE, FAIL } state; + enum { WAIT_START, PROC_MSG, WAIT_FRAG_ACK, DONE, FAIL } state; struct tncc_data *tncc; struct wpabuf *in_buf; struct wpabuf *out_buf; @@ -269,7 +269,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv, return NULL; } wpa_printf(MSG_DEBUG, "EAP-TNC: Fragment acknowledged"); - data->state = MSG; + data->state = PROC_MSG; return eap_tnc_build_msg(data, ret, id); } @@ -300,7 +300,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv, tncc_init_connection(data->tncc); - data->state = MSG; + data->state = PROC_MSG; } else { enum tncc_process_res res; @@ -351,7 +351,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv, ret->allowNotifications = TRUE; if (data->out_buf) { - data->state = MSG; + data->state = PROC_MSG; return eap_tnc_build_msg(data, ret, id); } @@ -402,7 +402,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv, wpabuf_head(resp), wpabuf_len(resp)); data->out_buf = resp; - data->state = MSG; + data->state = PROC_MSG; return eap_tnc_build_msg(data, ret, id); }