# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1270582473 -3600
# Node ID 3f122ca50ab98127373585167f70ea1aa3491b69
# Parent  5431fd16d0e9115db51f92dfafae3bc5b1a79343
Remove spurious EAP_NO_EXPORTS macros and add missing EAP_FUNC_EXPORT markers, to fix Bug 629 and address Bug 2460

diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/am/common/eap_file_config.cpp
--- a/eapol/eapol_framework/eapol_common/am/common/eap_file_config.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/am/common/eap_file_config.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1271,7 +1271,7 @@
 
 //-----------------------------------------------------------------
 
-eap_status_e eap_file_config_c::find_rvalue(
+EAP_FUNC_EXPORT eap_status_e eap_file_config_c::find_rvalue(
 	const eap_variable_data_c * const config_param,
 	bool * const read_env_value,
 	eap_variable_data_c * const param_name,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eap_core.cpp
--- a/eapol/eapol_framework/eapol_common/core/eap_core.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eap_core.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -242,7 +242,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_core_c::initialize_asynchronous_init_remove_eap_session(
+EAP_FUNC_EXPORT eap_status_e eap_core_c::initialize_asynchronous_init_remove_eap_session(
 	const u32_t remove_session_timeout)
 {
 	EAP_TRACE_DEBUG(
@@ -314,7 +314,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_core_c::cancel_asynchronous_init_remove_eap_session()
+EAP_FUNC_EXPORT eap_status_e eap_core_c::cancel_asynchronous_init_remove_eap_session()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 
@@ -343,7 +343,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_core_c::asynchronous_init_remove_eap_session()
+EAP_FUNC_EXPORT eap_status_e eap_core_c::asynchronous_init_remove_eap_session()
 {
 	EAP_TRACE_DEBUG(
 		m_am_tools, 
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eap_session_core.cpp
--- a/eapol/eapol_framework/eapol_common/core/eap_session_core.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eap_session_core.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1274,7 +1274,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_session_core_c::asynchronous_init_remove_eap_session(
+EAP_FUNC_EXPORT eap_status_e eap_session_core_c::asynchronous_init_remove_eap_session(
 	const eap_network_id_selector_c * const state_selector)
 {
 	EAP_TRACE_DEBUG(
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eapol_core.cpp
--- a/eapol/eapol_framework/eapol_common/core/eapol_core.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eapol_core.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1489,7 +1489,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_core_c::read_reassociation_parameters(
+EAP_FUNC_EXPORT eap_status_e eapol_core_c::read_reassociation_parameters(
 	const eap_am_network_id_c * const old_receive_network_id, ///< source includes remote address, destination includes local address.
 	const eap_am_network_id_c * const new_receive_network_id, ///< source includes remote address, destination includes local address.
 	const eapol_key_authentication_type_e authentication_type,
@@ -1739,7 +1739,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_core_c::complete_reassociation(
+EAP_FUNC_EXPORT eap_status_e eapol_core_c::complete_reassociation(
 	const eapol_wlan_authentication_state_e reassociation_result,
 	const eap_am_network_id_c * const receive_network_id,
 	const eapol_key_authentication_type_e authentication_type,
@@ -2857,7 +2857,7 @@
 #if defined(USE_EAPOL_KEY_STATE)
 
 //
-eap_status_e eapol_core_c::asynchronous_init_remove_eapol_key_state(
+EAP_FUNC_EXPORT eap_status_e eapol_core_c::asynchronous_init_remove_eapol_key_state(
 	const eap_am_network_id_c * const send_network_id)
 {
 	EAP_TRACE_DEBUG(
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eapol_key_state_client.cpp
--- a/eapol/eapol_framework/eapol_common/core/eapol_key_state_client.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eapol_key_state_client.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -45,7 +45,7 @@
 
 //--------------------------------------------------
 //
-eap_status_e eapol_key_state_c::create_4_way_handshake_message_2(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_4_way_handshake_message_2(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -260,7 +260,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_4_way_handshake_message_4(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_4_way_handshake_message_4(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -411,7 +411,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_1(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_1(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t /* packet_length */)
@@ -769,7 +769,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_3_payloads_a(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_3_payloads_a(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length,
@@ -962,7 +962,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_3_payloads_b(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_3_payloads_b(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t /* packet_length */,
@@ -1138,7 +1138,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_3(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_3(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -1448,7 +1448,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_eapol_key_handshake_message_0(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_eapol_key_handshake_message_0(
 	const bool true_when_4_way_handshake, ///< With false initiates Group Key Handshake.
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
@@ -1578,7 +1578,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_group_key_handshake_message_2(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_group_key_handshake_message_2(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -1721,7 +1721,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_group_key_handshake_message_1(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_group_key_handshake_message_1(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -2161,7 +2161,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_RC4_key_descriptor(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_RC4_key_descriptor(
 	const eap_am_network_id_c * const receive_network_id,
 	eap_general_header_base_c * const packet_data,
 	const u32_t packet_length)
@@ -2561,7 +2561,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::initialize_4_way_handshake(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::initialize_4_way_handshake(
 	const eap_am_network_id_c * const receive_network_id,
 	const eapol_protocol_version_e used_eapol_version)
 {
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eapol_key_state_common.cpp
--- a/eapol/eapol_framework/eapol_common/core/eapol_key_state_common.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eapol_key_state_common.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1680,7 +1680,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::complete_reassociation(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::complete_reassociation(
 	const eapol_wlan_authentication_state_e reassociation_result,
 	const eap_am_network_id_c * const /* receive_network_id */,
 	const eapol_key_authentication_type_e authentication_type,
@@ -2690,7 +2690,7 @@
 //--------------------------------------------------
 
 // 
-eap_status_e eapol_key_state_c::check_is_aes_key_wrap_padding(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::check_is_aes_key_wrap_padding(
 	const eapol_RSNA_key_descriptor_type_e /* current_key_data_type */,
 	eapol_rsna_key_data_header_c * const key_data_payload,
 	const u32_t key_data_max_length
@@ -2722,7 +2722,7 @@
 //--------------------------------------------------
 
 // 
-eap_status_e eapol_key_state_c::parse_generic_key_data_payload(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::parse_generic_key_data_payload(
 	const eapol_key_descriptor_type_e eapol_key_descriptor_type,
 	const eapol_RSNA_key_descriptor_type_e current_key_descriptor_type,
 	eapol_rsna_key_data_header_c * const key_data_payload,
@@ -3466,7 +3466,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::parse_key_data(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::parse_key_data(
 	const eapol_key_descriptor_type_e eapol_key_descriptor_type,
 	const eapol_rsna_key_data_header_c * const p_payload,
 	u32_t * const buffer_length,
@@ -3626,7 +3626,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::rsna_prf(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::rsna_prf(
 	const eap_variable_data_c * const key_K,
 	const eap_variable_data_c * const label_A,
 	const eap_variable_data_c * const input_B,
@@ -3766,7 +3766,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::select_minimum(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::select_minimum(
 	const eap_variable_data_c * const input_a,
 	const eap_variable_data_c * const input_b,
 	const eap_variable_data_c ** const minimum,
@@ -3815,7 +3815,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::derive_PTK()
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::derive_PTK()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 
@@ -4097,7 +4097,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_nonce(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_nonce(
 	eap_variable_data_c * const nonce,	const u32_t nonce_length)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
@@ -4149,7 +4149,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_PMKID()
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_PMKID()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status = eap_status_process_general_error;
@@ -4286,7 +4286,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::encrypt_key_data(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::encrypt_key_data(
 	eapol_RSNA_key_header_c * const eapol_key_message)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
@@ -4488,7 +4488,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::decrypt_key_data(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::decrypt_key_data(
 	eapol_RSNA_key_header_c * const eapol_key_message)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
@@ -4637,7 +4637,7 @@
 
 
 //
-eap_status_e eapol_key_state_c::create_key_mic(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_key_mic(
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const eap_variable_data_c * const confirmation_key)
 {
@@ -4809,7 +4809,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::verify_key_mic(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::verify_key_mic(
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const eap_variable_data_c * const confirmation_key)
 {
@@ -6092,7 +6092,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_tkip_mic_failure_message(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_tkip_mic_failure_message(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -6401,7 +6401,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::allow_4_way_handshake()
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::allow_4_way_handshake()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status = eap_status_process_general_error;
@@ -6501,7 +6501,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::start_group_key_handshake(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::start_group_key_handshake(
 	const eap_am_network_id_c * const receive_network_id,
 	const eapol_protocol_version_e received_eapol_version,
 	const eapol_key_descriptor_type_e received_key_descriptor_type)
@@ -6634,7 +6634,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::get_key_length(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::get_key_length(
 	const eapol_RSNA_key_header_c::eapol_RSNA_cipher_e cipher,
 	u16_t * const key_length)
 {
@@ -6672,7 +6672,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -6777,7 +6777,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_group_key_handshake_message(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_group_key_handshake_message(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -6846,7 +6846,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_RSNA_key_descriptor(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_RSNA_key_descriptor(
 	const eap_am_network_id_c * const receive_network_id,
 	eap_general_header_base_c * const packet_data,
 	const u32_t packet_length)
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/eapol_key_state_server.cpp
--- a/eapol/eapol_framework/eapol_common/core/eapol_key_state_server.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/eapol_key_state_server.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -48,7 +48,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_4_way_handshake_message_1(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_4_way_handshake_message_1(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -303,7 +303,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_4_way_handshake_message_3(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_4_way_handshake_message_3(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -897,7 +897,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::send_RC4_eapol_key_messages()
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::send_RC4_eapol_key_messages()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 
@@ -948,7 +948,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::start_4_way_handshake(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::start_4_way_handshake(
 	const eap_am_network_id_c * const receive_network_id)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
@@ -1133,7 +1133,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_2_payloads(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_2_payloads(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -1308,7 +1308,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_0(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_0(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t /* packet_length */)
@@ -1420,7 +1420,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_2(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_2(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -1591,7 +1591,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_4_way_handshake_message_4(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_4_way_handshake_message_4(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -1862,7 +1862,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::create_group_key_handshake_message_1(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::create_group_key_handshake_message_1(
 	eap_buf_chain_wr_c * const sent_packet,
 	const u32_t eapol_header_offset,
 	u32_t * const data_length,
@@ -2150,7 +2150,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_group_key_handshake_message_0(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_group_key_handshake_message_0(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
@@ -2282,7 +2282,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eapol_key_state_c::process_group_key_handshake_message_2(
+EAP_FUNC_EXPORT eap_status_e eapol_key_state_c::process_group_key_handshake_message_2(
 	const eap_am_network_id_c * const receive_network_id,
 	eapol_RSNA_key_header_c * const eapol_key_message,
 	const u32_t packet_length)
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/core/ethernet_core.cpp
--- a/eapol/eapol_framework/eapol_common/core/ethernet_core.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/core/ethernet_core.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -447,7 +447,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e ethernet_core_c::read_reassociation_parameters(
+EAP_FUNC_EXPORT eap_status_e ethernet_core_c::read_reassociation_parameters(
 	const eap_am_network_id_c * const old_receive_network_id, ///< source includes remote address, destination includes local address.
 	const eap_am_network_id_c * const new_receive_network_id, ///< source includes remote address, destination includes local address.
 	const eapol_key_authentication_type_e authentication_type,
@@ -501,7 +501,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e ethernet_core_c::complete_reassociation(
+EAP_FUNC_EXPORT eap_status_e ethernet_core_c::complete_reassociation(
 	const eapol_wlan_authentication_state_e reassociation_result,
 	const eap_am_network_id_c * const receive_network_id,
 	const eapol_key_authentication_type_e authentication_type,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka.cpp
--- a/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -383,7 +383,7 @@
 //-----------------------------------------------
 
 //
-void eap_type_aka_c::initialize_state(
+EAP_FUNC_EXPORT void eap_type_aka_c::initialize_state(
 				const eap_type_aka_state_variable_e state,
 				const bool must_be_initiator,
 				const bool must_be_responder,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka_client.cpp
--- a/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka_client.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka_client.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -5325,7 +5325,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_type_aka_c::handle_eap_identity_query(
+EAP_FUNC_EXPORT eap_status_e eap_type_aka_c::handle_eap_identity_query(
 	const eap_am_network_id_c * const send_network_id,
 	eap_variable_data_c * const p_identity,
 	const u8_t eap_identifier,
@@ -5734,7 +5734,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_type_aka_c::query_eap_identity(
+EAP_FUNC_EXPORT eap_status_e eap_type_aka_c::query_eap_identity(
 	const bool must_be_synchronous,
 	eap_variable_data_c * const identity,
 	const eap_am_network_id_c * const receive_network_id,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim.cpp
--- a/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -344,7 +344,7 @@
 #if !defined(NO_EAP_TYPE_GSMSIM_MESSAGE_STATE_CHECK)
 
 //
-void eap_type_gsmsim_c::initialize_state(
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::initialize_state(
 				const eap_type_gsmsim_state_variable_e state,
 				const bool must_be_initiator,
 				const bool must_be_responder,
@@ -626,7 +626,7 @@
  * This function saves the current m_state to m_saved_previous_state.
  * The saved state is restored in error case.
  */
-void eap_type_gsmsim_c::save_current_state()
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::save_current_state()
 {
 	m_saved_previous_state = m_state;
 }
@@ -636,7 +636,7 @@
 /**
  * This function restores the saved state.
  */
-void eap_type_gsmsim_c::restore_saved_previous_state()
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::restore_saved_previous_state()
 {
 	set_state(m_saved_previous_state);
 }
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_client.cpp
--- a/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_client.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_client.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -5072,7 +5072,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_type_gsmsim_c::handle_eap_identity_query(
+EAP_FUNC_EXPORT eap_status_e eap_type_gsmsim_c::handle_eap_identity_query(
 	const eap_am_network_id_c * const send_network_id,
 	eap_variable_data_c * const p_identity,
 	const u8_t eap_identifier,
@@ -5458,7 +5458,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_type_gsmsim_c::query_eap_identity(
+EAP_FUNC_EXPORT eap_status_e eap_type_gsmsim_c::query_eap_identity(
 	const bool must_be_synchronous,
 	eap_variable_data_c * const identity,
 	const eap_am_network_id_c * const receive_network_id,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_header.cpp
--- a/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_header.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim_header.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -304,7 +304,7 @@
 	}
 }
 
-u32_t gsmsim_header_c::get_sub_type_offset() const
+EAP_FUNC_EXPORT u32_t gsmsim_header_c::get_sub_type_offset() const
 {
 	return eap_header_base_c::get_header_length() + eap_header_base_c::get_type_field_length() + m_subtype_delta_offset;
 }
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/simple_config/simple_config/src/simple_config_payloads.cpp
--- a/eapol/eapol_framework/eapol_common/type/simple_config/simple_config/src/simple_config_payloads.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/simple_config/simple_config/src/simple_config_payloads.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1311,7 +1311,7 @@
 
 //--------------------------------------------------
 
-simple_config_payloads_c * simple_config_payloads_c::copy() const
+EAP_FUNC_EXPORT simple_config_payloads_c * simple_config_payloads_c::copy() const
 {
 	EAP_TRACE_DEBUG(
 		m_am_tools,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_record.cpp
--- a/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_record.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_record.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -60,7 +60,7 @@
 	EAP_STATUS_RETURN(tools, eap_status_return_and_create_tls_protocol_alert((status)))
 
 
-eap_status_e tls_record_c::eap_status_return_and_create_tls_protocol_alert(
+EAP_FUNC_EXPORT eap_status_e tls_record_c::eap_status_return_and_create_tls_protocol_alert(
 	const eap_status_e status)
 {
 	if (status != eap_status_ok
@@ -1190,7 +1190,7 @@
 
 //--------------------------------------------------
 
-void tls_record_c::send_error_notification(const eap_status_e error)
+EAP_FUNC_EXPORT void tls_record_c::send_error_notification(const eap_status_e error)
 {
 	// Notifies the lower level of an authentication error.
 
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/common/DSS_random/dss_random_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/common/DSS_random/dss_random_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/common/DSS_random/dss_random_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -114,7 +114,7 @@
  *              d. XKEY = (1 + XKEY + xj) mod 2^b.
  *  @endcode
 */
-eap_status_e dss_pseudo_random(abs_eap_am_tools_c * const m_am_tools, u8_t *out, u32_t out_length, u8_t *xkey, u32_t xkey_length)
+EAP_FUNC_EXPORT eap_status_e dss_pseudo_random(abs_eap_am_tools_c * const m_am_tools, u8_t *out, u32_t out_length, u8_t *xkey, u32_t xkey_length)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status = eap_status_ok;
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/common/file_io/symbian/eap_am_file_input_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/common/file_io/symbian/eap_am_file_input_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/common/file_io/symbian/eap_am_file_input_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -518,7 +518,7 @@
 /**
  * This function reads word from file.
  */
-eap_status_e eap_am_file_input_symbian_c::file_read_word(eap_variable_data_c * const word)
+EAP_FUNC_EXPORT eap_status_e eap_am_file_input_symbian_c::file_read_word(eap_variable_data_c * const word)
 {
 	if (word == 0
 		|| word->get_is_valid() == false)
@@ -626,14 +626,14 @@
  * If object initialization fails this function must return false.
  * @return This function returns the validity of this object.
  */
-bool eap_am_file_input_symbian_c::get_is_valid()
+EAP_FUNC_EXPORT bool eap_am_file_input_symbian_c::get_is_valid()
 {
 	return m_is_valid;
 }
 
 //----------------------------------------------------------------------------------------------------
 
-eap_status_e eap_am_file_input_symbian_c::directory_open(
+EAP_FUNC_EXPORT eap_status_e eap_am_file_input_symbian_c::directory_open(
 	const eap_variable_data_c * const /* directory_name */)
 {
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_not_supported);
@@ -641,7 +641,7 @@
 
 //----------------------------------------------------------------------------------------------------
 
-eap_status_e eap_am_file_input_symbian_c::directory_read(
+EAP_FUNC_EXPORT eap_status_e eap_am_file_input_symbian_c::directory_read(
 	eap_array_c<abs_eap_file_stat_c> * const /* directory_list */)
 {
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_not_supported);
@@ -652,7 +652,7 @@
 /**
  * This function closes the directory.
  */
-eap_status_e eap_am_file_input_symbian_c::directory_close()
+EAP_FUNC_EXPORT eap_status_e eap_am_file_input_symbian_c::directory_close()
 {
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_not_supported);
 }
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/core/symbian/eapol_am_wlan_authentication_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/core/symbian/eapol_am_wlan_authentication_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/core/symbian/eapol_am_wlan_authentication_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -775,7 +775,7 @@
 //--------------------------------------------------
 
 //
-void eapol_am_wlan_authentication_symbian_c::state_notification(
+EAP_FUNC_EXPORT void eapol_am_wlan_authentication_symbian_c::state_notification(
 	const abs_eap_state_notification_c * const state)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/eap_test_timer/symbian/eap_test_timer.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/eap_test_timer/symbian/eap_test_timer.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/eap_test_timer/symbian/eap_test_timer.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -50,7 +50,7 @@
 _LIT(K_eap_test_timer,"eap_test_timer");
 
 
-eap_status_e eap_am_tools_symbian_c::start_timer_thread()
+EAP_FUNC_EXPORT eap_status_e eap_am_tools_symbian_c::start_timer_thread()
 { 
 	EAP_TRACE_DEBUG(this, TRACE_FLAGS_DEFAULT, (EAPL("Create timer thread.\n")));
 
@@ -81,7 +81,7 @@
 }
 
 
-eap_status_e eap_am_tools_symbian_c::stop_timer_thread()
+EAP_FUNC_EXPORT eap_status_e eap_am_tools_symbian_c::stop_timer_thread()
 {
 	EAP_TRACE_DEBUG(this, TRACE_FLAGS_DEFAULT, (EAPL("Trigger timer thread stops.\n")));
 
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/eap_am_type_aka_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/eap_am_type_aka_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/eap_am_type_aka_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -225,7 +225,7 @@
 
 //--------------------------------------------------
 
-eap_am_type_aka_symbian_c* eap_am_type_aka_symbian_c::NewL(
+EAP_FUNC_EXPORT eap_am_type_aka_symbian_c* eap_am_type_aka_symbian_c::NewL(
 	abs_eap_am_tools_c * const aTools,
 	abs_eap_base_type_c * const aPartner,
 	const TIndexType aIndexType,
@@ -1386,7 +1386,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_aka_symbian_c::complete_AKA_imsi_L(
+EAP_FUNC_EXPORT eap_status_e eap_am_type_aka_symbian_c::complete_AKA_imsi_L(
 	const eap_variable_data_c * const IMSI,
 	const eap_status_e completion_status )
 {
@@ -1700,7 +1700,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_aka_symbian_c::complete_AKA_RES_L(
+EAP_FUNC_EXPORT eap_status_e eap_am_type_aka_symbian_c::complete_AKA_RES_L(
 	eap_variable_data_c * const aRES, 
 	eap_variable_data_c * const aCK,
 	eap_variable_data_c * const aIK,
@@ -2605,7 +2605,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_aka_symbian_c::generate_reauthentication_id(
+EAP_FUNC_EXPORT eap_status_e eap_am_type_aka_symbian_c::generate_reauthentication_id(
 	const eap_am_network_id_c * const send_network_id,
 	const eap_variable_data_c * const imsi,
 	eap_variable_data_c * const reauthentication_identity,
@@ -2982,7 +2982,7 @@
 
 //--------------------------------------------------
 
-bool eap_am_type_aka_symbian_c::is_session_valid()
+EAP_FUNC_EXPORT bool eap_am_type_aka_symbian_c::is_session_valid()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/eap_am_type_gsmsim_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/eap_am_type_gsmsim_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/eap_am_type_gsmsim_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -354,7 +354,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_gsmsim_symbian_c::authentication_finished(
+EAP_FUNC_EXPORT eap_status_e eap_am_type_gsmsim_symbian_c::authentication_finished(
 	const bool true_when_successful,
 	const eap_gsmsim_authentication_type_e authentication_type,
 	const eap_type_gsmsim_identity_type identity_type)
@@ -1576,7 +1576,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_am_type_gsmsim_symbian_c::cancel_SIM_IMSI_or_pseudonym_or_reauthentication_id_query()
+EAP_FUNC_EXPORT eap_status_e eap_am_type_gsmsim_symbian_c::cancel_SIM_IMSI_or_pseudonym_or_reauthentication_id_query()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 #if defined (USE_EAP_GSMSIM_INTERFACE) && !defined(__WINS__)
@@ -1940,7 +1940,7 @@
 //-------------------------------------------------
 
 //
-eap_status_e eap_am_type_gsmsim_symbian_c::cancel_SIM_kc_sres_query()
+EAP_FUNC_EXPORT eap_status_e eap_am_type_gsmsim_symbian_c::cancel_SIM_kc_sres_query()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 		
@@ -2461,7 +2461,7 @@
 //--------------------------------------------------
 
 //
-eap_status_e eap_am_type_gsmsim_symbian_c::cancel_imsi_from_username_query()
+EAP_FUNC_EXPORT eap_status_e eap_am_type_gsmsim_symbian_c::cancel_imsi_from_username_query()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -711,7 +711,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_mschapv2_symbian_c::update_username_password()
+EAP_FUNC_EXPORT eap_status_e eap_am_type_mschapv2_symbian_c::update_username_password()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status(eap_status_ok);
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/type/protected_setup/eap_am_type_protected_setup_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/protected_setup/eap_am_type_protected_setup_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/type/protected_setup/eap_am_type_protected_setup_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -139,7 +139,7 @@
 
 //--------------------------------------------------
 
-eap_am_type_protected_setup_symbian_c* eap_am_type_protected_setup_symbian_c::NewL(
+EAP_FUNC_EXPORT eap_am_type_protected_setup_symbian_c* eap_am_type_protected_setup_symbian_c::NewL(
 	abs_eap_am_tools_c * const tools,
 	abs_eap_base_type_c * const partner,
 	const TIndexType aIndexType,
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp	Tue Apr 06 20:34:33 2010 +0100
@@ -1121,7 +1121,7 @@
 //--------------------------------------------------
 
 //
-void eap_am_type_tls_peap_symbian_c::notify_configuration_error(
+EAP_FUNC_EXPORT void eap_am_type_tls_peap_symbian_c::notify_configuration_error(
 	const eap_status_e configuration_status)
 {
 	if (m_is_client == true)
@@ -1956,7 +1956,7 @@
 
 //--------------------------------------------------
 
-eap_status_e eap_am_type_tls_peap_symbian_c::reset()
+EAP_FUNC_EXPORT eap_status_e eap_am_type_tls_peap_symbian_c::reset()
 {
 
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eapaka.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -94,8 +94,6 @@
 		
 #endif // End of #if !defined(WINS) && defined(USE_EAP_AKA_INTERFACE)
 
-MACRO EAP_NO_EXPORTS
-
 LIBRARY     eikdlg.lib
 LIBRARY     eikcore.lib
 LIBRARY     hlplch.lib
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -98,8 +98,6 @@
 
 LANG		  SC
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -79,53 +79,6 @@
 USERINCLUDE   ../am/include
 USERINCLUDE   ../am/type/protected_setup/symbian/plugin/inc
 
-/*
-
-//USERINCLUDE   ../am/type/tls_peap/symbian/plugin/inc
-
-USERINCLUDE   ../../eapol_common/am/include
-USERINCLUDE   ../../eapol_common/type
-USERINCLUDE   ../../eapol_common/type/diameter/include
-
-#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-USERINCLUDE   ../../eapol_common/type/mschapv2/include
-#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-
-#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-SOURCEPATH    ../../eapol_common/type/mschapv2/core
-SOURCE		  eap_type_mschapv2_header.cpp
-#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
-
-*/
-
-//SOURCEPATH		../am/type/tls_peap/symbian/plugin/inc
-//DOCUMENT		101f8e4c.loc
-
-/*
-// UI 
-SOURCEPATH    ../am/type/tls_peap/symbian/plugin/src
-SOURCE		  EapTlsPeapUiConnection.cpp
-SOURCE        EapTlsPeapUiDataConnection.cpp
-SOURCE        EapTlsPeapUiTlsPeapData.cpp
-SOURCE		  EapTlsPeapCertFetcher.cpp
-SOURCE        EapTlsPeapUiEapTypes.cpp
-SOURCE        EapTlsPeapUiCertificates.cpp
-SOURCE        EapTlsPeapUiCipherSuites.cpp
-*/
-/*
-LIBRARY       avkon.lib
-LIBRARY       AknSkins.lib
-LIBRARY       AknIcon.lib
-STATICLIBRARY eaptlsui.lib
-STATICLIBRARY eappeapui.lib
-STATICLIBRARY eapttlsui.lib
-LIBRARY		  x509certnameparser.lib		// For parsing of certificate label. 
-
-//SYSTEMINCLUDE /epoc32/include/ecom
-//SYSTEMINCLUDE /epoc32/include/libc
-//SYSTEMINCLUDE /epoc32/include/cshelp
-*/
-
 LANG		  SC
 
 MW_LAYER_SYSTEMINCLUDE // For the MiddleWare domain headers.
@@ -136,20 +89,6 @@
 
 LIBRARY 	wlandbif.lib
 
-//LIBRARY	    x509.lib crypto.lib certstore.lib ctframework.lib pkixcert.lib
-//LIBRARY		asn1.lib x500.lib bafl.lib eikctl.lib egul.lib fbscli.lib
-/*
-LIBRARY		gdi.lib
-LIBRARY		cryptography.lib
-LIBRARY     eikdlg.lib
-LIBRARY     eikcore.lib
-LIBRARY		CommonEngine.lib
-
-LIBRARY     hlplch.lib
-LIBRARY		featmgr.lib
-*/
-
-MACRO EAP_NO_EXPORTS=1
 
 //-------------------------------------------------------------------
 
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -89,8 +89,6 @@
 
 LANG		  SC
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eapsim.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -94,8 +94,6 @@
 	LIBRARY		CustomAPI.lib etelmm.lib etel.lib	// For ETel connection	
 #endif // End of #if !defined(WINS) && defined(USE_EAP_GSMSIM_INTERFACE)
 
-MACRO EAP_NO_EXPORTS
-
 LIBRARY     eikdlg.lib
 LIBRARY     eikcore.lib
 LIBRARY     hlplch.lib
diff -r 5431fd16d0e9 -r 3f122ca50ab9 eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Mon Mar 29 12:26:09 2010 +0100
+++ b/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Tue Apr 06 20:34:33 2010 +0100
@@ -159,8 +159,6 @@
 
 LIBRARY     charconv.lib
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------