diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_common/include/eap_general_settings_server_message_if.h --- a/eapol/eapol_framework/eapol_common/include/eap_general_settings_server_message_if.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/include/eap_general_settings_server_message_if.h Mon Oct 04 00:19:54 2010 +0300 @@ -24,6 +24,27 @@ #include "eap_tools.h" #include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H) + #define EAP_CLASS_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H + #define EAP_C_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H + #define EAP_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H + #define EAP_C_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H +#elif defined(EAP_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H) + #define EAP_CLASS_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H + #define EAP_C_FUNC_EXPORT_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H +#endif +// End: added by script change_export_macros.sh. #include "abs_eap_session_core.h" #include "eap_variable_data.h" #include "abs_eap_am_mutex.h" @@ -39,7 +60,7 @@ /// Class creates and reads the messages used in EAP-general settings interface on the server side. -class EAP_EXPORT eap_general_settings_server_message_if_c +class EAP_CLASS_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_general_settings_server_message_if_c : public abs_eap_am_general_settings_c , public eap_am_message_if_c , public abs_eap_base_timer_c @@ -106,51 +127,51 @@ /** * The destructor deletes the m_eap_core object. */ - EAP_FUNC_IMPORT virtual ~eap_general_settings_server_message_if_c(); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H virtual ~eap_general_settings_server_message_if_c(); /** * The constructor creates the eap_core object and initializes the m_eap_core * to point the eap_core object. * @param tools is pointer to the tools class. @see abs_eap_am_tools_c. */ - EAP_FUNC_IMPORT eap_general_settings_server_message_if_c( + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_general_settings_server_message_if_c( abs_eap_am_tools_c * const tools); - EAP_FUNC_IMPORT void set_partner(abs_eap_am_message_if_c * const partner); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H void set_partner(abs_eap_am_message_if_c * const partner); - EAP_FUNC_IMPORT eap_status_e process_data(const void * const data, const u32_t length); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e process_data(const void * const data, const u32_t length); // This is documented in abs_eap_stack_interface_c::configure(). - EAP_FUNC_IMPORT eap_status_e configure( + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e configure( const eap_variable_data_c * const client_configuration); // This is documented in abs_eap_stack_interface_c::shutdown(). - EAP_FUNC_IMPORT eap_status_e shutdown(); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e shutdown(); // This is documented in abs_eap_stack_interface_c::set_is_valid(). - EAP_FUNC_IMPORT void set_is_valid(); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H void set_is_valid(); // This is documented in abs_eap_stack_interface_c::get_is_valid(). - EAP_FUNC_IMPORT bool get_is_valid(); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H bool get_is_valid(); // See abs_eap_base_timer_c::timer_expired(). - EAP_FUNC_IMPORT eap_status_e timer_expired( + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e timer_expired( const u32_t id, void *data); // See abs_eap_base_timer_c::timer_delete_data(). - EAP_FUNC_IMPORT eap_status_e timer_delete_data( + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e timer_delete_data( const u32_t id, void *data); - EAP_FUNC_IMPORT eap_status_e complete_set_eap_methods(const eap_method_settings_c * const internal_settings); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e complete_set_eap_methods(const eap_method_settings_c * const internal_settings); - EAP_FUNC_IMPORT eap_status_e complete_get_eap_methods(const eap_method_settings_c * const internal_settings); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e complete_get_eap_methods(const eap_method_settings_c * const internal_settings); - EAP_FUNC_IMPORT eap_status_e complete_get_certificate_lists(const eap_method_settings_c * const internal_settings); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e complete_get_certificate_lists(const eap_method_settings_c * const internal_settings); - EAP_FUNC_IMPORT eap_status_e complete_delete_all_eap_settings(const eap_method_settings_c * const internal_settings); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e complete_delete_all_eap_settings(const eap_method_settings_c * const internal_settings); - EAP_FUNC_IMPORT eap_status_e complete_copy_all_eap_settings(const eap_method_settings_c * const internal_settings); + EAP_FUNC_VISIBILITY_EAP_GENERAL_SETTINGS_SERVER_MESSAGE_IF_H eap_status_e complete_copy_all_eap_settings(const eap_method_settings_c * const internal_settings); //-------------------------------------------------- }; // class eap_general_settings_server_message_if_c