diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_common/include/eap_tlv_header.h --- a/eapol/eapol_framework/eapol_common/include/eap_tlv_header.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/include/eap_tlv_header.h Mon Oct 04 00:19:54 2010 +0300 @@ -25,6 +25,29 @@ #include "eap_am_types.h" #include "eap_tools.h" #include "eap_general_header_base.h" +#include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_TLV_HEADER_H) + #define EAP_CLASS_VISIBILITY_EAP_TLV_HEADER_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H + #define EAP_C_FUNC_VISIBILITY_EAP_TLV_HEADER_H + #define EAP_FUNC_EXPORT_EAP_TLV_HEADER_H + #define EAP_C_FUNC_EXPORT_EAP_TLV_HEADER_H +#elif defined(EAP_EXPORT_EAP_TLV_HEADER_H) + #define EAP_CLASS_VISIBILITY_EAP_TLV_HEADER_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_TLV_HEADER_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_TLV_HEADER_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_TLV_HEADER_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_TLV_HEADER_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_TLV_HEADER_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_TLV_HEADER_H + #define EAP_C_FUNC_EXPORT_EAP_TLV_HEADER_H +#endif +// End: added by script change_export_macros.sh. + /** @file */ @@ -60,7 +83,7 @@ * @endcode * */ -class EAP_EXPORT eap_tlv_header_c +class EAP_CLASS_VISIBILITY_EAP_TLV_HEADER_H eap_tlv_header_c : public eap_general_header_base_c { private: @@ -87,12 +110,12 @@ /** * The destructor of the eap_tlv_header_c class does nothing. */ - EAP_FUNC_IMPORT virtual ~eap_tlv_header_c(); + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H virtual ~eap_tlv_header_c(); /** * The constructor of the eap_tlv_header_c class simply initializes the attributes. */ - EAP_FUNC_IMPORT eap_tlv_header_c( + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_tlv_header_c( abs_eap_am_tools_c * const tools, void * const header_begin, const u32_t header_buffer_length); @@ -100,52 +123,52 @@ /** * This function returns the type. */ - EAP_FUNC_IMPORT eap_tlv_type_t get_type() const; + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_tlv_type_t get_type() const; /** * This function returns the data length of value. */ - EAP_FUNC_IMPORT u32_t get_value_length() const; + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H u32_t get_value_length() const; /** * This function returns the header length of TLV. */ - EAP_FUNC_IMPORT static u32_t get_header_length(); + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H static u32_t get_header_length(); /** * This function returns pointer to the offset of value. * @param offset is the offset of queried data in bytes. * @param contignuous_bytes is the length of queried data in bytes. */ - EAP_FUNC_IMPORT u8_t * get_value_offset(const u32_t offset, const u32_t contignuous_bytes) const; + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H u8_t * get_value_offset(const u32_t offset, const u32_t contignuous_bytes) const; /** * This function returns pointer to begin of value. * @param contignuous_bytes is the length of queried data in bytes. */ - EAP_FUNC_IMPORT u8_t * get_value(const u32_t contignuous_bytes) const; + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H u8_t * get_value(const u32_t contignuous_bytes) const; /** * This function checks the header is valid. */ - EAP_FUNC_IMPORT eap_status_e check_header() const; + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_status_e check_header() const; /** * This function returns the type. */ - EAP_FUNC_IMPORT eap_status_e set_type(const eap_tlv_type_t type); + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_status_e set_type(const eap_tlv_type_t type); /** * This function sets the value length. */ - EAP_FUNC_IMPORT eap_status_e set_value_length(const u32_t value_length); + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_status_e set_value_length(const u32_t value_length); /** * This function resets the TLV header. */ - EAP_FUNC_IMPORT eap_status_e reset_header( + EAP_FUNC_VISIBILITY_EAP_TLV_HEADER_H eap_status_e reset_header( const eap_tlv_type_t type, const u32_t value_length);