diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_common/include/eap_handle.h
--- a/eapol/eapol_framework/eapol_common/include/eap_handle.h	Fri Sep 17 08:30:11 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_handle.h	Mon Oct 04 00:19:54 2010 +0300
@@ -27,6 +27,27 @@
 #include "eap_am_types.h"
 #include "eap_am_network_id.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_HANDLE_H)
+	#define EAP_CLASS_VISIBILITY_EAP_HANDLE_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_HANDLE_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_HANDLE_H 
+	#define EAP_FUNC_EXPORT_EAP_HANDLE_H 
+	#define EAP_C_FUNC_EXPORT_EAP_HANDLE_H 
+#elif defined(EAP_EXPORT_EAP_HANDLE_H)
+	#define EAP_CLASS_VISIBILITY_EAP_HANDLE_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_HANDLE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_HANDLE_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_HANDLE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_HANDLE_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_HANDLE_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_HANDLE_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_HANDLE_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_HANDLE_H 
+	#define EAP_C_FUNC_EXPORT_EAP_HANDLE_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "abs_eap_am_tools.h"
 //#include "eap_am_memory.h"
 #include "eap_am_assert.h"
@@ -36,7 +57,7 @@
 //--------------------------------------------------
 
 /// This class stores connection information of one session.
-class EAP_EXPORT eap_handle_c
+class EAP_CLASS_VISIBILITY_EAP_HANDLE_H eap_handle_c
 : public eap_variable_data_c
 {
 private:
@@ -47,27 +68,27 @@
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~eap_handle_c();
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H virtual ~eap_handle_c();
 
-	EAP_FUNC_IMPORT eap_handle_c(
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H eap_handle_c(
 		abs_eap_am_tools_c * const tools);
 
-	EAP_FUNC_IMPORT eap_handle_c(
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H eap_handle_c(
 		abs_eap_am_tools_c * const tools,
 		eap_variable_data_c * const selector,
 		const eap_am_network_id_c * const network_id,
 		const eap_type_value_e p_eap_type);
 
-	EAP_FUNC_IMPORT eap_status_e set_handle(
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H eap_status_e set_handle(
 		eap_variable_data_c * const selector,
 		const eap_am_network_id_c * const network_id,
 		const eap_type_value_e p_eap_type);
 
-	EAP_FUNC_IMPORT const eap_am_network_id_c * get_send_network_id() const;
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H const eap_am_network_id_c * get_send_network_id() const;
 
-	EAP_FUNC_IMPORT eap_type_value_e get_eap_type() const;
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H eap_type_value_e get_eap_type() const;
 
-	EAP_FUNC_IMPORT void reset();
+	EAP_FUNC_VISIBILITY_EAP_HANDLE_H void reset();
 };
 
 //--------------------------------------------------