From: Lior David Date: Mon, 7 May 2018 14:59:51 +0000 (+0300) Subject: fst: Fix compile error in fst_ctrl_aux.h with C++ compilers X-Git-Tag: hostap_2_7~325 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91db940ff0313687553999f658c16ce6fbd269f6;p=thirdparty%2Fhostap.git fst: Fix compile error in fst_ctrl_aux.h with C++ compilers Move enum fst_reason to be a top level type, since it is used as argument in the function fst_reason_name() and having it as nested type caused a compile error when fst_ctrl_aux.h was included from a C++ source file. Signed-off-by: Lior David --- diff --git a/src/fst/fst_ctrl_aux.h b/src/fst/fst_ctrl_aux.h index e2133f506..0aff5d061 100644 --- a/src/fst/fst_ctrl_aux.h +++ b/src/fst/fst_ctrl_aux.h @@ -35,6 +35,17 @@ enum fst_event_type { * more info */ }; +enum fst_reason { + REASON_TEARDOWN, + REASON_SETUP, + REASON_SWITCH, + REASON_STT, + REASON_REJECT, + REASON_ERROR_PARAMS, + REASON_RESET, + REASON_DETACH_IFACE, +}; + enum fst_initiator { FST_INITIATOR_UNDEFINED, FST_INITIATOR_LOCAL, @@ -57,16 +68,7 @@ union fst_event_extra { enum fst_session_state new_state; union fst_session_state_switch_extra { struct { - enum fst_reason { - REASON_TEARDOWN, - REASON_SETUP, - REASON_SWITCH, - REASON_STT, - REASON_REJECT, - REASON_ERROR_PARAMS, - REASON_RESET, - REASON_DETACH_IFACE, - } reason; + enum fst_reason reason; u8 reject_code; /* REASON_REJECT */ /* REASON_SWITCH, * REASON_TEARDOWN,