From 6d8ceab4be416f2d1f5e002af05a0377832a6923 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Fri, 27 Oct 2017 18:48:16 -0700 Subject: [PATCH] ecore_con: add an Efl_Net.h --- src/Makefile_Ecore_Con.am | 2 +- src/lib/ecore_con/Ecore_Con.h | 10 +-- src/lib/ecore_con/Ecore_Con_Eo.h | 52 ------------ src/lib/ecore_con/Efl_Net.h | 141 +++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 58 deletions(-) delete mode 100644 src/lib/ecore_con/Ecore_Con_Eo.h create mode 100644 src/lib/ecore_con/Efl_Net.h diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index b1047c8e85..f8d35d2636 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -74,7 +74,7 @@ lib_LTLIBRARIES += lib/ecore_con/libecore_con.la installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@ dist_installed_ecoreconmainheaders_DATA = \ lib/ecore_con/Ecore_Con.h \ -lib/ecore_con/Ecore_Con_Eo.h \ +lib/ecore_con/Efl_Net.h \ lib/ecore_con/Ecore_Con_Eet.h \ lib/ecore_con/Ecore_Con_Eet_Legacy.h \ lib/ecore_con/Ecore_Con_Eet_Eo.h diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 7ae1427622..5f04e4c39e 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h @@ -11,6 +11,10 @@ #include #include +#ifdef EFL_BETA_API_SUPPORT +#include "Efl_Net.h" +#endif + #ifdef EAPI # undef EAPI #endif @@ -299,10 +303,6 @@ typedef void (*Ecore_Con_Dns_Cb)(const char *canonname, /** @} */ -#ifdef EFL_BETA_API_SUPPORT -#include "Ecore_Con_Eo.h" -#endif - /** * @struct _Ecore_Con_Server * Used to provide legacy ABI/ABI compatibility with non-Eo applications. @@ -1778,7 +1778,7 @@ typedef enum _Ecore_Con_Url_Http_Version * @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); - + /** * @brief Initializes the Ecore_Con_Url library. * @return Number of times the library has been initialised without being diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h deleted file mode 100644 index 5958430cbd..0000000000 --- a/src/lib/ecore_con/Ecore_Con_Eo.h +++ /dev/null @@ -1,52 +0,0 @@ -#include "efl_net_types.eot.h" - -#include "efl_net_ip_address.eo.h" - -#include "efl_net_socket.eo.h" -#include "efl_net_dialer.eo.h" -#include "efl_net_server.eo.h" - -#include "efl_net_socket_simple.eo.h" -#include "efl_net_dialer_simple.eo.h" -#include "efl_net_server_simple.eo.h" - -#include "efl_net_socket_fd.eo.h" -#include "efl_net_server_fd.eo.h" - -#include "efl_net_server_ip.eo.h" - -#include "efl_net_socket_tcp.eo.h" -#include "efl_net_dialer_tcp.eo.h" -#include "efl_net_server_tcp.eo.h" - -#ifdef _WIN32 -#include "efl_net_socket_windows.eo.h" -#include "efl_net_dialer_windows.eo.h" -#include "efl_net_server_windows.eo.h" -#else -#include "efl_net_socket_unix.eo.h" -#include "efl_net_dialer_unix.eo.h" -#include "efl_net_server_unix.eo.h" -#endif - -#include "efl_net_socket_udp.eo.h" -#include "efl_net_dialer_udp.eo.h" -#include "efl_net_server_udp.eo.h" -#include "efl_net_server_udp_client.eo.h" - -#include "efl_net_http_types.eot.h" - -#include "efl_net_dialer_http.eo.h" -#include "efl_net_dialer_websocket.eo.h" - -#include "efl_net_ssl_types.eot.h" - -#include "efl_net_ssl_context.eo.h" -#include "efl_net_socket_ssl.eo.h" -#include "efl_net_dialer_ssl.eo.h" -#include "efl_net_server_ssl.eo.h" - -#include "efl_net_control_technology.eo.h" -#include "efl_net_control_access_point.eo.h" -#include "efl_net_control.eo.h" -#include "efl_net_session.eo.h" diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h new file mode 100644 index 0000000000..f98ff29ed4 --- /dev/null +++ b/src/lib/ecore_con/Efl_Net.h @@ -0,0 +1,141 @@ +#ifndef _EFL_NET_H +#define _EFL_NET_H + +#include +#include +#ifdef _WIN32 +# include +#else +# include +#endif +#include + +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_ECORE_CON_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 + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Initializes the Ecore_Con library. + * @return Number of times the library has been initialised without being + * shut down. + * + * @note This function already calls ecore_init() internally, so you don't need + * to call it explicitly. + */ +EAPI int ecore_con_init(void); + +/** + * @brief Shuts down the Ecore_Con library. + * @return Number of times the library has been initialised without being + * shut down. + * @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); + +/** + * @brief Initializes the Ecore_Con_Url library. + * @return Number of times the library has been initialised without being + * shut down. + * + * @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); + +/** + * @brief Shuts down the Ecore_Con_Url library. + * @return Number of calls that still uses Ecore_Con_Url + * + * @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); + +#include "efl_net_types.eot.h" + +#include "efl_net_ip_address.eo.h" + +#include "efl_net_socket.eo.h" +#include "efl_net_dialer.eo.h" +#include "efl_net_server.eo.h" + +#include "efl_net_socket_simple.eo.h" +#include "efl_net_dialer_simple.eo.h" +#include "efl_net_server_simple.eo.h" + +#include "efl_net_socket_fd.eo.h" +#include "efl_net_server_fd.eo.h" + +#include "efl_net_server_ip.eo.h" + +#include "efl_net_socket_tcp.eo.h" +#include "efl_net_dialer_tcp.eo.h" +#include "efl_net_server_tcp.eo.h" + +#ifdef _WIN32 +#include "efl_net_socket_windows.eo.h" +#include "efl_net_dialer_windows.eo.h" +#include "efl_net_server_windows.eo.h" +#else +#include "efl_net_socket_unix.eo.h" +#include "efl_net_dialer_unix.eo.h" +#include "efl_net_server_unix.eo.h" +#endif + +#include "efl_net_socket_udp.eo.h" +#include "efl_net_dialer_udp.eo.h" +#include "efl_net_server_udp.eo.h" +#include "efl_net_server_udp_client.eo.h" + +#include "efl_net_http_types.eot.h" + +#include "efl_net_dialer_http.eo.h" +#include "efl_net_dialer_websocket.eo.h" + +#include "efl_net_ssl_types.eot.h" + +#include "efl_net_ssl_context.eo.h" +#include "efl_net_socket_ssl.eo.h" +#include "efl_net_dialer_ssl.eo.h" +#include "efl_net_server_ssl.eo.h" + +#include "efl_net_control_technology.eo.h" +#include "efl_net_control_access_point.eo.h" +#include "efl_net_control.eo.h" +#include "efl_net_session.eo.h" + +#ifdef __cplusplus +} +#endif + +#undef EAPI +#define EAPI + +#endif