diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/include/eap_core_server_message_if.h
--- a/eapol/eapol_framework/eapol_common/include/eap_core_server_message_if.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_core_server_message_if.h	Thu Sep 16 13:07:04 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_CORE_SERVER_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H 
+	#define EAP_FUNC_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H 
+#elif defined(EAP_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_CORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_EAP_CORE_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"
@@ -46,7 +67,7 @@
 
 
 /// A eap_core_server_message_if_c class implements the basic functionality of EAPOL.
-class EAP_EXPORT eap_core_server_message_if_c
+class EAP_CLASS_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_core_server_message_if_c
 : public abs_eap_session_core_c
 , public eap_am_message_if_c
 , public abs_eap_base_timer_c
@@ -143,7 +164,7 @@
 	/**
 	 * The destructor deletes the m_eap_core object.
 	 */
-	EAP_FUNC_IMPORT virtual ~eap_core_server_message_if_c();
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H virtual ~eap_core_server_message_if_c();
 
 	/**
 	 * The constructor creates the eap_core object and initializes the m_eap_core
@@ -154,14 +175,14 @@
 	 * as a client (true) or server (false), in terms of EAP-protocol whether
 	 * this network entity is EAP-supplicant (true) or EAP-authenticator (false).
 	 */
-	EAP_FUNC_IMPORT eap_core_server_message_if_c(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_core_server_message_if_c(
 		abs_eap_am_tools_c * const tools,
 		const bool is_client_when_true,
 		const u32_t MTU);
 
-	EAP_FUNC_IMPORT void set_partner(abs_eap_am_message_if_c * const partner);
+	EAP_FUNC_VISIBILITY_EAP_CORE_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_CORE_SERVER_MESSAGE_IF_H eap_status_e process_data(const void * const data, const u32_t length);
 
 	/**
 	 * The class could send packets to partner class with this function.
@@ -173,7 +194,7 @@
 	 * @param data_length is length in bytes of the EAP-packet.
 	 * @param buffer_length is length in bytes of the whole packet buffer.
 	 */
-	EAP_FUNC_IMPORT eap_status_e packet_send(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e packet_send(
 		const eap_am_network_id_c * const send_network_id,
 		eap_buf_chain_wr_c * const sent_packet,
 		const u32_t header_offset,
@@ -189,7 +210,7 @@
 	 * @return Function returns the offset of EAP-header.
 	 * @see abs_eap_core_c::get_header_offset().
 	 */
-	EAP_FUNC_IMPORT u32_t get_header_offset(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H u32_t get_header_offset(
 		u32_t * const MTU,
 		u32_t * const trailer_length);
 
@@ -198,7 +219,7 @@
 	 * load new module of EAP-type.
 	 * @see abs_eap_core_c::load_module().
 	 */
-	EAP_FUNC_IMPORT eap_status_e load_module(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e load_module(
 		const eap_type_value_e type,
 		const eap_type_value_e /* tunneling_type */,
 		abs_eap_base_type_c * const partner,
@@ -210,7 +231,7 @@
 	 * The unload_module() function unloads the module of a EAP-type. 
 	 * @see abs_eap_core_c::unload_module().
 	 */
-	EAP_FUNC_IMPORT eap_status_e unload_module(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e unload_module(
 		const eap_type_value_e type); 
 
 	/**
@@ -220,17 +241,17 @@
 	 * to offer the keys to lower level.
 	 * @see abs_eap_base_type_c::packet_data_crypto_keys().
 	 */
-	EAP_FUNC_IMPORT eap_status_e packet_data_crypto_keys(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e packet_data_crypto_keys(
 		const eap_am_network_id_c * const send_network_id,
 		const eap_master_session_key_c * const master_session_key
 		);
 
 	// This is documented in abs_eap_stack_interface_c::configure().
-	EAP_FUNC_IMPORT eap_status_e configure(
+	EAP_FUNC_VISIBILITY_EAP_CORE_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_CORE_SERVER_MESSAGE_IF_H eap_status_e shutdown();
 
 	/**
 	 * The read_configure() function reads the configuration data identified
@@ -238,7 +259,7 @@
 	 * the query to some persistent store.
 	 * @see abs_eap_base_type_c::read_configure().
 	 */
-	EAP_FUNC_IMPORT eap_status_e read_configure(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e read_configure(
 		const eap_configuration_field_c * const field,
 		eap_variable_data_c * const data);
 
@@ -248,33 +269,33 @@
 	 * the action to some persistent store.
 	 * @see abs_eap_base_type_c::write_configure().
 	 */
-	EAP_FUNC_IMPORT eap_status_e write_configure(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e write_configure(
 		const eap_configuration_field_c * const field,
 		eap_variable_data_c * const data);
 
 	// This is documented in abs_eap_stack_interface_c::set_is_valid().
-	EAP_FUNC_IMPORT void set_is_valid();
+	EAP_FUNC_VISIBILITY_EAP_CORE_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_CORE_SERVER_MESSAGE_IF_H bool get_is_valid();
 
 	// See abs_eap_base_type_c::state_notification().
-	EAP_FUNC_IMPORT void state_notification(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H void state_notification(
 		const abs_eap_state_notification_c * const state);
 
 	// See abs_eap_base_timer_c::timer_expired().
-	EAP_FUNC_IMPORT eap_status_e timer_expired(
+	EAP_FUNC_VISIBILITY_EAP_CORE_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_CORE_SERVER_MESSAGE_IF_H eap_status_e timer_delete_data(
 		const u32_t id, void *data);
 
 	/**
 	 * This function tells lower layer to remove EAP session object asyncronously.
 	 * @param send_network_id is pointer to network id that identifies the removed EAP session.
 	 */
-	EAP_FUNC_IMPORT eap_status_e asynchronous_init_remove_eap_session(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e asynchronous_init_remove_eap_session(
 		const eap_am_network_id_c * const send_network_id);
 
 	/**
@@ -282,44 +303,44 @@
 	 * when EAP-authentication is needed with another peer.
 	 * @see abs_eap_core_c::asynchronous_start_authentication().
 	 */
-	EAP_FUNC_IMPORT eap_status_e asynchronous_start_authentication(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e asynchronous_start_authentication(
 		const eap_am_network_id_c * const /* receive_network_id */,
 		const bool /* is_client_when_true */);
 
-	EAP_FUNC_IMPORT eap_status_e restart_authentication(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e restart_authentication(
 		const eap_am_network_id_c * const send_network_id,
 		const bool is_client_when_true,
 		const bool force_clean_restart,
 		const bool from_timer = false);
 
 	//
-	EAP_FUNC_IMPORT eap_status_e set_timer(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e set_timer(
 		abs_eap_base_timer_c * const p_initializer, 
 		const u32_t p_id, 
 		void * const p_data,
 		const u32_t p_time_ms);
 
-	EAP_FUNC_IMPORT eap_status_e cancel_timer(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e cancel_timer(
 		abs_eap_base_timer_c * const p_initializer, 
 		const u32_t p_id);
 
 	//
-	EAP_FUNC_IMPORT eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
 
 	// See abs_eap_core_c::get_eap_type_list().
-	EAP_FUNC_IMPORT eap_status_e get_eap_type_list(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e get_eap_type_list(
 		eap_array_c<eap_type_value_e> * const eap_type_list);
 
 	/// @see abs_eap_core_c::add_rogue_ap().
-	EAP_FUNC_IMPORT eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
 
 	// This is documented in abs_eap_core_c::set_session_timeout().
-	EAP_FUNC_IMPORT eap_status_e set_session_timeout(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e set_session_timeout(
 		const u32_t session_timeout_ms);
 
 #if defined(USE_EAP_SIMPLE_CONFIG)
 
-	EAP_FUNC_IMPORT eap_status_e save_simple_config_session(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e save_simple_config_session(
 		const simple_config_state_e state,
 		EAP_TEMPLATE_CONST eap_array_c<simple_config_credential_c> * const credential_array,
 		const eap_variable_data_c * const new_password,
@@ -328,7 +349,7 @@
 
 #endif // #if defined(USE_EAP_SIMPLE_CONFIG)
 
-	EAP_FUNC_IMPORT eap_status_e complete_get_802_11_authentication_mode(
+	EAP_FUNC_VISIBILITY_EAP_CORE_SERVER_MESSAGE_IF_H eap_status_e complete_get_802_11_authentication_mode(
 		const eap_status_e completion_status,
 		const eap_am_network_id_c * const receive_network_id,
 		const eapol_key_802_11_authentication_mode_e mode);