jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=23dac2c86fd78d37d5057856e905922482875571
commit 23dac2c86fd78d37d5057856e905922482875571 Author: Jérémy Zurcher <[email protected]> Date: Fri Aug 22 10:20:22 2014 +0200 Elm_App: protect against type redefinition --- src/lib/elm_app_client_eo.h | 3 +++ src/lib/elm_app_server_eo.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/lib/elm_app_client_eo.h b/src/lib/elm_app_client_eo.h index 2163263..dac06cd 100644 --- a/src/lib/elm_app_client_eo.h +++ b/src/lib/elm_app_client_eo.h @@ -1,5 +1,8 @@ typedef Eo Elm_App_Client; +#define _ELM_APP_CLIENT_EO_CLASS_TYPE + typedef Eo Elm_App_Client_View; +#define _ELM_APP_CLIENT_VIEW_EO_CLASS_TYPE typedef Eldbus_Pending Elm_App_Client_Pending; diff --git a/src/lib/elm_app_server_eo.h b/src/lib/elm_app_server_eo.h index 1d02213..306535d 100644 --- a/src/lib/elm_app_server_eo.h +++ b/src/lib/elm_app_server_eo.h @@ -5,7 +5,10 @@ #define ELM_APP_SERVER_VIEW_CREATE_DUPLICATE "org.enlightenment.Application.ViewDuplicate" typedef Eo Elm_App_Server; +#define _ELM_APP_SERVER_EO_CLASS_TYPE + typedef Eo Elm_App_Server_View; +#define _ELM_APP_SERVER_VIEW_EO_CLASS_TYPE typedef Elm_App_Server_View *(*Elm_App_Server_Create_View_Cb)(Elm_App_Server *app, const Eina_Value *args, Eina_Stringshare **error_name, Eina_Stringshare **error_message); --
