diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/include/eapol_header.h
--- a/eapol/eapol_framework/eapol_common/include/eapol_header.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eapol_header.h	Thu Sep 16 13:07:04 2010 +0300
@@ -28,6 +28,29 @@
 #include "eap_header.h"
 #include "eap_general_header_base.h"
 #include "eapol_key_types.h"
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAPOL_HEADER_H)
+	#define EAP_CLASS_VISIBILITY_EAPOL_HEADER_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAPOL_HEADER_H 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_HEADER_H 
+	#define EAP_FUNC_EXPORT_EAPOL_HEADER_H 
+	#define EAP_C_FUNC_EXPORT_EAPOL_HEADER_H 
+#elif defined(EAP_EXPORT_EAPOL_HEADER_H)
+	#define EAP_CLASS_VISIBILITY_EAPOL_HEADER_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAPOL_HEADER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_HEADER_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAPOL_HEADER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAPOL_HEADER_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAPOL_HEADER_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAPOL_HEADER_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPOL_HEADER_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAPOL_HEADER_H 
+	#define EAP_C_FUNC_EXPORT_EAPOL_HEADER_H 
+#endif
+// End: added by script change_export_macros.sh.
+
 
 /** @file */
 
@@ -71,7 +94,7 @@
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * @endcode
  */
-class EAP_EXPORT eapol_header_base_c
+class EAP_CLASS_VISIBILITY_EAPOL_HEADER_H eapol_header_base_c
 : public eap_general_header_base_c
 {
 private:
@@ -100,46 +123,46 @@
 	//--------------------------------------------------
 
 	/// Destructor does nothing special.
-	EAP_FUNC_IMPORT virtual ~eapol_header_base_c();
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H virtual ~eapol_header_base_c();
 
 	/// Constructor does nothing special.
 	/// The tools parameter is pointer to tools object.
 	/// The header_buffer parameter is pointer to buffer of EAPOL-packet including header and data.
 	/// The header_buffer_length parameter is length of the header_buffer.
-	EAP_FUNC_IMPORT eapol_header_base_c(
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eapol_header_base_c(
 		abs_eap_am_tools_c * const tools,
 		void * const header_buffer,
 		const u32_t header_buffer_length);
 
 	/// This function returns the Protocol Version field of EAPOL header.
-	EAP_FUNC_IMPORT eapol_protocol_version_e get_version() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eapol_protocol_version_e get_version() const;
 
 	/// This function returns the packet type field of EAPOL header.
-	EAP_FUNC_IMPORT eapol_packet_type_e get_packet_type() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eapol_packet_type_e get_packet_type() const;
 
 	/// This function returns the data length of the EAPOL-packet.
-	EAP_FUNC_IMPORT u16_t get_data_length() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H u16_t get_data_length() const;
 
 	/// This function returns the header length of the EAPOL-packet.
-	EAP_FUNC_IMPORT static u32_t get_header_length();
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H static u32_t get_header_length();
 
 	/// This function returns pointer to the data of the EAPOL-packet.
-	EAP_FUNC_IMPORT u8_t * get_data(const u32_t data_length) const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H u8_t * get_data(const u32_t data_length) const;
 
 	/// This function sets the Protocol Version field of the EAPOL-header.
-	EAP_FUNC_IMPORT void set_version(const eapol_protocol_version_e p_version);
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H void set_version(const eapol_protocol_version_e p_version);
 
 	/// This function sets the packet type field of the EAPOL-header.
-	EAP_FUNC_IMPORT void set_packet_type(const eapol_packet_type_e p_packet_type);
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H void set_packet_type(const eapol_packet_type_e p_packet_type);
 
 	/// This function sets the data length field of the EAPOL-header.
-	EAP_FUNC_IMPORT void set_data_length(const u16_t p_data_length);
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H void set_data_length(const u16_t p_data_length);
 
 	/// This function returns debug string of the type of the EAPOL-packet.
-	EAP_FUNC_IMPORT eap_const_string get_type_string() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eap_const_string get_type_string() const;
 
 	/// This function checks the validity of EAPOL-header.
-	EAP_FUNC_IMPORT eap_status_e check_header() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eap_status_e check_header() const;
 
 	// 
 	//--------------------------------------------------
@@ -150,7 +173,7 @@
 
 /// This is read only EAPOL header.
 /// @{ This class can be removed. eapol_header_base_c could be used instead. }
-class EAP_EXPORT eapol_header_rd_c
+class EAP_CLASS_VISIBILITY_EAPOL_HEADER_H eapol_header_rd_c
 : public eapol_header_base_c
 {
 private:
@@ -168,19 +191,19 @@
 	//--------------------------------------------------
 
 	/// Destructor does nothing special.
-	EAP_FUNC_IMPORT virtual ~eapol_header_rd_c();
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H virtual ~eapol_header_rd_c();
 
 	/// Constructor does nothing special.
 	/// The tools parameter is pointer to tools object.
 	/// The header_buffer parameter is pointer to buffer of EAPOL-packet including header and data.
 	/// The header_buffer_length parameter is length of the header_buffer.
-	EAP_FUNC_IMPORT eapol_header_rd_c(
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eapol_header_rd_c(
 		abs_eap_am_tools_c * const tools,
 		u8_t * const header_buffer,
 		const u32_t header_buffer_length);
 
 	/// This function returns pointer to the header of the EAP-packet included in the EAPOL-packet.
-	EAP_FUNC_IMPORT u8_t * get_eap_header() const;
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H u8_t * get_eap_header() const;
 
 	// 
 	//--------------------------------------------------
@@ -191,7 +214,7 @@
 
 /// This is read and write EAPOL header.
 /// @{ This class can be removed. eapol_header_base_c could be used instead. }
-class EAP_EXPORT eapol_header_wr_c
+class EAP_CLASS_VISIBILITY_EAPOL_HEADER_H eapol_header_wr_c
 : public eapol_header_base_c
 {
 private:
@@ -209,23 +232,23 @@
 	//--------------------------------------------------
 
 	/// Destructor does nothing special.
-	EAP_FUNC_IMPORT virtual ~eapol_header_wr_c();
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H virtual ~eapol_header_wr_c();
 
 	/// Constructor does nothing special.
 	/// The tools parameter is pointer to tools object.
 	/// The header_buffer parameter is pointer to buffer of EAPOL-packet including header and data.
 	/// The header_buffer_length parameter is length of the header_buffer.
-	EAP_FUNC_IMPORT eapol_header_wr_c(
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H eapol_header_wr_c(
 		abs_eap_am_tools_c * const tools,
 		u8_t * const header_buffer,
 		const u32_t header_buffer_length);
 
 	/// This function returns pointer to the header of the EAP-packet included in the EAPOL-packet.
-	EAP_FUNC_IMPORT u8_t * get_eap_header();
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H u8_t * get_eap_header();
 
 	/// This function resets the EAPOL-header.
 	/// The buffer_length parameter is the length of the EAPOL-header and the following data buffer.
-	EAP_FUNC_IMPORT void reset_header(u16_t buffer_length);
+	EAP_FUNC_VISIBILITY_EAPOL_HEADER_H void reset_header(u16_t buffer_length);
 
 	// 
 	//--------------------------------------------------