diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/include/eap_pac_store_server_message_if.h
--- a/eapol/eapol_framework/eapol_common/include/eap_pac_store_server_message_if.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_pac_store_server_message_if.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: %
+* %version: 9 %
 */
 
 #if !defined(_EAP_PAC_STORE_SERVER_MESSAGE_IF_H_)
@@ -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_PAC_STORE_SERVER_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H 
+	#define EAP_FUNC_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H 
+#elif defined(EAP_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_PAC_STORE_SERVER_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_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 @@
 
 
 /// A eap_pac_store_server_message_if_c class implements the basic functionality of EAPOL.
-class EAP_EXPORT eap_pac_store_server_message_if_c
+class EAP_CLASS_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_pac_store_server_message_if_c
 : public abs_eap_am_pac_store_c
 , public eap_am_message_if_c
 , public abs_eap_base_timer_c
@@ -80,8 +101,6 @@
 
 	eap_status_e process_message(eap_process_tlv_message_data_c * const message);
 
-	eap_status_e open_pac_store(EAP_TEMPLATE_CONST eap_array_c<eap_tlv_header_c> * const parameters);
-	eap_status_e create_device_seed(EAP_TEMPLATE_CONST eap_array_c<eap_tlv_header_c> * const parameters);
     eap_status_e is_master_key_present(EAP_TEMPLATE_CONST eap_array_c<eap_tlv_header_c> * const parameters);
     eap_status_e is_master_key_and_password_matching(EAP_TEMPLATE_CONST eap_array_c<eap_tlv_header_c> * const parameters);
     eap_status_e create_and_save_master_key(EAP_TEMPLATE_CONST eap_array_c<eap_tlv_header_c> * const parameters);
@@ -110,70 +129,64 @@
 	/**
 	 * The destructor deletes the m_eap_core object.
 	 */
-	EAP_FUNC_IMPORT virtual ~eap_pac_store_server_message_if_c();
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H virtual ~eap_pac_store_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_pac_store_server_message_if_c(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_pac_store_server_message_if_c(
 		abs_eap_am_tools_c * const tools);
 
 	static eap_pac_store_server_message_if_c * new_eap_pac_store_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_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_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e timer_delete_data(
 		const u32_t id, void *data);
 
 
-	EAP_FUNC_IMPORT eap_status_e complete_open_pac_store(
-        const eap_status_e completion_status);
-
-	EAP_FUNC_IMPORT eap_status_e complete_create_device_seed(
-        const eap_status_e completion_status);
-
-	EAP_FUNC_IMPORT eap_status_e complete_is_master_key_present(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_is_master_key_present(
       const bool is_present);
 
-	EAP_FUNC_IMPORT eap_status_e complete_is_master_key_and_password_matching(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_is_master_key_and_password_matching(
       const bool is_matching);
 
-	EAP_FUNC_IMPORT eap_status_e complete_create_and_save_master_key(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_create_and_save_master_key(
         const eap_status_e completion_status);
 
-	EAP_FUNC_IMPORT eap_status_e complete_is_pacstore_password_present(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_is_pacstore_password_present(
         const bool is_present);
 
-	EAP_FUNC_IMPORT eap_status_e complete_compare_pac_store_password(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_compare_pac_store_password(
         const bool is_matching);
 
-	EAP_FUNC_IMPORT eap_status_e complete_set_pac_store_password(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_set_pac_store_password(
         const eap_status_e completion_status);
 
-	EAP_FUNC_IMPORT eap_status_e complete_destroy_pac_store(
+	EAP_FUNC_VISIBILITY_EAP_PAC_STORE_SERVER_MESSAGE_IF_H eap_status_e complete_destroy_pac_store(
         const eap_status_e completion_status);
 
 	//--------------------------------------------------