diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/type/tls_peap/tls/include/tls_alert_message.h --- a/eapol/eapol_framework/eapol_common/type/tls_peap/tls/include/tls_alert_message.h Fri Sep 03 09:22:44 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/type/tls_peap/tls/include/tls_alert_message.h Thu Sep 16 13:07:04 2010 +0300 @@ -25,6 +25,29 @@ #include "eap_tools.h" #include "eap_array.h" #include "tls_peap_types.h" +#include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_TLS_ALERT_MESSAGE_H) + #define EAP_CLASS_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H + #define EAP_C_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H + #define EAP_FUNC_EXPORT_TLS_ALERT_MESSAGE_H + #define EAP_C_FUNC_EXPORT_TLS_ALERT_MESSAGE_H +#elif defined(EAP_EXPORT_TLS_ALERT_MESSAGE_H) + #define EAP_CLASS_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_TLS_ALERT_MESSAGE_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_TLS_ALERT_MESSAGE_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_TLS_ALERT_MESSAGE_H + #define EAP_C_FUNC_EXPORT_TLS_ALERT_MESSAGE_H +#endif +// End: added by script change_export_macros.sh. + /** @file */ @@ -34,7 +57,7 @@ /** * This class defines TLS-Alert message. */ -class EAP_EXPORT tls_alert_message_c +class EAP_CLASS_VISIBILITY_TLS_ALERT_MESSAGE_H tls_alert_message_c { private: //-------------------------------------------------- @@ -63,7 +86,7 @@ * The set_is_valid() function sets the state of the object valid. * The creator of this object calls this function after it is initialized. */ - EAP_FUNC_IMPORT void set_is_valid(); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H void set_is_valid(); //-------------------------------------------------- protected: @@ -74,10 +97,10 @@ //-------------------------------------------------- /// Destructor does nothing. - EAP_FUNC_IMPORT virtual ~tls_alert_message_c(); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H virtual ~tls_alert_message_c(); /// Constructor initializes the object. - EAP_FUNC_IMPORT tls_alert_message_c( + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H tls_alert_message_c( abs_eap_am_tools_c * const tools, const bool is_client); @@ -87,43 +110,43 @@ * If object initialization fails this function must return false. * @return This function returns the validity of this object. */ - EAP_FUNC_IMPORT bool get_is_valid(); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H bool get_is_valid(); /** * This function creates data of the Handshake message to internal buffer. * Later this data is added to final TLS-record buffer. */ - EAP_FUNC_IMPORT eap_status_e create_message_data(); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H eap_status_e create_message_data(); /** * This function sets alert level. */ - EAP_FUNC_IMPORT eap_status_e set_alert_level(const tls_alert_level_e alert_level); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H eap_status_e set_alert_level(const tls_alert_level_e alert_level); /** * This function gets alert level. */ - EAP_FUNC_IMPORT tls_alert_level_e get_alert_level() const; + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H tls_alert_level_e get_alert_level() const; /** * This function sets alert description. */ - EAP_FUNC_IMPORT eap_status_e set_alert_description(const tls_alert_description_e alert_description); + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H eap_status_e set_alert_description(const tls_alert_description_e alert_description); /** * This function gets alert description. */ - EAP_FUNC_IMPORT tls_alert_description_e get_alert_description() const; + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H tls_alert_description_e get_alert_description() const; /** * This function adds data of the TLS-Alert message to tls_message_buffer. */ - EAP_FUNC_IMPORT eap_status_e add_message_data( + EAP_FUNC_VISIBILITY_TLS_ALERT_MESSAGE_H eap_status_e add_message_data( eap_variable_data_c * const tls_message_buffer); //