diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/include/eap_master_session_key.h
--- a/eapol/eapol_framework/eapol_common/include/eap_master_session_key.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_master_session_key.h	Thu Sep 16 13:07:04 2010 +0300
@@ -24,6 +24,27 @@
 
 #include "eap_am_types.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_MASTER_SESSION_KEY_H)
+	#define EAP_CLASS_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H 
+	#define EAP_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H 
+	#define EAP_C_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H 
+#elif defined(EAP_EXPORT_EAP_MASTER_SESSION_KEY_H)
+	#define EAP_CLASS_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H 
+	#define EAP_C_FUNC_EXPORT_EAP_MASTER_SESSION_KEY_H 
+#endif
+// End: added by script change_export_macros.sh.
 //#include "eap_am_memory.h"
 #include "eap_am_assert.h"
 #include "eap_status.h"
@@ -36,7 +57,7 @@
 
 
 /// This class stores data of master session key.
-class EAP_EXPORT eap_master_session_key_c
+class EAP_CLASS_VISIBILITY_EAP_MASTER_SESSION_KEY_H eap_master_session_key_c
 : public eap_variable_data_c
 {
 private:
@@ -63,25 +84,25 @@
 	 * Destructor of the eap_variable_data class will release 
 	 * the buffer if attribute m_free_buffer is true.
 	 */
-	EAP_FUNC_IMPORT virtual ~eap_master_session_key_c();
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H virtual ~eap_master_session_key_c();
 
 	/**
 	 * Constructor takes only one parameter called tools.
 	 * @param tools is pointer to the tools class. @see abs_eap_am_tools_c.
 	 */
-	EAP_FUNC_IMPORT eap_master_session_key_c(
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H eap_master_session_key_c(
 		abs_eap_am_tools_c * const tools,
 		const eap_type_value_e eap_type);
 
-	EAP_FUNC_IMPORT eap_type_value_e get_eap_type() const;
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H eap_type_value_e get_eap_type() const;
 
-	EAP_FUNC_IMPORT void set_eap_type(eap_type_value_e type);
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H void set_eap_type(eap_type_value_e type);
 
-	EAP_FUNC_IMPORT const eap_variable_data_c * get_leap_password() const;
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H const eap_variable_data_c * get_leap_password() const;
 
-	EAP_FUNC_IMPORT eap_status_e copy_leap_password(const eap_variable_data_c * const key);
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H eap_status_e copy_leap_password(const eap_variable_data_c * const key);
 
-	EAP_FUNC_IMPORT eap_status_e set_copy(const eap_master_session_key_c * const msk);
+	EAP_FUNC_VISIBILITY_EAP_MASTER_SESSION_KEY_H eap_status_e set_copy(const eap_master_session_key_c * const msk);
 
 	//--------------------------------------------------
 }; // class eap_master_session_key_c