diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/type/gsmsim/include/eap_type_gsmsim_header.h
--- a/eapol/eapol_framework/eapol_common/type/gsmsim/include/eap_type_gsmsim_header.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/gsmsim/include/eap_type_gsmsim_header.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,12 +16,34 @@
 */
 
 /*
-* %version: %
+* %version: 3.1.2 %
 */
 
 #if !defined(_GSMSIM_HEADER_H_)
 #define _GSMSIM_HEADER_H_
 
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_TYPE_GSMSIM_HEADER_H)
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H 
+#elif defined(EAP_EXPORT_EAP_TYPE_GSMSIM_HEADER_H)
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H 
+	#define EAP_C_FUNC_EXPORT_EAP_TYPE_GSMSIM_HEADER_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_tools.h"
 #include "eap_header.h"
 #include "eap_type_gsmsim_types.h"
@@ -50,7 +72,7 @@
  * @endcode
  *
  */
-class EAP_EXPORT gsmsim_payload_AT_header_c
+class EAP_CLASS_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_payload_AT_header_c
 : public eap_general_header_base_c
 {
 private:
@@ -76,47 +98,47 @@
 	//--------------------------------------------------
 
 	// 
-	EAP_FUNC_IMPORT virtual ~gsmsim_payload_AT_header_c();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H virtual ~gsmsim_payload_AT_header_c();
 
 	// 
-	EAP_FUNC_IMPORT gsmsim_payload_AT_header_c(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_payload_AT_header_c(
 		abs_eap_am_tools_c * const tools,
 		void * const header_buffer,
 		const u32_t header_buffer_length);
 
-	EAP_FUNC_IMPORT gsmsim_payload_AT_type_e get_current_payload() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_payload_AT_type_e get_current_payload() const;
 
-	EAP_FUNC_IMPORT u16_t get_payload_length() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u16_t get_payload_length() const;
 
-	EAP_FUNC_IMPORT u16_t get_reserved() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u16_t get_reserved() const;
 
-	EAP_FUNC_IMPORT u32_t get_data_length() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u32_t get_data_length() const;
 
-	EAP_FUNC_IMPORT static u16_t get_header_length();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H static u16_t get_header_length();
 
-	EAP_FUNC_IMPORT static u16_t get_max_payload_data_length();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H static u16_t get_max_payload_data_length();
 
-	EAP_FUNC_IMPORT u8_t * get_data(const u32_t contignuous_bytes) const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u8_t * get_data(const u32_t contignuous_bytes) const;
 
-	EAP_FUNC_IMPORT u8_t * get_data_offset(const u32_t offset, const u32_t contignuous_bytes) const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u8_t * get_data_offset(const u32_t offset, const u32_t contignuous_bytes) const;
 
-	EAP_FUNC_IMPORT u8_t * get_next_header() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u8_t * get_next_header() const;
 
 	// Mostly this is zero.
 	// With some attributes this is used for special purposes.
-	EAP_FUNC_IMPORT void set_reserved(const u16_t reserved);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_reserved(const u16_t reserved);
 
-	EAP_FUNC_IMPORT void set_current_payload(const gsmsim_payload_AT_type_e p_current_payload);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_current_payload(const gsmsim_payload_AT_type_e p_current_payload);
 
-	EAP_FUNC_IMPORT void set_data_length(const u16_t p_data_length);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_data_length(const u16_t p_data_length);
 
-	EAP_FUNC_IMPORT void reset_header(const u16_t data_length);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void reset_header(const u16_t data_length);
 
-	EAP_FUNC_IMPORT static eap_const_string get_payload_AT_string(const gsmsim_payload_AT_type_e payload_type);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H static eap_const_string get_payload_AT_string(const gsmsim_payload_AT_type_e payload_type);
 
-	EAP_FUNC_IMPORT eap_const_string get_payload_AT_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_const_string get_payload_AT_string() const;
 
-	EAP_FUNC_IMPORT eap_status_e check_header() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_status_e check_header() const;
 
 	// 
 	//--------------------------------------------------
@@ -144,7 +166,7 @@
  * @endcode
  *
  */
-class gsmsim_header_c
+class EAP_CLASS_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_header_c
 : public eap_header_base_c
 {
 private:
@@ -165,46 +187,46 @@
 	//--------------------------------------------------
 
 	// 
-	EAP_FUNC_IMPORT virtual ~gsmsim_header_c();
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H virtual ~gsmsim_header_c();
 
 	// 
-	EAP_FUNC_IMPORT gsmsim_header_c(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_header_c(
 		abs_eap_am_tools_c * const tools,
 		u8_t * const header_buffer,
 		const u32_t header_buffer_length);
 
-	EAP_FUNC_IMPORT gsmsim_subtype_e get_subtype() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H gsmsim_subtype_e get_subtype() const;
 
-	EAP_FUNC_IMPORT u16_t get_data_length() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u16_t get_data_length() const;
 
 	/// This returns the length of EAP-header, EAP-type, subtype and reserved fields.
-	EAP_FUNC_IMPORT u32_t get_header_length() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u32_t get_header_length() const;
 
-	EAP_FUNC_IMPORT u32_t get_sub_type_offset() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u32_t get_sub_type_offset() const;
 
-	EAP_FUNC_IMPORT u8_t * get_data_offset(const u32_t offset, const u32_t contignuous_bytes) const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u8_t * get_data_offset(const u32_t offset, const u32_t contignuous_bytes) const;
 
-	EAP_FUNC_IMPORT u8_t * get_data(const u32_t contignuous_bytes) const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u8_t * get_data(const u32_t contignuous_bytes) const;
 
-	EAP_FUNC_IMPORT u16_t get_reserved() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H u16_t get_reserved() const;
 
-	EAP_FUNC_IMPORT eap_status_e check_header() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_status_e check_header() const;
 
-	EAP_FUNC_IMPORT eap_const_string get_subtype_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_const_string get_subtype_string() const;
 
-	EAP_FUNC_IMPORT eap_const_string get_code_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_const_string get_code_string() const;
 
-	EAP_FUNC_IMPORT eap_const_string get_eap_type_string() const;
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H eap_const_string get_eap_type_string() const;
 
-	EAP_FUNC_IMPORT void set_reserved(const u16_t reserved);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_reserved(const u16_t reserved);
 
-	EAP_FUNC_IMPORT void set_subtype(const gsmsim_subtype_e p_subtype);
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_subtype(const gsmsim_subtype_e p_subtype);
 
-	EAP_FUNC_IMPORT void set_data_length(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void set_data_length(
 		const u32_t p_data_length,
 		const bool expanded_type_when_true);
 
-	EAP_FUNC_IMPORT void reset_header(
+	EAP_FUNC_VISIBILITY_EAP_TYPE_GSMSIM_HEADER_H void reset_header(
 		const u32_t buffer_length,
 		const bool expanded_type_when_true);