From 033259cdffe50f263c3082572c399e9d8933d34e Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Mon, 29 Jan 2018 22:08:40 +0900 Subject: [PATCH] elm: quick fix to solve build break There is a build break on application side if the application does not define EFL_EO_API_SUPPORT. Change-Id: If39a0ea152c922362cc8c766889dbc2748a15af5 --- src/lib/elementary/efl_access.h | 16 +++++++++------- src/lib/elementary/efl_access_legacy.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/efl_access.h b/src/lib/elementary/efl_access.h index 3d729a0..4cfc132 100644 --- a/src/lib/elementary/efl_access.h +++ b/src/lib/elementary/efl_access.h @@ -11,22 +11,24 @@ */ typedef char *(*Efl_Access_Reading_Info_Cb)(void *data, Evas_Object *obj); // -//TIZEN_ONLY(20170405) Add gesture method to accessible interface -//FIXME: Efl_Access_Gesture_Cb is dependant on Efl_Access_Gesture_Info and Efl_Access_Gesture_Info is defined in -//efl_access.eo.h -typedef struct _Efl_Access_Gesture_Info Efl_Access_Gesture_Info; -typedef Eina_Bool (*Efl_Access_Gesture_Cb)(void *data, Efl_Access_Gesture_Info gesture_info, Evas_Object *obj); -// //TIZEN_ONLY(20170406) Add Elm_Atspi_Reading_Info_Type_Mask typedef unsigned int Efl_Access_Reading_Info_Type_Mask; // +//TIZEN_ONLY(20170405) Add gesture method to accessible interface +typedef struct _Efl_Access_Gesture_Info Efl_Access_Gesture_Info; +typedef Eina_Bool (*Efl_Access_Gesture_Cb)(void *data, Efl_Access_Gesture_Info gesture_info, Evas_Object *obj); +#define TIZEN_ONLY +#include "efl_access_legacy.h" +// #ifdef EFL_EO_API_SUPPORT #include "efl_access.eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT -#include "efl_access_legacy.h" +#ifndef TIZEN_ONLY +#include "efl_access.eo.legacy.h" +#endif #endif // TIZEN_ONLY(20171114): atspi: expose highlight information on atspi diff --git a/src/lib/elementary/efl_access_legacy.h b/src/lib/elementary/efl_access_legacy.h index cd6246c..144e8ae 100644 --- a/src/lib/elementary/efl_access_legacy.h +++ b/src/lib/elementary/efl_access_legacy.h @@ -3,6 +3,7 @@ * @ingroup elm_accessibility_group * @{ */ +#include "efl_access.eo.legacy.h" typedef Eo Elm_Interface_Atspi_Accessible; @@ -868,7 +869,6 @@ EAPI void elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *se * @endif */ EAPI void elm_atspi_attributes_list_free(Eina_List *list); -#include "efl_access.eo.legacy.h" /** * @} -- 2.7.4