diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 6155796200..2945b06a8f 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h @@ -15,31 +15,7 @@ #include "Efl_Net.h" #endif -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include /** * @defgroup Ecore_Con_Group Ecore_Con - Connection functions @@ -633,51 +609,51 @@ struct _Ecore_Con_Event_Url_Progress }; /** A client has connected to the server. */ -EAPI extern int ECORE_CON_EVENT_CLIENT_ADD; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_ADD; /** A client has disconnected from the server. */ -EAPI extern int ECORE_CON_EVENT_CLIENT_DEL; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_DEL; /** A client experienced an error. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_CLIENT_ERROR; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_ERROR; /** A client connection has been upgraded to SSL. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_CLIENT_UPGRADE; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_UPGRADE; /** A server was created. */ -EAPI extern int ECORE_CON_EVENT_SERVER_ADD; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_ADD; /** A server connection was lost. */ -EAPI extern int ECORE_CON_EVENT_SERVER_DEL; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_DEL; /** A server experienced an error. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_SERVER_ERROR; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_ERROR; /** A server connection has been upgraded to SSL. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_SERVER_UPGRADE; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_UPGRADE; /** A server connection has sent data to its client. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_CLIENT_WRITE; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_WRITE; /** A server connection object has sent data. * @since 1.1 */ -EAPI extern int ECORE_CON_EVENT_SERVER_WRITE; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_WRITE; /** A client connected to the server has sent data. */ -EAPI extern int ECORE_CON_EVENT_CLIENT_DATA; +ECORE_CON_API extern int ECORE_CON_EVENT_CLIENT_DATA; /** A server connection object has data.*/ -EAPI extern int ECORE_CON_EVENT_SERVER_DATA; +ECORE_CON_API extern int ECORE_CON_EVENT_SERVER_DATA; /** A server connection has successfully negotiated an ip:port binding. * @since 1.2 */ -EAPI extern int ECORE_CON_EVENT_PROXY_BIND; +ECORE_CON_API extern int ECORE_CON_EVENT_PROXY_BIND; /** A URL object has data. */ -EAPI extern int ECORE_CON_EVENT_URL_DATA; +ECORE_CON_API extern int ECORE_CON_EVENT_URL_DATA; /** A URL object has completed its transfer to and from the server and can be reused. */ -EAPI extern int ECORE_CON_EVENT_URL_COMPLETE; +ECORE_CON_API extern int ECORE_CON_EVENT_URL_COMPLETE; /** A URL object has made progress in its transfer. */ -EAPI extern int ECORE_CON_EVENT_URL_PROGRESS; +ECORE_CON_API extern int ECORE_CON_EVENT_URL_PROGRESS; /** * @} @@ -698,7 +674,7 @@ EAPI extern int ECORE_CON_EVENT_URL_PROGRESS; * @note This function already calls ecore_init() internally, so you don't need * to call it explicitly. */ -EAPI int ecore_con_init(void); +ECORE_CON_API int ecore_con_init(void); /** * @brief Shuts down the Ecore_Con library. @@ -707,7 +683,7 @@ EAPI int ecore_con_init(void); * @note This function already calls ecore_shutdown() internally, so you don't * need to call it explicitly unless you called ecore_init() explicitly too. */ -EAPI int ecore_con_shutdown(void); +ECORE_CON_API int ecore_con_shutdown(void); /** * @brief Do an asynchronous DNS lookup. @@ -727,7 +703,7 @@ EAPI int ecore_con_shutdown(void); * @return @c true if the request did not fail to be set up, @c false * otherwise. */ -EAPI Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) EINA_ARG_NONNULL(1); +ECORE_CON_API Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) EINA_ARG_NONNULL(1); /** * @} @@ -748,7 +724,7 @@ EAPI Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, cons * @c 2 if SSL is available and provided by openssl, * @c 0 if it is not available. */ -EAPI int ecore_con_ssl_available_get(void); +ECORE_CON_API int ecore_con_ssl_available_get(void); /** * @brief Adds an SSL certificate for use in ecore_con functions. @@ -760,7 +736,7 @@ EAPI int ecore_con_ssl_available_get(void); * @param cert The path to the certificate. * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE. */ -EAPI Eina_Bool ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert); +ECORE_CON_API Eina_Bool ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert); /** * @brief Adds an SSL private key for use in ecore_con functions. @@ -772,7 +748,7 @@ EAPI Eina_Bool ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, cons * @param key_file The path to the key file. * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE. */ -EAPI Eina_Bool ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *key_file); +ECORE_CON_API Eina_Bool ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *key_file); /** * @brief Adds an SSL CRL for use in ecore_con functions. @@ -784,7 +760,7 @@ EAPI Eina_Bool ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, c * @param crl_file The path to the CRL file. * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE. */ -EAPI Eina_Bool ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl_file); +ECORE_CON_API Eina_Bool ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl_file); /** * @brief Adds an SSL CA file for use in ecore_con functions. @@ -797,7 +773,7 @@ EAPI Eina_Bool ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const * @return @c EINA_FALSE if the file cannot be loaded, otherwise @c EINA_TRUE. * @note since 1.2, this function can load directories. */ -EAPI Eina_Bool ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *ca_file); +ECORE_CON_API Eina_Bool ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *ca_file); /** * @brief Enables certificate verification on a server object. @@ -806,7 +782,7 @@ EAPI Eina_Bool ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, co * to enable verification of certificates against loaded certificates. * @param svr The server object */ -EAPI void ecore_con_ssl_server_verify(Ecore_Con_Server *svr); +ECORE_CON_API void ecore_con_ssl_server_verify(Ecore_Con_Server *svr); /** * @brief Enables hostname-based certificate verification on a server object. @@ -818,7 +794,7 @@ EAPI void ecore_con_ssl_server_verify(Ecore_Con_Server *svr); * ecore_con_server_add. * @since 1.1 */ -EAPI void ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr); +ECORE_CON_API void ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr); /** * @brief Sets the hostname to verify against in certificate verification. @@ -833,7 +809,7 @@ EAPI void ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr); * @param name The hostname to verify against * @since 1.2 */ -EAPI void ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name); +ECORE_CON_API void ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name); /** * @brief Gets the hostname to verify against in certificate verification. @@ -845,7 +821,7 @@ EAPI void ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *sv * @return The hostname which will be used * @since 1.2 */ -EAPI const char *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *svr); +ECORE_CON_API const char *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *svr); /** * @brief Upgrades a connection to a specified level of encryption. @@ -860,7 +836,7 @@ EAPI const char *ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *sv * @warning Setting a wrong value for @p ssl_type WILL mess up your program. * @since 1.1 */ -EAPI Eina_Bool ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore_Con_Type ssl_type); +ECORE_CON_API Eina_Bool ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore_Con_Type ssl_type); /** * @brief Upgrades a connection to a specified level of encryption. @@ -874,7 +850,7 @@ EAPI Eina_Bool ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore * @warning Setting a wrong value for @p ssl_type WILL mess up your program. * @since 1.1 */ -EAPI Eina_Bool ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type ssl_type); +ECORE_CON_API Eina_Bool ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type ssl_type); /** * @} @@ -898,7 +874,7 @@ EAPI Eina_Bool ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_ * @note This object NEVER needs to be explicitly freed. * @since 1.2 */ -EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, const char *username); +ECORE_CON_API Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, const char *username); /** * @brief Finds a SOCKS v4 proxy in the proxy list. @@ -913,7 +889,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, cons * ecore_con_socks4_remote_add() should be used to return the actual object. * @since 1.2 */ -EAPI Eina_Bool ecore_con_socks4_remote_exists(const char *ip, int port, const char *username); +ECORE_CON_API Eina_Bool ecore_con_socks4_remote_exists(const char *ip, int port, const char *username); /** * @brief Removes a SOCKS v4 proxy from the proxy list and delete it. @@ -927,7 +903,7 @@ EAPI Eina_Bool ecore_con_socks4_remote_exists(const char *ip, int port, c * @warning Be aware that deleting a proxy which is being used WILL ruin your life. * @since 1.2 */ -EAPI void ecore_con_socks4_remote_del(const char *ip, int port, const char *username); +ECORE_CON_API void ecore_con_socks4_remote_del(const char *ip, int port, const char *username); /** * @brief Adds a SOCKS v5 proxy to the proxy list. @@ -942,7 +918,7 @@ EAPI void ecore_con_socks4_remote_del(const char *ip, int port, cons * @note This object NEVER needs to be explicitly freed. * @since 1.2 */ -EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, const char *username, const char *password); +ECORE_CON_API Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, const char *username, const char *password); /** * @brief Finds a SOCKS v5 proxy in the proxy list. @@ -958,7 +934,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, cons * ecore_con_socks5_remote_add() should be used to return the actual object. * @since 1.2 */ -EAPI Eina_Bool ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, const char *password); +ECORE_CON_API Eina_Bool ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, const char *password); /** * @brief Removes a SOCKS v5 proxy from the proxy list and delete it. @@ -973,7 +949,7 @@ EAPI Eina_Bool ecore_con_socks5_remote_exists(const char *ip, int port, c * @warning Be aware that deleting a proxy which is being used WILL ruin your life. * @since 1.2 */ -EAPI void ecore_con_socks5_remote_del(const char *ip, int port, const char *username, const char *password); +ECORE_CON_API void ecore_con_socks5_remote_del(const char *ip, int port, const char *username, const char *password); /** * @brief Sets DNS lookup mode on an existing SOCKS proxy. @@ -988,7 +964,7 @@ EAPI void ecore_con_socks5_remote_del(const char *ip, int port, cons * @note By default, this setting is DISABLED. * @since 1.2 */ -EAPI void ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool enable); +ECORE_CON_API void ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool enable); /** * @brief Gets DNS lookup mode on an existing SOCKS proxy. @@ -1002,7 +978,7 @@ EAPI void ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool * @note By default, this setting is DISABLED. * @since 1.2 */ -EAPI Eina_Bool ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs); +ECORE_CON_API Eina_Bool ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs); /** * @brief Enables bind mode on a SOCKS proxy. @@ -1014,7 +990,7 @@ EAPI Eina_Bool ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs); * @warning Be aware that changing the operation mode of an active proxy may result in undefined behavior * @since 1.2 */ -EAPI void ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind); +ECORE_CON_API void ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind); /** * @brief Returns bind mode of a SOCKS proxy. @@ -1025,7 +1001,7 @@ EAPI void ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool i * @return If true, the connection established will be a port binding. * @since 1.2 */ -EAPI Eina_Bool ecore_con_socks_bind_get(Ecore_Con_Socks *ecs); +ECORE_CON_API Eina_Bool ecore_con_socks_bind_get(Ecore_Con_Socks *ecs); /** * @brief Returns SOCKS version of a SOCKS proxy. @@ -1035,7 +1011,7 @@ EAPI Eina_Bool ecore_con_socks_bind_get(Ecore_Con_Socks *ecs); * @return @c 0 on error, else @c 4/5 * @since 1.2 */ -EAPI unsigned int ecore_con_socks_version_get(Ecore_Con_Socks *ecs); +ECORE_CON_API unsigned int ecore_con_socks_version_get(Ecore_Con_Socks *ecs); /** * @brief Removes a SOCKS v4 proxy from the proxy list and delete it. @@ -1045,7 +1021,7 @@ EAPI unsigned int ecore_con_socks_version_get(Ecore_Con_Socks *ecs); * @warning Be aware that deleting a proxy which is being used WILL ruin your life. * @since 1.2 */ -EAPI void ecore_con_socks_remote_del(Ecore_Con_Socks *ecs); +ECORE_CON_API void ecore_con_socks_remote_del(Ecore_Con_Socks *ecs); /** * @brief Sets a proxy object to be used with the next server created with ecore_con_server_connect(). @@ -1056,7 +1032,7 @@ EAPI void ecore_con_socks_remote_del(Ecore_Con_Socks *ecs); * @see ecore_con_socks_apply_always() * @since 1.2 */ -EAPI void ecore_con_socks_apply_once(Ecore_Con_Socks *ecs); +ECORE_CON_API void ecore_con_socks_apply_once(Ecore_Con_Socks *ecs); /** * @brief Sets a proxy object to be used with all servers created with ecore_con_server_connect(). @@ -1073,7 +1049,7 @@ EAPI void ecore_con_socks_apply_once(Ecore_Con_Socks *ecs); * port is the port to connect to on the proxy server. * lookup is 1 if the proxy should perform all DNS lookups, otherwise 0 or omitted. */ -EAPI void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs); +ECORE_CON_API void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs); /** * @} @@ -1178,7 +1154,7 @@ EAPI void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs); * * @since 1.19 */ -EAPI char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(2); +ECORE_CON_API char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(2); /** * @brief Creates a server to listen for connections. @@ -1222,7 +1198,7 @@ EAPI char *ecore_con_local_path_new(Eina_Bool is_system, const char *name, int p * #EFL_NET_SERVER_SIMPLE_CLASS. * See @li @ref efl_net_server_simple_example.c */ -EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, +ECORE_CON_API Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, const char *name, int port, const void *data); @@ -1278,7 +1254,7 @@ EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, * #EFL_NET_DIALER_SIMPLE_CLASS. * See @li @ref efl_net_dialer_simple_example.c */ -EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type, +ECORE_CON_API Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type, const char *name, int port, const void *data); /** @@ -1291,7 +1267,7 @@ EAPI Ecore_Con_Server *ecore_con_server_connect(Ecore_Con_Type type, * * @see ecore_con_server_add, ecore_con_server_connect */ -EAPI void * ecore_con_server_del(Ecore_Con_Server *svr); +ECORE_CON_API void * ecore_con_server_del(Ecore_Con_Server *svr); /** * @brief Retrieves the name of server. @@ -1303,7 +1279,7 @@ EAPI void * ecore_con_server_del(Ecore_Con_Server *svr); * * @ingroup Efl_Network_Server */ -EAPI const char *ecore_con_server_name_get(const Ecore_Con_Server *svr); +ECORE_CON_API const char *ecore_con_server_name_get(const Ecore_Con_Server *svr); /** * @brief Retrieves the data associated with the given server. @@ -1313,7 +1289,7 @@ EAPI const char *ecore_con_server_name_get(const Ecore_Con_Server *svr); * * @see ecore_con_server_data_set() */ -EAPI void * ecore_con_server_data_get(Ecore_Con_Server *svr); +ECORE_CON_API void * ecore_con_server_data_get(Ecore_Con_Server *svr); /** * @brief Sets the data associated with the given server. * @@ -1323,7 +1299,7 @@ EAPI void * ecore_con_server_data_get(Ecore_Con_Server *svr); * * @see ecore_con_server_data_get() */ -EAPI void * ecore_con_server_data_set(Ecore_Con_Server *svr, +ECORE_CON_API void * ecore_con_server_data_set(Ecore_Con_Server *svr, void *data); /** * @brief Retrieves whether the given server is currently connected. @@ -1331,7 +1307,7 @@ EAPI void * ecore_con_server_data_set(Ecore_Con_Server *svr, * @param svr The given server. * @return @c EINA_TRUE if the server is connected, @c EINA_FALSE otherwise. */ -EAPI Eina_Bool ecore_con_server_connected_get(const Ecore_Con_Server *svr); +ECORE_CON_API Eina_Bool ecore_con_server_connected_get(const Ecore_Con_Server *svr); /** * @brief Retrieves the server port in use. @@ -1341,7 +1317,7 @@ EAPI Eina_Bool ecore_con_server_connected_get(const Ecore_Con_Server *sv * * The port where the server is listening for connections. */ -EAPI int ecore_con_server_port_get(const Ecore_Con_Server *svr); +ECORE_CON_API int ecore_con_server_port_get(const Ecore_Con_Server *svr); /** * @brief Checks how long a server has been connected. * @@ -1352,7 +1328,7 @@ EAPI int ecore_con_server_port_get(const Ecore_Con_Server *svr); * This function is used to find out the time that has been elapsed since * ecore_con_server_add() succeeded. */ -EAPI double ecore_con_server_uptime_get(const Ecore_Con_Server *svr); +ECORE_CON_API double ecore_con_server_uptime_get(const Ecore_Con_Server *svr); /** * @brief Sends the given data to the given server. * @@ -1370,7 +1346,7 @@ EAPI double ecore_con_server_uptime_get(const Ecore_Con_Server *svr); * @see ecore_con_client_send() * @see ecore_con_server_flush() */ -EAPI int ecore_con_server_send(Ecore_Con_Server *svr, +ECORE_CON_API int ecore_con_server_send(Ecore_Con_Server *svr, const void *data, int size); /** @@ -1396,7 +1372,7 @@ EAPI int ecore_con_server_send(Ecore_Con_Server *svr, * clients have already connected and will not be affected by this call. * Only clients subsequently trying to connect will be affected. */ -EAPI void ecore_con_server_client_limit_set(Ecore_Con_Server *svr, +ECORE_CON_API void ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit, char reject_excess_clients); @@ -1412,7 +1388,7 @@ EAPI void ecore_con_server_client_limit_set(Ecore_Con_Server *svr, * @return The list of clients on this server. * */ -EAPI const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr); +ECORE_CON_API const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr); /** * @brief Gets the IP address of a server that has been connected to. @@ -1424,7 +1400,7 @@ EAPI const Eina_List *ecore_con_server_clients_get(const Ecore_Con_Server *svr); * deletion for the @p svr object. If no IP is known @c NULL is * returned. */ -EAPI const char * ecore_con_server_ip_get(const Ecore_Con_Server *svr); +ECORE_CON_API const char * ecore_con_server_ip_get(const Ecore_Con_Server *svr); /** * @brief Flushes all pending data to the given server. * @@ -1435,7 +1411,7 @@ EAPI const char * ecore_con_server_ip_get(const Ecore_Con_Server *svr); * @see ecore_con_server_send() * @see ecore_con_client_flush() */ -EAPI void ecore_con_server_flush(Ecore_Con_Server *svr); +ECORE_CON_API void ecore_con_server_flush(Ecore_Con_Server *svr); /** * @brief Sets the default time after which an inactive client will be disconnected. * @@ -1454,7 +1430,7 @@ EAPI void ecore_con_server_flush(Ecore_Con_Server *svr); * @see ecore_con_server_timeout_get() * @see ecore_con_client_timeout_set() */ -EAPI void ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout); +ECORE_CON_API void ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout); /** * @brief Gets the default time after which an inactive client will be disconnected. * @@ -1467,7 +1443,7 @@ EAPI void ecore_con_server_timeout_set(Ecore_Con_Server *svr, doubl * @see ecore_con_server_timeout_set() * @see ecore_con_client_timeout_get() */ -EAPI double ecore_con_server_timeout_get(const Ecore_Con_Server *svr); +ECORE_CON_API double ecore_con_server_timeout_get(const Ecore_Con_Server *svr); /** * @brief Gets the fd that the server is connected to. @@ -1481,7 +1457,7 @@ EAPI double ecore_con_server_timeout_get(const Ecore_Con_Server *svr) * @warning Seriously. Don't use this unless you know what you are doing. * @since 1.1 */ -EAPI int ecore_con_server_fd_get(const Ecore_Con_Server *svr); +ECORE_CON_API int ecore_con_server_fd_get(const Ecore_Con_Server *svr); /** * @brief Gets the fd that the client is connected to. @@ -1493,7 +1469,7 @@ EAPI int ecore_con_server_fd_get(const Ecore_Con_Server *svr); * It should not be tampered with unless you REALLY know what you are doing. * @since 1.1 */ -EAPI int ecore_con_client_fd_get(const Ecore_Con_Client *cl); +ECORE_CON_API int ecore_con_client_fd_get(const Ecore_Con_Client *cl); /** * @} */ @@ -1535,7 +1511,7 @@ EAPI int ecore_con_client_fd_get(const Ecore_Con_Client *cl); * @see ecore_con_server_send() * @see ecore_con_client_flush() */ -EAPI int ecore_con_client_send(Ecore_Con_Client *cl, +ECORE_CON_API int ecore_con_client_send(Ecore_Con_Client *cl, const void *data, int size); /** @@ -1544,14 +1520,14 @@ EAPI int ecore_con_client_send(Ecore_Con_Client *cl, * @param cl The given client. * @return Data associated with the client. */ -EAPI void * ecore_con_client_del(Ecore_Con_Client *cl); +ECORE_CON_API void * ecore_con_client_del(Ecore_Con_Client *cl); /** * @brief Sets the data associated with the given client to @p data. * * @param cl The given client. * @param data What to set the data to. */ -EAPI void ecore_con_client_data_set(Ecore_Con_Client *cl, +ECORE_CON_API void ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data); /** * @brief Retrieves the data associated with the given client. @@ -1559,7 +1535,7 @@ EAPI void ecore_con_client_data_set(Ecore_Con_Client *cl, * @param cl The given client. * @return The data associated with @p cl. */ -EAPI void * ecore_con_client_data_get(Ecore_Con_Client *cl); +ECORE_CON_API void * ecore_con_client_data_get(Ecore_Con_Client *cl); /** * @brief Gets the IP address of a client that has connected. @@ -1571,7 +1547,7 @@ EAPI void * ecore_con_client_data_get(Ecore_Con_Client *cl); * The returned string should not be modified, freed or trusted to stay valid * after deletion for the @p cl object. If no IP is known @c NULL is returned. */ -EAPI const char * ecore_con_client_ip_get(const Ecore_Con_Client *cl); +ECORE_CON_API const char * ecore_con_client_ip_get(const Ecore_Con_Client *cl); /** * @brief Flushes all pending data to the given client. * @@ -1582,7 +1558,7 @@ EAPI const char * ecore_con_client_ip_get(const Ecore_Con_Client *cl); * @see ecore_con_client_send() * @see ecore_con_server_flush() */ -EAPI void ecore_con_client_flush(Ecore_Con_Client *cl); +ECORE_CON_API void ecore_con_client_flush(Ecore_Con_Client *cl); /** * @brief Checks how long a client has been connected. * @@ -1592,7 +1568,7 @@ EAPI void ecore_con_client_flush(Ecore_Con_Client *cl); * * This function is used to find out how long a client has been connected for. */ -EAPI double ecore_con_client_uptime_get(const Ecore_Con_Client *cl); +ECORE_CON_API double ecore_con_client_uptime_get(const Ecore_Con_Client *cl); /** * @brief Gets the default time after which the client will be disconnected when * inactive. @@ -1605,7 +1581,7 @@ EAPI double ecore_con_client_uptime_get(const Ecore_Con_Client *cl); * * @see ecore_con_client_timeout_set() */ -EAPI double ecore_con_client_timeout_get(const Ecore_Con_Client *cl); +ECORE_CON_API double ecore_con_client_timeout_get(const Ecore_Con_Client *cl); /** * @brief Sets the time after which the client will be disconnected when inactive. * @@ -1625,14 +1601,14 @@ EAPI double ecore_con_client_timeout_get(const Ecore_Con_Client *cl); * @see ecore_con_client_timeout_get() * @see ecore_con_server_timeout_set() */ -EAPI void ecore_con_client_timeout_set(Ecore_Con_Client *cl, double timeout); +ECORE_CON_API void ecore_con_client_timeout_set(Ecore_Con_Client *cl, double timeout); /** * @brief Returns whether the client is still connected. * * @param cl The given client. * @return @c EINA_TRUE if connected, @c EINA_FALSE otherwise. */ -EAPI Eina_Bool ecore_con_client_connected_get(const Ecore_Con_Client *cl); +ECORE_CON_API Eina_Bool ecore_con_client_connected_get(const Ecore_Con_Client *cl); /** * @brief Returns the port that the client has connected to. * @@ -1640,7 +1616,7 @@ EAPI Eina_Bool ecore_con_client_connected_get(const Ecore_Con_Client *cl * @return The port that @p cl has connected to, or @c -1 on error * Use this function to return the port on which a given client has connected. */ -EAPI int ecore_con_client_port_get(const Ecore_Con_Client *cl); +ECORE_CON_API int ecore_con_client_port_get(const Ecore_Con_Client *cl); /** * @brief The server the client is connected to. @@ -1648,7 +1624,7 @@ EAPI int ecore_con_client_port_get(const Ecore_Con_Client *cl); * @param cl The client * @return The server the client is connected to. */ -EAPI Ecore_Con_Server *ecore_con_client_server_get(const Ecore_Con_Client *cl); +ECORE_CON_API Ecore_Con_Server *ecore_con_client_server_get(const Ecore_Con_Client *cl); /** * @} @@ -1773,7 +1749,7 @@ typedef enum _Ecore_Con_Url_Http_Version * @since 1.2 * @see ecore_con_url_pipeline_get() */ -EAPI Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version); +ECORE_CON_API Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version); /** * @brief Initializes the Ecore_Con_Url library. @@ -1783,7 +1759,7 @@ EAPI Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ec * @note This function doesn't call ecore_con_init(). You still need to call it * explicitly before calling this one. */ -EAPI int ecore_con_url_init(void); +ECORE_CON_API int ecore_con_url_init(void); /** * @brief Shuts down the Ecore_Con_Url library. @@ -1792,7 +1768,7 @@ EAPI int ecore_con_url_init(void); * @note This function doesn't call ecore_con_shutdown(). You still need to call * it explicitly after calling this one. */ -EAPI int ecore_con_url_shutdown(void); +ECORE_CON_API int ecore_con_url_shutdown(void); /** * @brief Enables or disable HTTP 1.1 pipelining. @@ -1809,14 +1785,14 @@ EAPI int ecore_con_url_shutdown(void); * * @see ecore_con_url_pipeline_get() */ -EAPI void ecore_con_url_pipeline_set(Eina_Bool enable); +ECORE_CON_API void ecore_con_url_pipeline_set(Eina_Bool enable); /** * @brief Is HTTP 1.1 pipelining enable ? * @return @c EINA_TRUE if it is enable. * * @see ecore_con_url_pipeline_set() */ -EAPI Eina_Bool ecore_con_url_pipeline_get(void); +ECORE_CON_API Eina_Bool ecore_con_url_pipeline_get(void); /** * @brief Creates and initializes a new Ecore_Con_Url connection object. @@ -1832,7 +1808,7 @@ EAPI Eina_Bool ecore_con_url_pipeline_get(void); * @see ecore_con_url_custom_new() * @see ecore_con_url_url_set() */ -EAPI Ecore_Con_Url * ecore_con_url_new(const char *url); +ECORE_CON_API Ecore_Con_Url * ecore_con_url_new(const char *url); /** @@ -1842,7 +1818,7 @@ EAPI Ecore_Con_Url * ecore_con_url_new(const char *url); * @param url the new URL. * @return @c EINA_TRUE on success, @c EINA_FALSE on errors. */ -EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con, +ECORE_CON_API Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url); /** @@ -1851,7 +1827,7 @@ EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con, * @param url_con the Connection object to retrieve URL. * @return @c NULL on error, read-only URL string on success. */ -EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con); +ECORE_CON_API const char *ecore_con_url_url_get(Ecore_Con_Url *url_con); /** * @brief Creates a custom connection object. @@ -1868,7 +1844,7 @@ EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con); * @see ecore_con_url_new() * @see ecore_con_url_url_set() */ -EAPI Ecore_Con_Url * ecore_con_url_custom_new(const char *url, +ECORE_CON_API Ecore_Con_Url * ecore_con_url_custom_new(const char *url, const char *custom_request); /** * @brief Destroys an Ecore_Con_Url connection object. @@ -1877,7 +1853,7 @@ EAPI Ecore_Con_Url * ecore_con_url_custom_new(const char *url, * * @see ecore_con_url_new() */ -EAPI void ecore_con_url_free(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_free(Ecore_Con_Url *url_con); /** * @brief Associates data with a connection object. @@ -1890,7 +1866,7 @@ EAPI void ecore_con_url_free(Ecore_Con_Url *url_con); * * @see ecore_con_url_data_get() */ -EAPI void ecore_con_url_data_set(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data); /** * @brief Retrieves data associated with a Ecore_Con_Url connection object. @@ -1904,7 +1880,7 @@ EAPI void ecore_con_url_data_set(Ecore_Con_Url *url_con, * * @see ecore_con_url_data_set() */ -EAPI void * ecore_con_url_data_get(Ecore_Con_Url *url_con); +ECORE_CON_API void * ecore_con_url_data_get(Ecore_Con_Url *url_con); /** * @brief Adds an additional header to the request connection object. * @@ -1922,7 +1898,7 @@ EAPI void * ecore_con_url_data_get(Ecore_Con_Url *url_con); * @see ecore_con_url_post() * @see ecore_con_url_additional_headers_clear() */ -EAPI void ecore_con_url_additional_header_add(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_additional_header_add(Ecore_Con_Url *url_con, const char *key, const char *value); /** @@ -1937,7 +1913,7 @@ EAPI void ecore_con_url_additional_header_add(Ecore_Con_Url *url_co * @see ecore_con_url_get() * @see ecore_con_url_post() */ -EAPI void ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_con); /** * @brief Retrieves headers from last request sent. * @@ -1949,7 +1925,7 @@ EAPI void ecore_con_url_additional_headers_clear(Ecore_Con_Url *url * * @return List of response headers. This list must not be modified by the user. */ -EAPI const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con); +ECORE_CON_API const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con); /** * @brief Sets up a file for receiving response data. * @@ -1964,7 +1940,7 @@ EAPI const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con * This call can be used to easily setup a file where the downloaded data will * be saved. */ -EAPI void ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd); +ECORE_CON_API void ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd); /** * @brief Retrieves the number of bytes received. * @@ -1978,7 +1954,7 @@ EAPI void ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd); * @see ecore_con_url_get() * @see ecore_con_url_post() */ -EAPI int ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con); +ECORE_CON_API int ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con); /** * @brief Sets url_con to use http auth, with given username and password, "safely" or not. * @@ -1993,7 +1969,7 @@ EAPI int ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con); * @attention Require libcurl >= 7.19.1 to work, otherwise will always return * @c 0. */ -EAPI Eina_Bool ecore_con_url_httpauth_set(Ecore_Con_Url *url_con, +ECORE_CON_API Eina_Bool ecore_con_url_httpauth_set(Ecore_Con_Url *url_con, const char *username, const char *password, Eina_Bool safe); @@ -2017,7 +1993,7 @@ EAPI Eina_Bool ecore_con_url_httpauth_set(Ecore_Con_Url *url_con, * @see ecore_con_url_time() * @see ecore_con_url_post() */ -EAPI Eina_Bool ecore_con_url_get(Ecore_Con_Url *url_con); +ECORE_CON_API Eina_Bool ecore_con_url_get(Ecore_Con_Url *url_con); /** * @brief Sends a HEAD request. * @@ -2037,7 +2013,7 @@ EAPI Eina_Bool ecore_con_url_get(Ecore_Con_Url *url_con); * @see ecore_con_url_post() * @since 1.14 */ -EAPI Eina_Bool ecore_con_url_head(Ecore_Con_Url *url_con); +ECORE_CON_API Eina_Bool ecore_con_url_head(Ecore_Con_Url *url_con); /** * @brief Sends a post request. * @@ -2066,7 +2042,7 @@ EAPI Eina_Bool ecore_con_url_head(Ecore_Con_Url *url_con); * @see ecore_con_url_time() * @see ecore_con_url_get() */ -EAPI Eina_Bool ecore_con_url_post(Ecore_Con_Url *url_con, +ECORE_CON_API Eina_Bool ecore_con_url_post(Ecore_Con_Url *url_con, const void *data, long length, const char *content_type); /** @@ -2084,7 +2060,7 @@ EAPI Eina_Bool ecore_con_url_post(Ecore_Con_Url *url_con, * @sa ecore_con_url_get() * @sa ecore_con_url_post() */ -EAPI void ecore_con_url_time(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_time(Ecore_Con_Url *url_con, Ecore_Con_Url_Time time_condition, double timestamp); @@ -2101,7 +2077,7 @@ EAPI void ecore_con_url_time(Ecore_Con_Url *url_con, * Upload @p filename to an ftp server set in @p url_con using @p user * and @p pass to directory @p upload_dir */ -EAPI Eina_Bool ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, +ECORE_CON_API Eina_Bool ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, const char *filename, const char *user, const char *pass, @@ -2116,14 +2092,14 @@ EAPI Eina_Bool ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, * information about its operations, which is useful for * debugging. The verbose information will be sent to stderr. */ -EAPI void ecore_con_url_verbose_set(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_verbose_set(Ecore_Con_Url *url_con, Eina_Bool verbose); /** * @brief Enables or disables EPSV extension. * @param url_con The Ecore_Con_Url instance which will be acted upon. * @param use_epsv Boolean to enable/disable the EPSV extension. */ -EAPI void ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, Eina_Bool use_epsv); /** @@ -2138,7 +2114,7 @@ EAPI void ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, * @note Even though this function is called @c ecore_con_url_cookies_init(), * there is no symmetrical shutdown operation. */ -EAPI void ecore_con_url_cookies_init(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_cookies_init(Ecore_Con_Url *url_con); /** * @brief Controls whether session cookies from previous sessions shall be loaded. * @@ -2159,7 +2135,7 @@ EAPI void ecore_con_url_cookies_init(Ecore_Con_Url *url_con); * * @see ecore_con_url_cookies_file_add() */ -EAPI void ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con, Eina_Bool ignore); /** * @brief Clears currently loaded cookies. @@ -2183,7 +2159,7 @@ EAPI void ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Ur * @see ecore_con_url_cookies_session_clear() * @see ecore_con_url_cookies_ignore_old_session_set() */ -EAPI void ecore_con_url_cookies_clear(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_cookies_clear(Ecore_Con_Url *url_con); /** * @brief Clears currently loaded session cookies. * @@ -2212,7 +2188,7 @@ EAPI void ecore_con_url_cookies_clear(Ecore_Con_Url *url_con); * @see ecore_con_url_cookies_clear() * @see ecore_con_url_cookies_ignore_old_session_set() */ -EAPI void ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con); /** * @brief Adds a file to the list of files from which to load cookies. * @@ -2239,7 +2215,7 @@ EAPI void ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_co * @see ecore_con_url_cookies_ignore_old_session_set() * @see ecore_con_url_cookies_jar_file_set() */ -EAPI void ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con, const char * const file_name); /** * @brief Sets the name of the file to which all current cookies will be written when @@ -2262,7 +2238,7 @@ EAPI void ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con, * * @see ecore_con_url_cookies_jar_write() */ -EAPI Eina_Bool ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con, +ECORE_CON_API Eina_Bool ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con, const char * const cookiejar_file); /** * @brief Writes all current cookies to the cookie jar immediately. @@ -2277,7 +2253,7 @@ EAPI Eina_Bool ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con * * @see ecore_con_url_cookies_jar_file_set() */ -EAPI void ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con); +ECORE_CON_API void ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con); /** * Toggle libcurl's verify peer's certificate option. @@ -2291,7 +2267,7 @@ EAPI void ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con); * @param verify Whether or not libcurl will check peer's certificate. * @since 1.1.0 */ -EAPI void ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con, +ECORE_CON_API void ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con, Eina_Bool verify); /** * Set a custom CA to trust for SSL/TLS connections. @@ -2311,7 +2287,7 @@ EAPI void ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con, * @return @c 0 on success. When cURL is used, non-zero return values * are equal to cURL error codes. */ -EAPI int ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con, +ECORE_CON_API int ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con, const char *ca_path); /** @@ -2331,7 +2307,7 @@ EAPI int ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con, * @return @c EINA_TRUE on success, @c EINA_FALSE on error. * @since 1.2 */ -EAPI Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy); +ECORE_CON_API Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy); /** * @brief Sets zero terminated username to use for proxy. @@ -2347,7 +2323,7 @@ EAPI Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy * * @since 1.2 */ -EAPI Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username); +ECORE_CON_API Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username); /** * @brief Sets zero terminated password to use for proxy. @@ -2363,7 +2339,7 @@ EAPI Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const ch * * @since 1.2 */ -EAPI Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password); +ECORE_CON_API Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password); /** * @brief Sets timeout in seconds. @@ -2380,7 +2356,7 @@ EAPI Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const ch * * @since 1.2 */ -EAPI void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout); +ECORE_CON_API void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout); /** * @brief Gets the returned HTTP STATUS code. @@ -2391,7 +2367,7 @@ EAPI void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout); * * @since 1.2 */ -EAPI int ecore_con_url_status_code_get(Ecore_Con_Url *url_con); +ECORE_CON_API int ecore_con_url_status_code_get(Ecore_Con_Url *url_con); /** * @brief Sets a maximum upload speed. @@ -2399,7 +2375,7 @@ EAPI int ecore_con_url_status_code_get(Ecore_Con_Url *url_con); * @param url_obj Connection object * @param max_speed Maximum upload speed, in bytes per second */ -EAPI void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_speed); +ECORE_CON_API void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_speed); /** * @brief Sets a maximum download speed. @@ -2407,7 +2383,7 @@ EAPI void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_obj, off_t max_spe * @param url_obj Connection object * @param max_speed Maximum download speed, in bytes per second */ -EAPI void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_speed); +ECORE_CON_API void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_speed); /** * @} @@ -2417,7 +2393,4 @@ EAPI void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_obj, off_t max_s } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h index 4a716752a3..013786062e 100644 --- a/src/lib/ecore_con/Ecore_Con_Eet.h +++ b/src/lib/ecore_con/Ecore_Con_Eet.h @@ -5,31 +5,7 @@ #include #include -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include /** * @defgroup Ecore_Con_Eet_Group Eet connection functions @@ -100,7 +76,7 @@ typedef Eina_Bool (*Ecore_Con_Eet_Server_Cb)(void *data, Ecore_Con_Reply *reply, * * @return A new Ecore_Con_Eet server. */ -EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); +ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); /** * @brief Creates an Ecore_Con_Eet client. @@ -114,7 +90,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); * * @return A new Ecore_Con_Eet client. */ -EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); +ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); /** * @brief Frees an existing Ecore_Con_Eet object. @@ -124,7 +100,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); * ecore_con_eet_client_new. * */ -EAPI void ecore_con_eet_server_free(Ecore_Con_Eet *server); +ECORE_CON_API void ecore_con_eet_server_free(Ecore_Con_Eet *server); /** * @brief Registers an @c Eet data descriptor on a Ecore_Con_Eet object. @@ -135,7 +111,7 @@ EAPI void ecore_con_eet_server_free(Ecore_Con_Eet *server); * in the Eet stream. * */ -EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd); +ECORE_CON_API void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd); /** * @brief Registers a data callback on a Ecore_Con_Eet object. @@ -147,7 +123,7 @@ EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_ * @param data The data to pass to the callback. * */ -EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); /** * @brief Removes a data callback on a Ecore_Con_Eet object. @@ -156,7 +132,7 @@ EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, * @param name The name of the Eet stream to remove callback on. * */ -EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); +ECORE_CON_API void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); /** * @brief Registers a raw data callback on a Ecore_Con_Eet object. @@ -168,7 +144,7 @@ EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); * @param data The data to pass to the callback. * */ -EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); /** * @brief Removes a raw data callback on a Ecore_Con_Eet object. @@ -177,7 +153,7 @@ EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *na * @param name The name of the raw Eet stream to remove callback on. * */ -EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name); +ECORE_CON_API void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name); /** * @brief Registers a client connect callback on a Ecore_Con_Eet object. @@ -189,7 +165,7 @@ EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *na * @param func The function to call as a callback. * @param data The data to pass to the callback. */ -EAPI void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); /** * @brief Removes a client connect callback on a Ecore_Con_Eet object. @@ -198,7 +174,7 @@ EAPI void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Co * @param func The callback to remove. * @param data The data passed to this function at the callback registration. */ -EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); /** * @brief Registers a client disconnect callback on a Ecore_Con_Eet object. @@ -210,7 +186,7 @@ EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co * @param func The function to call as a callback. * @param data The data to pass to the callback. */ -EAPI void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); /** * @brief Removes a client disconnect callback on a Ecore_Con_Eet object. @@ -219,7 +195,7 @@ EAPI void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore * @param func The callback to remove. * @param data The data passed to this function at the callback registration. */ -EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); /** * @brief Registers a server connect callback on a Ecore_Con_Eet object. @@ -231,7 +207,7 @@ EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore * @param func The function to call as a callback. * @param data The data to pass to the callback. */ -EAPI void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); /** * @brief Removes a server connect callback on a Ecore_Con_Eet object. @@ -240,7 +216,7 @@ EAPI void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Co * @param func The callback to remove. * @param data The data passed to this function at the callback registration. */ -EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); /** * @brief Registers a server disconnect callback on a Ecore_Con_Eet object. @@ -252,7 +228,7 @@ EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co * @param func The function to call as a callback. * @param data The data to pass to the callback. */ -EAPI void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); /** * @brief Removes a server disconnect callback on a Ecore_Con_Eet object. @@ -261,7 +237,7 @@ EAPI void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore * @param func The callback to remove. * @param data The data passed to this function at the callback registration. */ -EAPI void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); +ECORE_CON_API void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); /** * @brief Attaches data to an Ecore_Con_Eet object. @@ -269,7 +245,7 @@ EAPI void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore * @param ece An Ecore_Con_Eet object. * @param data The data to attach to the Ecore_Con_Eet object. */ -EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data); +ECORE_CON_API void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data); /** * @brief Gets the data attached to an Ecore_Con_Eet object. @@ -277,7 +253,7 @@ EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data); * @param ece An Ecore_Con_Eet object. * @return The data attached to the Ecore_Con_Eet object. */ -EAPI const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece); +ECORE_CON_API const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece); /** * @brief Gets the Ecore_Con_Eet object corresponding to the Ecore_Con_Reply object. @@ -285,7 +261,7 @@ EAPI const void *ecore_con_eet_data_get(Ecore_Con_Eet *ece); * @param reply An Ecore_Con_Reply object. * @return The corresponding Ecore_Con_Eet object. */ -EAPI Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply); +ECORE_CON_API Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply); /** * @brief Sends some data using a protocol type. @@ -294,7 +270,7 @@ EAPI Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply); * @param protocol_name The protocol type to use. * @param value The data to send. */ -EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value); +ECORE_CON_API void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value); /** * @brief Sends some raw data using a protocol type. @@ -305,7 +281,7 @@ EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, * @param value The data to send. * @param length The data length. */ -EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length); +ECORE_CON_API void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length); /** * @} @@ -315,7 +291,4 @@ EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_na } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h index 7cab05efa3..4c5cab8725 100644 --- a/src/lib/ecore_con/Efl_Net.h +++ b/src/lib/ecore_con/Efl_Net.h @@ -13,31 +13,7 @@ #include -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include #ifdef __cplusplus extern "C" { @@ -51,7 +27,7 @@ extern "C" { * @note This function already calls ecore_init() internally, so you don't need * to call it explicitly. */ -EAPI int ecore_con_init(void); +ECORE_CON_API int ecore_con_init(void); /** * @brief Shuts down the Ecore_Con library. @@ -60,7 +36,7 @@ EAPI int ecore_con_init(void); * @note This function already calls ecore_shutdown() internally, so you don't * need to call it explicitly unless you called ecore_init() explicitly too. */ -EAPI int ecore_con_shutdown(void); +ECORE_CON_API int ecore_con_shutdown(void); /** * @brief Initializes the Ecore_Con_Url library. @@ -70,7 +46,7 @@ EAPI int ecore_con_shutdown(void); * @note This function doesn't call ecore_con_init(). You still need to call it * explicitly before calling this one. */ -EAPI int ecore_con_url_init(void); +ECORE_CON_API int ecore_con_url_init(void); /** * @brief Shuts down the Ecore_Con_Url library. @@ -79,161 +55,161 @@ EAPI int ecore_con_url_init(void); * @note This function doesn't call ecore_con_shutdown(). You still need to call * it explicitly after calling this one. */ -EAPI int ecore_con_url_shutdown(void); +ECORE_CON_API int ecore_con_url_shutdown(void); #ifdef EFL_BETA_API_SUPPORT /** HTTP error: bad content encoding */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING; /** HTTP error: bad download resume */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME; /** HTTP error: bad function argument */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT; /** HTTP error: chunk failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED; /** HTTP error: conv failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED; /** HTTP error: conv reqd */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD; /** HTTP error: failed init */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT; /** HTTP error: could not read file */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE; /** HTTP error: filesize exceeded */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED; /** HTTP error: function not found */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND; /** HTTP error: got nothing */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING; /** HTTP error: http2 */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_HTTP2; /** HTTP error: http2 stream */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM; /** HTTP error: http post error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR; /** HTTP error: http returned error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR; /** HTTP error: interface failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED; /** HTTP error: login denied */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED; /** HTTP error: no connection available */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE; /** HTTP error: not built in */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN; /** HTTP error: operation timeout */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT; /** HTTP error: partial file */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE; /** HTTP error: peer failed verification */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION; /** HTTP error: range error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR; /** HTTP error: read error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR; /** HTTP error: receive error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR; /** HTTP error: remote access denied */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED; /** HTTP error: remote disk full */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL; /** HTTP error: remote file exists */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS; /** HTTP error: remote file not found */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND; /** HTTP error: send error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR; /** HTTP error: send fail rewind */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND; /** HTTP error: SSL cacert */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT; /** HTTP error: SSL cacert bad file */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE; /** HTTP error: SSL certproblem */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM; /** HTTP error: SSL cipher */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER; /** HTTP error: SSL connect error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR; /** HTTP error: SSL crl bad file */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE; /** HTTP error: SSL engine init failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED; /** HTTP error: SSL engine not found */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND; /** HTTP error: SSL engine set failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED; /** HTTP error: SSL invalid cert status */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS; /** HTTP error: SSL issuer error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR; /** HTTP error: SSL pinned pub key does not match */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH; /** HTTP error: SSL shutdown failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED; /** HTTP error: too many redirects */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS; /** HTTP error: unknown option */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION; /** HTTP error: unsupported protocol */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL; /** HTTP error: upload failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED; /** HTTP error: URL mal-formatted */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT; /** HTTP error: usage of SSL failed */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED; /** HTTP error: write error */ -extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR; +ECORE_CON_API ECORE_CON_API_WEAK extern Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR; #endif /* EFL_BETA_API_SUPPORT */ #include "efl_net_types.eot.h" @@ -293,7 +269,4 @@ extern EWAPI Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR; } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index dd7fc23d4b..96cb7b3e5e 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -64,7 +64,7 @@ char **_efl_net_proxy_helper_url_wait (int id); void _efl_net_proxy_helper_init (void); void _efl_net_proxy_helper_shutdown (void); -EAPI int +ECORE_CON_API int ecore_con_init(void) { if (++_ecore_con_init_count != 1) @@ -129,7 +129,7 @@ ecore_con_log_error: return --_ecore_con_init_count; } -EAPI int +ECORE_CON_API int ecore_con_shutdown(void) { /* _ecore_con_init_count should not go below zero. */ @@ -162,7 +162,7 @@ ecore_con_shutdown(void) return _ecore_con_init_count; } -EAPI int +ECORE_CON_API int ecore_con_ssl_available_get(void) { #if HAVE_GNUTLS diff --git a/src/lib/ecore_con/ecore_con_api.h b/src/lib/ecore_con/ecore_con_api.h new file mode 100644 index 0000000000..b3898ab6b5 --- /dev/null +++ b/src/lib/ecore_con/ecore_con_api.h @@ -0,0 +1,34 @@ +#ifndef _EFL_ECORE_CON_API_H +#define _EFL_ECORE_CON_API_H + +#ifdef ECORE_CON_API +#error ECORE_CON_API should not be already defined +#endif + +#ifdef _WIN32 +# ifndef ECORE_CON_STATIC +# ifdef ECORE_CON_BUILD +# define ECORE_CON_API __declspec(dllexport) +# else +# define ECORE_CON_API __declspec(dllimport) +# endif +# else +# define ECORE_CON_API +# endif +# define ECORE_CON_API_WEAK +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define ECORE_CON_API __attribute__ ((visibility("default"))) +# define ECORE_CON_API_WEAK __attribute__ ((weak)) +# else +# define ECORE_CON_API +# define ECORE_CON_API_WEAK +# endif +# else +# define ECORE_CON_API +# define ECORE_CON_API_WEAK +# endif +#endif + +#endif diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c index 2bbbba7db4..3e7cb0de74 100644 --- a/src/lib/ecore_con/ecore_con_eet.c +++ b/src/lib/ecore_con/ecore_con_eet.c @@ -717,7 +717,7 @@ _ecore_con_eet_base_server_get(const Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Dat * Global API * **************/ -EAPI Ecore_Con_Eet * +ECORE_CON_API Ecore_Con_Eet * ecore_con_eet_server_new(Ecore_Con_Server *server) { Ecore_Con_Eet *ece_obj; @@ -729,7 +729,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server) return ece_obj; } -EAPI Ecore_Con_Eet * +ECORE_CON_API Ecore_Con_Eet * ecore_con_eet_client_new(Ecore_Con_Server *server) { Ecore_Con_Eet *ece_obj; @@ -741,43 +741,43 @@ ecore_con_eet_client_new(Ecore_Con_Server *server) return ece_obj; } -EAPI void +ECORE_CON_API void ecore_con_eet_server_free(Ecore_Con_Eet *server) { efl_unref(server); } -EAPI void +ECORE_CON_API void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd) { ecore_con_eet_base_register(ece, name, edd); } -EAPI void +ECORE_CON_API void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data) { ecore_con_eet_base_data_callback_set(ece, name, func, data); } -EAPI void +ECORE_CON_API void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name) { ecore_con_eet_base_data_callback_del(ece, name); } -EAPI void +ECORE_CON_API void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data) { ecore_con_eet_base_raw_data_callback_set(ece, name, func, data); } -EAPI void +ECORE_CON_API void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name) { ecore_con_eet_base_raw_data_callback_del(ece, name); } -EAPI void +ECORE_CON_API void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) { Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); @@ -794,7 +794,7 @@ ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie eces->client_connect_callbacks = eina_list_append(eces->client_connect_callbacks, c); } -EAPI void +ECORE_CON_API void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) { Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); @@ -812,7 +812,7 @@ ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie } } -EAPI void +ECORE_CON_API void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) { Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); @@ -829,7 +829,7 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C eces->client_disconnect_callbacks = eina_list_append(eces->client_disconnect_callbacks, c); } -EAPI void +ECORE_CON_API void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) { Ecore_Con_Eet_Server_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); @@ -847,7 +847,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C } } -EAPI void +ECORE_CON_API void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) { Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); @@ -864,7 +864,7 @@ ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv eced->server_connect_callbacks = eina_list_append(eced->server_connect_callbacks, s); } -EAPI void +ECORE_CON_API void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) { Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); @@ -882,7 +882,7 @@ ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv } } -EAPI void +ECORE_CON_API void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) { Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); @@ -899,7 +899,7 @@ ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_S eced->server_disconnect_callbacks = eina_list_append(eced->server_disconnect_callbacks, s); } -EAPI void +ECORE_CON_API void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) { Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); @@ -917,32 +917,32 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S } } -EAPI void +ECORE_CON_API void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data) { efl_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data); } -EAPI const void * +ECORE_CON_API const void * ecore_con_eet_data_get(Ecore_Con_Eet *ece) { return efl_key_data_get(ece, ECORE_CON_EET_DATA_KEY); } -EAPI Ecore_Con_Eet * +ECORE_CON_API Ecore_Con_Eet * ecore_con_eet_reply(Ecore_Con_Reply *reply) { if (!reply) return NULL; return reply->ece; } -EAPI void +ECORE_CON_API void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value) { ecore_con_eet_base_send(reply->ece, reply, name, value); } -EAPI void +ECORE_CON_API void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length) { Eina_Binbuf *buf = eina_binbuf_manage_new(value, length, 1); diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.c b/src/lib/ecore_con/ecore_con_eet_base_eo.c index 7e1e6913c1..64969ba71e 100644 --- a/src/lib/ecore_con/ecore_con_eet_base_eo.c +++ b/src/lib/ecore_con/ecore_con_eet_base_eo.c @@ -1,39 +1,39 @@ void _ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_server_set, EFL_FUNC_CALL(data), Ecore_Con_Server *data); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_server_set, EFL_FUNC_CALL(data), Ecore_Con_Server *data); Ecore_Con_Server *_ecore_con_eet_base_server_get(const Eo *obj, Ecore_Con_Eet_Base_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(ecore_con_eet_base_server_get, Ecore_Con_Server *, NULL); +ECORE_CON_API ECORE_CON_API_WEAK EFL_FUNC_BODY_CONST(ecore_con_eet_base_server_get, Ecore_Con_Server *, NULL); void _ecore_con_eet_base_data_callback_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); void _ecore_con_eet_base_raw_data_callback_set(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_set, EFL_FUNC_CALL(name, func, data), const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); void _ecore_con_eet_base_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_del, EFL_FUNC_CALL(name), const char *name); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_data_callback_del, EFL_FUNC_CALL(name), const char *name); void _ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_del, EFL_FUNC_CALL(name), const char *name); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_data_callback_del, EFL_FUNC_CALL(name), const char *name); void _ecore_con_eet_base_register(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name, Eet_Data_Descriptor *edd); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_register, EFL_FUNC_CALL(name, edd), const char *name, Eet_Data_Descriptor *edd); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_register, EFL_FUNC_CALL(name, edd), const char *name, Eet_Data_Descriptor *edd); void _ecore_con_eet_base_send(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Reply *reply, const char *name, void *value); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_send, EFL_FUNC_CALL(reply, name, value), Ecore_Con_Reply *reply, const char *name, void *value); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_send, EFL_FUNC_CALL(reply, name, value), Ecore_Con_Reply *reply, const char *name, void *value); void _ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data); -EOAPI EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_send, EFL_FUNC_CALL(reply, protocol_name, section, section_data), Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data); +ECORE_CON_API ECORE_CON_API_WEAK EFL_VOID_FUNC_BODYV(ecore_con_eet_base_raw_send, EFL_FUNC_CALL(reply, protocol_name, section, section_data), Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data); Efl_Object *_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd); diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.h b/src/lib/ecore_con/ecore_con_eet_base_eo.h index f9bd8a777b..e4e00e20fc 100644 --- a/src/lib/ecore_con/ecore_con_eet_base_eo.h +++ b/src/lib/ecore_con/ecore_con_eet_base_eo.h @@ -29,7 +29,7 @@ typedef struct _Ecore_Con_Reply Ecore_Con_Reply; */ #define ECORE_CON_EET_BASE_CLASS ecore_con_eet_base_class_get() -EWAPI const Efl_Class *ecore_con_eet_base_class_get(void) EINA_CONST; +ECORE_CON_API ECORE_CON_API_WEAK const Efl_Class *ecore_con_eet_base_class_get(void) EINA_CONST; /** * @brief The server object to which we send and receive. @@ -39,7 +39,7 @@ EWAPI const Efl_Class *ecore_con_eet_base_class_get(void) EINA_CONST; * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Server *data); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Server *data); /** * @brief The server object to which we send and receive. @@ -50,7 +50,7 @@ EOAPI void ecore_con_eet_base_server_set(Eo *obj, Ecore_Con_Server *data); * * @ingroup Ecore_Con_Eet_Base */ -EOAPI Ecore_Con_Server *ecore_con_eet_base_server_get(const Eo *obj); +ECORE_CON_API ECORE_CON_API_WEAK Ecore_Con_Server *ecore_con_eet_base_server_get(const Eo *obj); /** * @brief A callback function which should be called when data is received by @@ -64,7 +64,7 @@ EOAPI Ecore_Con_Server *ecore_con_eet_base_server_get(const Eo *obj); * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); /** * @brief A callback function which should be calledn when raw data is received @@ -78,7 +78,7 @@ EOAPI void ecore_con_eet_base_data_callback_set(Eo *obj, const char *name, Ecore * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_raw_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_raw_data_callback_set(Eo *obj, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); /** * @brief Function to delete the @ref ecore_con_eet_base_data_callback_set. @@ -88,7 +88,7 @@ EOAPI void ecore_con_eet_base_raw_data_callback_set(Eo *obj, const char *name, E * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_data_callback_del(Eo *obj, const char *name); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_data_callback_del(Eo *obj, const char *name); /** * @brief Function to delete the @ref ecore_con_eet_base_raw_data_callback_set. @@ -98,7 +98,7 @@ EOAPI void ecore_con_eet_base_data_callback_del(Eo *obj, const char *name); * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_raw_data_callback_del(Eo *obj, const char *name); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_raw_data_callback_del(Eo *obj, const char *name); /** * @brief Function to register a @ref Eet.Data.Descriptor to the ecore_con_eet @@ -110,7 +110,7 @@ EOAPI void ecore_con_eet_base_raw_data_callback_del(Eo *obj, const char *name); * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_register(Eo *obj, const char *name, Eet_Data_Descriptor *edd); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_register(Eo *obj, const char *name, Eet_Data_Descriptor *edd); /** * @brief Function to send data. @@ -123,7 +123,7 @@ EOAPI void ecore_con_eet_base_register(Eo *obj, const char *name, Eet_Data_Descr * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_send(Eo *obj, Ecore_Con_Reply *reply, const char *name, void *value); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_send(Eo *obj, Ecore_Con_Reply *reply, const char *name, void *value); /** * @brief Function to send raw data. @@ -137,6 +137,6 @@ EOAPI void ecore_con_eet_base_send(Eo *obj, Ecore_Con_Reply *reply, const char * * * @ingroup Ecore_Con_Eet_Base */ -EOAPI void ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data); +ECORE_CON_API ECORE_CON_API_WEAK void ecore_con_eet_base_raw_send(Eo *obj, Ecore_Con_Reply *reply, const char *protocol_name, const char *section, Eina_Binbuf *section_data); #endif diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c index 696028a9c8..434754217e 100644 --- a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c +++ b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.c @@ -1,5 +1,5 @@ -EAPI void +ECORE_CON_API void ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd) { ecore_con_eet_base_register(obj, name, edd); diff --git a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h index 4636f095bb..2ec7bd427f 100644 --- a/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h +++ b/src/lib/ecore_con/ecore_con_eet_base_eo.legacy.h @@ -36,7 +36,7 @@ typedef struct _Ecore_Con_Reply Ecore_Con_Reply; * * @ingroup (null)_Group */ -EAPI void ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd); +ECORE_CON_API void ecore_con_eet(Ecore_Con_Eet_Base *obj, const char *name, Eet_Data_Descriptor *edd); diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h index 5bfdbb804c..53d91370da 100644 --- a/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h +++ b/src/lib/ecore_con/ecore_con_eet_client_obj_eo.h @@ -19,6 +19,6 @@ typedef Eo Ecore_Con_Eet_Client_Obj; */ #define ECORE_CON_EET_CLIENT_OBJ_CLASS ecore_con_eet_client_obj_class_get() -EWAPI const Efl_Class *ecore_con_eet_client_obj_class_get(void) EINA_CONST; +ECORE_CON_API ECORE_CON_API_WEAK const Efl_Class *ecore_con_eet_client_obj_class_get(void) EINA_CONST; #endif diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h index 8b71a69572..59e6845b6b 100644 --- a/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h +++ b/src/lib/ecore_con/ecore_con_eet_server_obj_eo.h @@ -19,6 +19,6 @@ typedef Eo Ecore_Con_Eet_Server_Obj; */ #define ECORE_CON_EET_SERVER_OBJ_CLASS ecore_con_eet_server_obj_class_get() -EWAPI const Efl_Class *ecore_con_eet_server_obj_class_get(void) EINA_CONST; +ECORE_CON_API ECORE_CON_API_WEAK const Efl_Class *ecore_con_eet_server_obj_class_get(void) EINA_CONST; #endif diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index e171d79078..04fe10edfe 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -151,22 +151,22 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Con_Event_Client_Upgrade, ecore_con_event_client #undef GENERIC_ALLOC_FREE_HEADER /* shared */ -EAPI int ECORE_CON_EVENT_SERVER_DEL = 0; -EAPI int ECORE_CON_EVENT_SERVER_ERROR = 0; +ECORE_CON_API int ECORE_CON_EVENT_SERVER_DEL = 0; +ECORE_CON_API int ECORE_CON_EVENT_SERVER_ERROR = 0; /* ecore_con_server_add() */ -EAPI int ECORE_CON_EVENT_CLIENT_ADD = 0; -EAPI int ECORE_CON_EVENT_CLIENT_DEL = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_ADD = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_DEL = 0; /* ecore_con_server_connect() */ -EAPI int ECORE_CON_EVENT_SERVER_ADD = 0; -EAPI int ECORE_CON_EVENT_SERVER_DATA = 0; -EAPI int ECORE_CON_EVENT_SERVER_WRITE = 0; -EAPI int ECORE_CON_EVENT_PROXY_BIND = 0; /* we're not supporting proxy bind, keep only for ABI */ -EAPI int ECORE_CON_EVENT_SERVER_UPGRADE = 0; +ECORE_CON_API int ECORE_CON_EVENT_SERVER_ADD = 0; +ECORE_CON_API int ECORE_CON_EVENT_SERVER_DATA = 0; +ECORE_CON_API int ECORE_CON_EVENT_SERVER_WRITE = 0; +ECORE_CON_API int ECORE_CON_EVENT_PROXY_BIND = 0; /* we're not supporting proxy bind, keep only for ABI */ +ECORE_CON_API int ECORE_CON_EVENT_SERVER_UPGRADE = 0; /* for each client from ECORE_CON_EVENT_CLIENT_ADD */ -EAPI int ECORE_CON_EVENT_CLIENT_DATA = 0; -EAPI int ECORE_CON_EVENT_CLIENT_WRITE = 0; -EAPI int ECORE_CON_EVENT_CLIENT_ERROR = 0; -EAPI int ECORE_CON_EVENT_CLIENT_UPGRADE = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_DATA = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_WRITE = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_ERROR = 0; +ECORE_CON_API int ECORE_CON_EVENT_CLIENT_UPGRADE = 0; static Eina_List *_servers = NULL; static Eina_List *_ecore_con_lookups = NULL; @@ -664,7 +664,7 @@ ecore_con_client_add(Ecore_Con_Server *svr, Eo *socket) return cl; } -EAPI int +ECORE_CON_API int ecore_con_client_send(Ecore_Con_Client *cl, const void *data, int size) { Eina_Error err; @@ -686,28 +686,28 @@ ecore_con_client_send(Ecore_Con_Client *cl, const void *data, int size) return slice.len; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_client_connected_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RETURN(cl, EINA_FALSE); return !efl_io_closer_closed_get(cl->socket); } -EAPI void +ECORE_CON_API void ecore_con_client_timeout_set(Ecore_Con_Client *cl, double timeout) { ECORE_CON_CLIENT_CHECK_RETURN(cl); efl_io_buffered_stream_timeout_inactivity_set(cl->socket, timeout); } -EAPI double +ECORE_CON_API double ecore_con_client_timeout_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RETURN(cl, -1.0); return efl_io_buffered_stream_timeout_inactivity_get(cl->socket); } -EAPI void * +ECORE_CON_API void * ecore_con_client_del(Ecore_Con_Client *cl) { const void *data; @@ -720,7 +720,7 @@ ecore_con_client_del(Ecore_Con_Client *cl) return (void *)data; } -EAPI void +ECORE_CON_API void ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data) { @@ -728,42 +728,42 @@ ecore_con_client_data_set(Ecore_Con_Client *cl, cl->data = data; } -EAPI void * +ECORE_CON_API void * ecore_con_client_data_get(Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, NULL); return (void *)cl->data; } -EAPI const char * +ECORE_CON_API const char * ecore_con_client_ip_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, NULL); return cl->ip; } -EAPI int +ECORE_CON_API int ecore_con_client_port_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, -1); return cl->port; } -EAPI Ecore_Con_Server * +ECORE_CON_API Ecore_Con_Server * ecore_con_client_server_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, NULL); return cl->svr; } -EAPI double +ECORE_CON_API double ecore_con_client_uptime_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RELAXED_RETURN(cl, 0.0); return ecore_time_get() - cl->start_time; } -EAPI void +ECORE_CON_API void ecore_con_client_flush(Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RETURN(cl); @@ -782,7 +782,7 @@ ecore_con_client_flush(Ecore_Con_Client *cl) efl_net_socket_tcp_cork_set(inner_socket, EINA_TRUE); } -EAPI int +ECORE_CON_API int ecore_con_client_fd_get(const Ecore_Con_Client *cl) { ECORE_CON_CLIENT_CHECK_RETURN(cl, SOCKET_TO_LOOP_FD(INVALID_SOCKET)); @@ -896,7 +896,7 @@ _ecore_con_server_job_schedule(Ecore_Con_Server *svr, Eo *loop, eina_future_then(efl_loop_job(loop), cb, svr, &svr->ssl.job); } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type compl_type) { Ecore_Con_Server *svr; @@ -1692,7 +1692,7 @@ _ecore_con_server_server_ssl_job(void *data, const Eina_Value v, * using ecore_con_server_add() */ -EAPI Ecore_Con_Server * +ECORE_CON_API Ecore_Con_Server * ecore_con_server_add(Ecore_Con_Type compl_type, const char *name, int port, @@ -2161,7 +2161,7 @@ _ecore_con_server_dialer_ssl_upgrade_job(void *data, const Eina_Value v, * example server using ecore_con_server_connect(). */ -EAPI Ecore_Con_Server * +ECORE_CON_API Ecore_Con_Server * ecore_con_server_connect(Ecore_Con_Type compl_type, const char *name, int port, @@ -2256,14 +2256,14 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, return NULL; } -EAPI const char * +ECORE_CON_API const char * ecore_con_server_name_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, NULL); return svr->name; } -EAPI void +ECORE_CON_API void ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit, char reject_excess_clients) @@ -2273,14 +2273,14 @@ ecore_con_server_client_limit_set(Ecore_Con_Server *svr, efl_net_server_clients_limit_set(svr->server, client_limit, reject_excess_clients); } -EAPI const Eina_List * +ECORE_CON_API const Eina_List * ecore_con_server_clients_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr, NULL); return svr->clients; } -EAPI void +ECORE_CON_API void ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout) { ECORE_CON_SERVER_CHECK_RETURN(svr); @@ -2291,14 +2291,14 @@ ecore_con_server_timeout_set(Ecore_Con_Server *svr, double timeout) efl_io_buffered_stream_timeout_inactivity_set(svr->dialer, timeout); } -EAPI double +ECORE_CON_API double ecore_con_server_timeout_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr, -1.0); return svr->timeout; } -EAPI void * +ECORE_CON_API void * ecore_con_server_del(Ecore_Con_Server *svr) { const void *data; @@ -2311,14 +2311,14 @@ ecore_con_server_del(Ecore_Con_Server *svr) return (void *)data; } -EAPI void * +ECORE_CON_API void * ecore_con_server_data_get(Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, NULL); return (void *)svr->data; } -EAPI void * +ECORE_CON_API void * ecore_con_server_data_set(Ecore_Con_Server *svr, void *data) { @@ -2330,7 +2330,7 @@ ecore_con_server_data_set(Ecore_Con_Server *svr, return (void *)old; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_server_connected_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr, EINA_FALSE); @@ -2343,14 +2343,14 @@ ecore_con_server_connected_get(const Ecore_Con_Server *svr) return EINA_TRUE; } -EAPI int +ECORE_CON_API int ecore_con_server_port_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, -1); return svr->port; } -EAPI int +ECORE_CON_API int ecore_con_server_send(Ecore_Con_Server *svr, const void *data, int size) { Eina_Error err; @@ -2394,21 +2394,21 @@ ecore_con_server_send(Ecore_Con_Server *svr, const void *data, int size) return slice.len; } -EAPI const char * +ECORE_CON_API const char * ecore_con_server_ip_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, NULL); return svr->ip; } -EAPI double +ECORE_CON_API double ecore_con_server_uptime_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RELAXED_RETURN(svr, 0.0); return ecore_time_get() - svr->start_time; } -EAPI void +ECORE_CON_API void ecore_con_server_flush(Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr); @@ -2431,7 +2431,7 @@ ecore_con_server_flush(Ecore_Con_Server *svr) efl_net_socket_tcp_cork_set(inner_dialer, EINA_TRUE); } -EAPI int +ECORE_CON_API int ecore_con_server_fd_get(const Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr, SOCKET_TO_LOOP_FD(INVALID_SOCKET)); @@ -2464,7 +2464,7 @@ ecore_con_server_fd_get(const Ecore_Con_Server *svr) return SOCKET_TO_LOOP_FD(INVALID_SOCKET); } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert) { ECORE_CON_SERVER_CHECK_RETURN(svr, EINA_FALSE); @@ -2479,7 +2479,7 @@ ecore_con_ssl_server_cert_add(Ecore_Con_Server *svr, const char *cert) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *privkey) { ECORE_CON_SERVER_CHECK_RETURN(svr, EINA_FALSE); @@ -2494,7 +2494,7 @@ ecore_con_ssl_server_privkey_add(Ecore_Con_Server *svr, const char *privkey) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl) { ECORE_CON_SERVER_CHECK_RETURN(svr, EINA_FALSE); @@ -2509,7 +2509,7 @@ ecore_con_ssl_server_crl_add(Ecore_Con_Server *svr, const char *crl) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *cafile) { ECORE_CON_SERVER_CHECK_RETURN(svr, EINA_FALSE); @@ -2524,7 +2524,7 @@ ecore_con_ssl_server_cafile_add(Ecore_Con_Server *svr, const char *cafile) return EINA_TRUE; } -EAPI void +ECORE_CON_API void ecore_con_ssl_server_verify(Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr); @@ -2544,7 +2544,7 @@ ecore_con_ssl_server_verify(Ecore_Con_Server *svr) svr->ssl.verify = EINA_TRUE; } -EAPI void +ECORE_CON_API void ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr); @@ -2565,7 +2565,7 @@ ecore_con_ssl_server_verify_basic(Ecore_Con_Server *svr) svr->ssl.verify_basic = EINA_TRUE; } -EAPI void +ECORE_CON_API void ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name) { ECORE_CON_SERVER_CHECK_RETURN(svr); @@ -2579,14 +2579,14 @@ ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *svr, const char *name) eina_stringshare_replace(&svr->ssl.verify_name, name); } -EAPI const char * +ECORE_CON_API const char * ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *svr) { ECORE_CON_SERVER_CHECK_RETURN(svr, NULL); return svr->ssl.verify_name ? svr->ssl.verify_name : svr->name; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_ssl_server_upgrade(Ecore_Con_Server *svr, Ecore_Con_Type compl_type) { double start; @@ -2674,7 +2674,7 @@ _ecore_con_lookup_done_cb(void *data, const char *host, const char *port EINA_UN * - doesn't return a handle to cancel (likely to access memory after free) * - doesn't report errors */ -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) { Ecore_Con_Lookup_Ctx *ctx; diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c index 993487880a..749589c602 100644 --- a/src/lib/ecore_con/ecore_con_local.c +++ b/src/lib/ecore_con/ecore_con_local.c @@ -27,7 +27,7 @@ #include "Ecore_Con.h" #include "ecore_con_private.h" -EAPI char * +ECORE_CON_API char * ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) { #if _WIN32 diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c index 6b68bf07fe..426b86f66a 100644 --- a/src/lib/ecore_con/ecore_con_local_win32.c +++ b/src/lib/ecore_con/ecore_con_local_win32.c @@ -361,7 +361,7 @@ _ecore_con_local_win32_listening(void *data) return 0; } -EAPI char * +ECORE_CON_API char * ecore_con_local_path_new(Eina_Bool is_system, const char *name, int port) { char buf[256]; diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c index 0068b33076..bc75a9bc1b 100644 --- a/src/lib/ecore_con/ecore_con_socks.c +++ b/src/lib/ecore_con/ecore_con_socks.c @@ -172,7 +172,7 @@ ecore_con_socks_init(void) * General Socks API. */ -EAPI Ecore_Con_Socks * +ECORE_CON_API Ecore_Con_Socks * ecore_con_socks4_remote_add(const char *ip, int port, const char *username) { Ecore_Con_Socks *ecs; @@ -201,7 +201,7 @@ ecore_con_socks4_remote_add(const char *ip, int port, const char *username) return ecs; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_socks4_remote_exists(const char *ip, int port, const char *username) { if ((!ip) || (!ip[0]) || (port < -1) || (port > 65535) || (username && (!username[0]))) @@ -209,7 +209,7 @@ ecore_con_socks4_remote_exists(const char *ip, int port, const char *username) return !!_ecore_con_socks_find(4, ip, port, username, username ? strlen(username) : 0, NULL, 0); } -EAPI void +ECORE_CON_API void ecore_con_socks4_remote_del(const char *ip, int port, const char *username) { Ecore_Con_Socks_v4 *v4; @@ -223,7 +223,7 @@ ecore_con_socks4_remote_del(const char *ip, int port, const char *username) _ecore_con_socks_free((Ecore_Con_Socks *)v4); } -EAPI Ecore_Con_Socks * +ECORE_CON_API Ecore_Con_Socks * ecore_con_socks5_remote_add(const char *ip, int port, const char *username, const char *password) { Ecore_Con_Socks_v5 *ecs5; @@ -260,7 +260,7 @@ ecore_con_socks5_remote_add(const char *ip, int port, const char *username, cons return (Ecore_Con_Socks *)ecs5; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, const char *password) { if ((!ip) || (!ip[0]) || (port < -1) || (port > 65535) || (username && (!username[0])) || (password && (!password[0]))) @@ -268,7 +268,7 @@ ecore_con_socks5_remote_exists(const char *ip, int port, const char *username, c return !!_ecore_con_socks_find(5, ip, port, username, username ? strlen(username) : 0, password, password ? strlen(password) : 0); } -EAPI void +ECORE_CON_API void ecore_con_socks5_remote_del(const char *ip, int port, const char *username, const char *password) { Ecore_Con_Socks_v5 *v5; @@ -283,21 +283,21 @@ ecore_con_socks5_remote_del(const char *ip, int port, const char *username, cons _ecore_con_socks_free((Ecore_Con_Socks *)v5); } -EAPI void +ECORE_CON_API void ecore_con_socks_lookup_set(Ecore_Con_Socks *ecs, Eina_Bool enable) { ECORE_CON_SOCKS_VERSION_CHECK(ecs); ecs->lookup = !!enable; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_socks_lookup_get(Ecore_Con_Socks *ecs) { ECORE_CON_SOCKS_VERSION_CHECK_RETURN(ecs, EINA_FALSE); return ecs->lookup; } -EAPI void +ECORE_CON_API void ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind) { EINA_SAFETY_ON_NULL_RETURN(ecs); @@ -305,7 +305,7 @@ ecore_con_socks_bind_set(Ecore_Con_Socks *ecs, Eina_Bool is_bind) ecs->bind = !!is_bind; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_socks_bind_get(Ecore_Con_Socks *ecs) { EINA_SAFETY_ON_NULL_RETURN_VAL(ecs, EINA_FALSE); @@ -313,7 +313,7 @@ ecore_con_socks_bind_get(Ecore_Con_Socks *ecs) return ecs->bind; } -EAPI unsigned int +ECORE_CON_API unsigned int ecore_con_socks_version_get(Ecore_Con_Socks *ecs) { EINA_SAFETY_ON_NULL_RETURN_VAL(ecs, 0); @@ -321,7 +321,7 @@ ecore_con_socks_version_get(Ecore_Con_Socks *ecs) return ecs->version; } -EAPI void +ECORE_CON_API void ecore_con_socks_remote_del(Ecore_Con_Socks *ecs) { EINA_SAFETY_ON_NULL_RETURN(ecs); @@ -331,13 +331,13 @@ ecore_con_socks_remote_del(Ecore_Con_Socks *ecs) _ecore_con_socks_free(ecs); } -EAPI void +ECORE_CON_API void ecore_con_socks_apply_once(Ecore_Con_Socks *ecs) { _ecore_con_proxy_once = ecs; } -EAPI void +ECORE_CON_API void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs) { _ecore_con_proxy_global = ecs; diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 1d8d0a5e47..4df3e71079 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -41,7 +41,7 @@ static Eina_List *_url_con_url_list = NULL; * @{ */ -EAPI int +ECORE_CON_API int ecore_con_url_init(void) { if (++_init_count > 1) return _init_count; @@ -64,7 +64,7 @@ ecore_con_url_init(void) return --_init_count; } -EAPI int +ECORE_CON_API int ecore_con_url_shutdown(void) { Ecore_Con_Url *url_con_url; @@ -84,7 +84,7 @@ ecore_con_url_shutdown(void) return 0; } -EAPI void +ECORE_CON_API void ecore_con_url_pipeline_set(Eina_Bool enable) { if (!_c_init()) return; @@ -93,7 +93,7 @@ ecore_con_url_pipeline_set(Eina_Bool enable) pipelining = enable; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_pipeline_get(void) { return pipelining; @@ -778,7 +778,7 @@ _ecore_con_url_request_prepare(Ecore_Con_Url *url_con, const char *method) return EINA_FALSE; } -EAPI Ecore_Con_Url * +ECORE_CON_API Ecore_Con_Url * ecore_con_url_new(const char *url) { Ecore_Con_Url *url_con; @@ -798,7 +798,7 @@ ecore_con_url_new(const char *url) return url_con; } -EAPI Ecore_Con_Url * +ECORE_CON_API Ecore_Con_Url * ecore_con_url_custom_new(const char *url, const char *custom_request) { @@ -815,7 +815,7 @@ ecore_con_url_custom_new(const char *url, return url_con; } -EAPI void +ECORE_CON_API void ecore_con_url_free(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con); @@ -826,14 +826,14 @@ ecore_con_url_free(Ecore_Con_Url *url_con) _ecore_con_url_free_internal(url_con); } -EAPI void * +ECORE_CON_API void * ecore_con_url_data_get(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con, NULL); return url_con->data; } -EAPI void +ECORE_CON_API void ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data) { @@ -841,7 +841,7 @@ ecore_con_url_data_set(Ecore_Con_Url *url_con, url_con->data = data; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url) { @@ -850,7 +850,7 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con, return EINA_TRUE; } -EAPI const char * +ECORE_CON_API const char * ecore_con_url_url_get(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con, NULL); @@ -858,7 +858,7 @@ ecore_con_url_url_get(Ecore_Con_Url *url_con) } /* LEGACY: HTTP requests */ -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_get(Ecore_Con_Url *url_con) { Eina_Error err; @@ -879,7 +879,7 @@ ecore_con_url_get(Ecore_Con_Url *url_con) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_head(Ecore_Con_Url *url_con) { Eina_Error err; @@ -900,7 +900,7 @@ ecore_con_url_head(Ecore_Con_Url *url_con) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_post(Ecore_Con_Url *url_con, const void *data, long length, @@ -963,7 +963,7 @@ ecore_con_url_post(Ecore_Con_Url *url_con, } /* LEGACY: headers */ -EAPI void +ECORE_CON_API void ecore_con_url_additional_header_add(Ecore_Con_Url *url_con, const char *key, const char *value) @@ -990,14 +990,14 @@ ecore_con_url_additional_header_add(Ecore_Con_Url *url_con, header); } -EAPI void +ECORE_CON_API void ecore_con_url_additional_headers_clear(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con); _ecore_con_url_request_headers_free(url_con); } -EAPI void +ECORE_CON_API void ecore_con_url_time(Ecore_Con_Url *url_con, Ecore_Con_Url_Time time_condition, double timestamp) @@ -1008,7 +1008,7 @@ ecore_con_url_time(Ecore_Con_Url *url_con, } /* LEGACY: cookies */ -EAPI void +ECORE_CON_API void ecore_con_url_cookies_init(Ecore_Con_Url *url_con) { CURL *curl_easy; @@ -1026,7 +1026,7 @@ ecore_con_url_cookies_init(Ecore_Con_Url *url_con) _c->curl_easy_setopt(curl_easy, CURLOPT_COOKIEFILE, ""); } -EAPI void +ECORE_CON_API void ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con, const char * const file_name) { @@ -1046,7 +1046,7 @@ ecore_con_url_cookies_file_add(Ecore_Con_Url *url_con, _c->curl_easy_setopt(curl_easy, CURLOPT_COOKIEFILE, file_name); } -EAPI void +ECORE_CON_API void ecore_con_url_cookies_clear(Ecore_Con_Url *url_con) { static const char cookielist_cmd_all[] = "ALL"; @@ -1067,7 +1067,7 @@ ecore_con_url_cookies_clear(Ecore_Con_Url *url_con) _c->curl_easy_setopt(curl_easy, CURLOPT_COOKIELIST, cookielist_cmd_all); } -EAPI void +ECORE_CON_API void ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con) { static const char cookielist_cmd_sess[] = "SESS"; @@ -1088,7 +1088,7 @@ ecore_con_url_cookies_session_clear(Ecore_Con_Url *url_con) _c->curl_easy_setopt(curl_easy, CURLOPT_COOKIELIST, cookielist_cmd_sess); } -EAPI void +ECORE_CON_API void ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con, Eina_Bool ignore) { @@ -1096,7 +1096,7 @@ ecore_con_url_cookies_ignore_old_session_set(Ecore_Con_Url *url_con, url_con->cookies.ignore_old_session = ignore; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con, const char * const cookiejar_file) { @@ -1117,7 +1117,7 @@ ecore_con_url_cookies_jar_file_set(Ecore_Con_Url *url_con, return EINA_TRUE; } -EAPI void +ECORE_CON_API void ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con) { CURL *curl_easy; @@ -1134,7 +1134,7 @@ ecore_con_url_cookies_jar_write(Ecore_Con_Url *url_con) } /* LEGACY: file upload/download */ -EAPI void +ECORE_CON_API void ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd) { ECORE_CON_URL_CHECK_RETURN(url_con); @@ -1145,7 +1145,7 @@ ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd) if (!url_con->dialer) return; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, const char *filename, const char *user, @@ -1211,7 +1211,7 @@ ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, return EINA_FALSE; } -EAPI void +ECORE_CON_API void ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, Eina_Bool use_epsv) { @@ -1219,7 +1219,7 @@ ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, url_con->ftp_use_epsv = use_epsv; } -EAPI void +ECORE_CON_API void ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_con, off_t max_speed) { CURL *curl_easy; @@ -1233,7 +1233,7 @@ ecore_con_url_limit_upload_speed(Ecore_Con_Url *url_con, off_t max_speed) _c->curl_easy_setopt(curl_easy, CURLOPT_MAX_SEND_SPEED_LARGE, max_speed); } -EAPI void +ECORE_CON_API void ecore_con_url_limit_download_speed(Ecore_Con_Url *url_con, off_t max_speed) { CURL *curl_easy; @@ -1248,7 +1248,7 @@ ecore_con_url_limit_download_speed(Ecore_Con_Url *url_con, off_t max_speed) } /* LEGACY: proxy */ -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password) { ECORE_CON_URL_CHECK_RETURN(url_con, EINA_FALSE); @@ -1257,7 +1257,7 @@ ecore_con_url_proxy_password_set(Ecore_Con_Url *url_con, const char *password) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username) { ECORE_CON_URL_CHECK_RETURN(url_con, EINA_FALSE); @@ -1266,7 +1266,7 @@ ecore_con_url_proxy_username_set(Ecore_Con_Url *url_con, const char *username) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy_url) { ECORE_CON_URL_CHECK_RETURN(url_con, EINA_FALSE); @@ -1275,14 +1275,14 @@ ecore_con_url_proxy_set(Ecore_Con_Url *url_con, const char *proxy_url) } /* LEGACY: response */ -EAPI int +ECORE_CON_API int ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con, EINA_FALSE); return url_con->received_bytes; } -EAPI int +ECORE_CON_API int ecore_con_url_status_code_get(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con, 0); @@ -1290,7 +1290,7 @@ ecore_con_url_status_code_get(Ecore_Con_Url *url_con) return efl_net_dialer_http_response_status_get(url_con->dialer); } -EAPI const Eina_List * +ECORE_CON_API const Eina_List * ecore_con_url_response_headers_get(Ecore_Con_Url *url_con) { ECORE_CON_URL_CHECK_RETURN(url_con, NULL); @@ -1298,7 +1298,7 @@ ecore_con_url_response_headers_get(Ecore_Con_Url *url_con) } /* LEGACY: SSL */ -EAPI int +ECORE_CON_API int ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con, const char *ca_path) { @@ -1308,7 +1308,7 @@ ecore_con_url_ssl_ca_set(Ecore_Con_Url *url_con, return 0; } -EAPI void +ECORE_CON_API void ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con, Eina_Bool verify) { @@ -1317,7 +1317,7 @@ ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con, } /* LEGACY: misc */ -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_httpauth_set(Ecore_Con_Url *url_con, const char *username, const char *password, @@ -1334,7 +1334,7 @@ ecore_con_url_httpauth_set(Ecore_Con_Url *url_con, return EINA_TRUE; } -EAPI Eina_Bool +ECORE_CON_API Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version) { ECORE_CON_URL_CHECK_RETURN(url_con, EINA_FALSE); @@ -1375,7 +1375,7 @@ _ecore_con_url_timeout_cb(void *data) return EINA_FALSE; } -EAPI void +ECORE_CON_API void ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout) { ECORE_CON_URL_CHECK_RETURN(url_con); @@ -1393,7 +1393,7 @@ ecore_con_url_timeout_set(Ecore_Con_Url *url_con, double timeout) url_con->timer = ecore_timer_add(timeout, _ecore_con_url_timeout_cb, url_con); } -EAPI void +ECORE_CON_API void ecore_con_url_verbose_set(Ecore_Con_Url *url_con, Eina_Bool verbose) { diff --git a/src/lib/ecore_con/ecore_con_url_curl.c b/src/lib/ecore_con/ecore_con_url_curl.c index f4fe730cdd..1cd6a10a98 100644 --- a/src/lib/ecore_con/ecore_con_url_curl.c +++ b/src/lib/ecore_con/ecore_con_url_curl.c @@ -22,57 +22,57 @@ Ecore_Con_Curl *_c = NULL; Eina_Bool _c_fail = EINA_FALSE; double _c_timeout = 0.0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2 = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED = 0; -EWAPI Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_BAD_CONTENT_ENCODING = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_BAD_DOWNLOAD_RESUME = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_BAD_FUNCTION_ARGUMENT = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_CHUNK_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_CONV_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_CONV_REQD = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_FAILED_INIT = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_FILE_COULDNT_READ_FILE = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_FILESIZE_EXCEEDED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_FUNCTION_NOT_FOUND = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_GOT_NOTHING = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_HTTP2 = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_HTTP2_STREAM = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_HTTP_POST_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_HTTP_RETURNED_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_INTERFACE_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_LOGIN_DENIED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_NO_CONNECTION_AVAILABLE = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_NOT_BUILT_IN = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_OPERATION_TIMEDOUT = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_PARTIAL_FILE = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_PEER_FAILED_VERIFICATION = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_RANGE_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_READ_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_RECV_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_REMOTE_ACCESS_DENIED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_REMOTE_DISK_FULL = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_EXISTS = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_REMOTE_FILE_NOT_FOUND = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SEND_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SEND_FAIL_REWIND = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CACERT_BADFILE = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CERTPROBLEM = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CIPHER = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CONNECT_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_CRL_BADFILE = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_INITFAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_NOTFOUND = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_ENGINE_SETFAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_INVALIDCERTSTATUS = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_ISSUER_ERROR = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_PINNEDPUBKEYNOTMATCH = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_SSL_SHUTDOWN_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_TOO_MANY_REDIRECTS = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_UNKNOWN_OPTION = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_UNSUPPORTED_PROTOCOL = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_UPLOAD_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_URL_MALFORMAT = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_USE_SSL_FAILED = 0; +ECORE_CON_API ECORE_CON_API_WEAK Eina_Error EFL_NET_HTTP_ERROR_WRITE_ERROR = 0; Eina_Error _curlcode_to_eina_error(const CURLcode code) diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build index bf288053ad..07539f1540 100644 --- a/src/lib/ecore_con/meson.build +++ b/src/lib/ecore_con/meson.build @@ -70,6 +70,7 @@ foreach eo_file : pub_eo_files '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'ECORE_CON_API', '-gchd', '@INPUT@']) endforeach @@ -91,6 +92,7 @@ foreach eo_file : pub_eo_types_files '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'ECORE_CON_API', '-gchd', '@INPUT@']) endforeach @@ -187,7 +189,7 @@ ecore_con_lib = library('ecore_con', dependencies: [ecore_con_deps, ecore_con_ext_deps, ecore_con_pub_deps], include_directories : config_dir, install: true, - c_args : package_c_args, + c_args : [package_c_args, '-DECORE_CON_BUILD'], version : meson.project_version() )