diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_symbian/am/include/eapol_am_wlan_authentication_symbian.h --- a/eapol/eapol_framework/eapol_symbian/am/include/eapol_am_wlan_authentication_symbian.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/include/eapol_am_wlan_authentication_symbian.h Mon Oct 04 00:19:54 2010 +0300 @@ -23,6 +23,27 @@ #define _EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H_ #include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H + #define EAP_C_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H + #define EAP_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H +#elif defined(EAP_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H +#endif +// End: added by script change_export_macros.sh. #include "eapol_am_wlan_authentication.h" #include "eapol_wlan_database_reference.h" #include "eap_am_network_id.h" @@ -55,7 +76,7 @@ /// This class declares the simulator adaptation module of eapol_am_wlan_authentication_c. /// See comments of the functions from eapol_am_wlan_authentication_c. -class EAP_EXPORT eapol_am_wlan_authentication_symbian_c +class EAP_CLASS_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eapol_am_wlan_authentication_symbian_c : public eapol_am_wlan_authentication_c #if defined(USE_EAP_SIMPLE_CONFIG) , public abs_eap_configuration_if_c @@ -163,78 +184,78 @@ //-------------------------------------------------- // - EAP_FUNC_IMPORT virtual ~eapol_am_wlan_authentication_symbian_c(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H virtual ~eapol_am_wlan_authentication_symbian_c(); // - EAP_FUNC_IMPORT eapol_am_wlan_authentication_symbian_c( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eapol_am_wlan_authentication_symbian_c( abs_eap_am_tools_c * const tools, const bool is_client_when_true); /// See comments of the functions from eapol_am_wlan_authentication_c. - EAP_FUNC_IMPORT bool get_is_valid(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H bool get_is_valid(); - EAP_FUNC_IMPORT eap_status_e configure(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e configure(); - EAP_FUNC_IMPORT eap_status_e shutdown(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e shutdown(); - EAP_FUNC_IMPORT eap_status_e set_am_partner( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e set_am_partner( abs_eapol_am_wlan_authentication_c * am_partner #if defined(USE_EAP_SIMPLE_CONFIG) , abs_eap_configuration_if_c * const configuration_if #endif // #if defined(USE_EAP_SIMPLE_CONFIG) ); - EAP_FUNC_IMPORT eap_status_e reset_wpa_configuration(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e reset_wpa_configuration(); - EAP_FUNC_IMPORT eap_status_e set_wlan_parameters( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e set_wlan_parameters( const eap_variable_data_c * const SSID, const bool WPA_override_enabled, const eap_variable_data_c * const wpa_preshared_key, const eapol_key_authentication_type_e selected_eapol_key_authentication_type); - EAP_FUNC_IMPORT eap_status_e association( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e association( const eap_am_network_id_c * const receive_network_id); - EAP_FUNC_IMPORT eap_status_e disassociation( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e disassociation( const eap_am_network_id_c * const receive_network_id ///< source includes remote address, destination includes local address. ); - EAP_FUNC_IMPORT eap_status_e get_wlan_configuration( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e get_wlan_configuration( eap_variable_data_c * const wpa_preshared_key_hash); - EAP_FUNC_IMPORT eap_status_e authentication_finished( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e authentication_finished( const bool when_true_successfull, const eap_type_value_e eap_type, const eapol_key_authentication_type_e authentication_type); - EAP_FUNC_IMPORT eap_status_e read_configure( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e read_configure( const eap_configuration_field_c * const field, eap_variable_data_c * const data); - EAP_FUNC_IMPORT eap_status_e write_configure( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e write_configure( const eap_configuration_field_c * const field, eap_variable_data_c * const data); - EAP_FUNC_IMPORT eap_status_e set_timer( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e set_timer( abs_eap_base_timer_c * const initializer, const u32_t id, void * const data, const u32_t p_time_ms); - EAP_FUNC_IMPORT eap_status_e cancel_timer( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e cancel_timer( abs_eap_base_timer_c * const initializer, const u32_t id); - EAP_FUNC_IMPORT eap_status_e cancel_all_timers(); + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e cancel_all_timers(); - EAP_FUNC_IMPORT void state_notification( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H void state_notification( const abs_eap_state_notification_c * const state); #if defined(USE_EAP_SIMPLE_CONFIG) - EAP_FUNC_IMPORT eap_status_e save_simple_config_session( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e save_simple_config_session( const simple_config_state_e state, EAP_TEMPLATE_CONST eap_array_c * const credential_array, const eap_variable_data_c * const new_password, @@ -243,7 +264,7 @@ #endif // #if defined(USE_EAP_SIMPLE_CONFIG) - EAP_FUNC_IMPORT eap_status_e set_eap_database_reference_values( + EAP_FUNC_VISIBILITY_EAPOL_AM_WLAN_AUTHENTICATION_SYMBIAN_H eap_status_e set_eap_database_reference_values( const eap_variable_data_c * const reference); //--------------------------------------------------