diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_symbian/am/include/eap_am_mutex_symbian.h --- a/eapol/eapol_framework/eapol_symbian/am/include/eap_am_mutex_symbian.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/include/eap_am_mutex_symbian.h Mon Oct 04 00:19:54 2010 +0300 @@ -26,10 +26,31 @@ #include "eap_am_types.h" #include "eap_variable_data.h" #include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_AM_MUTEX_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H + #define EAP_C_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H + #define EAP_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H +#elif defined(EAP_EXPORT_EAP_AM_MUTEX_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAP_AM_MUTEX_SYMBIAN_H +#endif +// End: added by script change_export_macros.sh. #include "abs_eap_am_mutex.h" // CLASS DECLARATION -class EAP_EXPORT eap_am_mutex_symbian_c +class EAP_CLASS_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H eap_am_mutex_symbian_c : public abs_eap_am_mutex_c , public eap_am_mutex_base_c { @@ -49,34 +70,34 @@ public: - EAP_FUNC_IMPORT virtual ~eap_am_mutex_symbian_c(); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H virtual ~eap_am_mutex_symbian_c(); - EAP_FUNC_IMPORT eap_am_mutex_symbian_c(); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H eap_am_mutex_symbian_c(); - EAP_FUNC_IMPORT eap_am_mutex_symbian_c(const eap_am_mutex_symbian_c * const owner); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H eap_am_mutex_symbian_c(const eap_am_mutex_symbian_c * const owner); /// Function returns pointer to Symbian mutex. - EAP_FUNC_IMPORT const RMutex * get_mutex() const; + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H const RMutex * get_mutex() const; /// Function returns pointer to owner thread of the mutex. - EAP_FUNC_IMPORT const RThread * get_owner_thread() const; + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H const RThread * get_owner_thread() const; // See comments on abs_eap_am_mutex_c. - EAP_FUNC_IMPORT eap_status_e mutex_enter(); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H eap_status_e mutex_enter(); // See comments on abs_eap_am_mutex_c. - EAP_FUNC_IMPORT eap_status_e mutex_leave(abs_eap_am_tools_c * const m_am_tools); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H eap_status_e mutex_leave(abs_eap_am_tools_c * const m_am_tools); // The mutex handle must be dublicated in Symbian operating system for each thread. // See comments on abs_eap_am_mutex_c. - EAP_FUNC_IMPORT abs_eap_am_mutex_c * dublicate_mutex(); + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H abs_eap_am_mutex_c * dublicate_mutex(); // This is used in debug asserts. Those will check the mutex is really reserved when critical code is entered. // See comments on abs_eap_am_mutex_c. - EAP_FUNC_IMPORT bool get_is_reserved() const; + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H bool get_is_reserved() const; // See comments on abs_eap_am_mutex_c. - EAP_FUNC_IMPORT bool get_is_valid() const; + EAP_FUNC_VISIBILITY_EAP_AM_MUTEX_SYMBIAN_H bool get_is_valid() const; // - - - - - - - - - - - - - - - - - - - - - - - -