diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_common/include/eapol_rsna_key_data_payloads.h
--- a/eapol/eapol_framework/eapol_common/include/eapol_rsna_key_data_payloads.h	Fri Sep 17 08:30:11 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eapol_rsna_key_data_payloads.h	Mon Oct 04 00:19:54 2010 +0300
@@ -24,12 +24,33 @@
 
 #include "eap_variable_data.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H)
+	#define EAP_CLASS_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+	#define EAP_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+	#define EAP_C_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+#elif defined(EAP_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H)
+	#define EAP_CLASS_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+	#define EAP_C_FUNC_EXPORT_EAPOL_RSNA_KEY_DATA_PAYLOADS_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eapol_rsna_key_data_header.h"
 #include "eap_array.h"
 
 
 
-class EAP_EXPORT eapol_rsna_variable_data_c
+class EAP_CLASS_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H eapol_rsna_variable_data_c
 : public eap_variable_data_c
 {
 private:
@@ -47,16 +68,16 @@
 public:
 	//--------------------------------------------------
 
-	EAP_FUNC_IMPORT virtual ~eapol_rsna_variable_data_c();
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H virtual ~eapol_rsna_variable_data_c();
 
-	EAP_FUNC_IMPORT eapol_rsna_variable_data_c(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H eapol_rsna_variable_data_c(
 		abs_eap_am_tools_c * const tools,
 		const bool is_RSNA_when_true,
 		const bool is_WPXM_when_true);
 
-	EAP_FUNC_IMPORT const eapol_rsna_key_data_header_c * get_original_header() const;
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H const eapol_rsna_key_data_header_c * get_original_header() const;
 
-	EAP_FUNC_IMPORT eap_status_e set_buffer(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H eap_status_e set_buffer(
 		const eapol_rsna_key_data_header_c * const original_header,
 		u8_t *buffer,
 		const u32_t buffer_length,
@@ -71,7 +92,7 @@
 
 
 // 
-class EAP_EXPORT eapol_rsna_key_data_payloads_c
+class EAP_CLASS_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H eapol_rsna_key_data_payloads_c
 {
 private:
 	//--------------------------------------------------
@@ -118,18 +139,18 @@
 	};
 
 
-	EAP_FUNC_IMPORT virtual ~eapol_rsna_key_data_payloads_c();
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H virtual ~eapol_rsna_key_data_payloads_c();
 
-	EAP_FUNC_IMPORT eapol_rsna_key_data_payloads_c(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H eapol_rsna_key_data_payloads_c(
 		abs_eap_am_tools_c * const tools,
 		const bool is_RSNA_when_true,
 		const bool is_WPXM_when_true);
 
-	EAP_FUNC_IMPORT bool check_one_payload(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H bool check_one_payload(
 		const eapol_rsna_key_data_payload_status_e status,
 		const eapol_rsna_variable_data_c * const payload);
 
-	EAP_FUNC_IMPORT bool check_one_payload(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H bool check_one_payload(
 		const eapol_rsna_key_data_payload_status_e status,
 		const eap_array_c<eap_variable_data_c> * const payload);
 
@@ -137,7 +158,7 @@
 	 *  NOTE do not change the order of parameters.
 	 *  Add new payload type to the last of the parameter list.
 	 */
-	EAP_FUNC_IMPORT bool check_payloads(
+	EAP_FUNC_VISIBILITY_EAPOL_RSNA_KEY_DATA_PAYLOADS_H bool check_payloads(
 		const eapol_rsna_key_data_payload_status_e key_id_and_group_key,
 		const eapol_rsna_key_data_payload_status_e sta_key,
 		const eapol_rsna_key_data_payload_status_e pmkid,