diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_common/include/eap_type_selection.h --- a/eapol/eapol_framework/eapol_common/include/eap_type_selection.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/include/eap_type_selection.h Mon Oct 04 00:19:54 2010 +0300 @@ -25,6 +25,29 @@ #include "eap_am_assert.h" #include "eap_variable_data.h" #include "eap_header.h" +#include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_TYPE_SELECTION_H) + #define EAP_CLASS_VISIBILITY_EAP_TYPE_SELECTION_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H + #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H + #define EAP_FUNC_EXPORT_EAP_TYPE_SELECTION_H + #define EAP_C_FUNC_EXPORT_EAP_TYPE_SELECTION_H +#elif defined(EAP_EXPORT_EAP_TYPE_SELECTION_H) + #define EAP_CLASS_VISIBILITY_EAP_TYPE_SELECTION_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_TYPE_SELECTION_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_TYPE_SELECTION_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_TYPE_SELECTION_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_TYPE_SELECTION_H + #define EAP_C_FUNC_EXPORT_EAP_TYPE_SELECTION_H +#endif +// End: added by script change_export_macros.sh. + //-------------------------------------------------- @@ -32,7 +55,7 @@ /// eap_type_selection_c class stores infofmation of one supported EAP-type. -class EAP_EXPORT eap_type_selection_c +class EAP_CLASS_VISIBILITY_EAP_TYPE_SELECTION_H eap_type_selection_c { private: //-------------------------------------------------- @@ -55,11 +78,11 @@ /** * The destructor of the eap_type_selection_c class does nothing special. */ - EAP_FUNC_IMPORT virtual ~eap_type_selection_c(); + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H virtual ~eap_type_selection_c(); /** */ - EAP_FUNC_IMPORT eap_type_selection_c( + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H eap_type_selection_c( abs_eap_am_tools_c * const tools, const eap_type_value_e type, const bool is_enabled); @@ -67,30 +90,30 @@ /** * The get_type() function returns EAP-type. */ - EAP_FUNC_IMPORT eap_type_value_e get_type() const; + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H eap_type_value_e get_type() const; /** * The get_is_enabled() function returns true when EAP-type is enabled. */ - EAP_FUNC_IMPORT bool get_is_enabled() const; + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H bool get_is_enabled() const; /** * The copy() function copies the eap_type_selection_c object and data. */ - EAP_FUNC_IMPORT eap_type_selection_c * copy() const; + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H eap_type_selection_c * copy() const; /** * The get_is_valid() function returns the status of the object. * @return True indicates the object is initialized. */ - EAP_FUNC_IMPORT bool get_is_valid() const; + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H bool get_is_valid() const; /** * The get_is_valid_data() function returns the status of the * data included in eap_type_selection_c object. * @return True indicates the object includes valid data. */ - EAP_FUNC_IMPORT bool get_is_valid_data() const; + EAP_FUNC_VISIBILITY_EAP_TYPE_SELECTION_H bool get_is_valid_data() const; }; // class eap_type_selection_c