diff options
| author | Yakov Goldberg <yakov.g@samsung.com> | 2014-02-16 11:50:13 +0200 |
|---|---|---|
| committer | Yakov Goldberg <yakov.g@samsung.com> | 2014-02-16 13:06:14 +0200 |
| commit | f7808f1f22f1d149d61e2f5b086006e943a68b61 (patch) | |
| tree | c550317d41d29fd6c00aa0e889a93903fad5392f | |
| parent | 16c43796a6e888b858233e393c4b65c0ee6779a0 (diff) | |
| download | efl-f7808f1f22f1d149d61e2f5b086006e943a68b61.tar.gz | |
ecore timer: change name of Eo constructor, to avoid clash in Eolian
| -rw-r--r-- | src/lib/ecore/Ecore_Eo.h | 4 | ||||
| -rw-r--r-- | src/lib/ecore/ecore_timer.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index 2a8fe41d94..c490457067 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h @@ -128,7 +128,7 @@ extern EAPI Eo_Op ECORE_TIMER_BASE_ID; enum { - ECORE_TIMER_SUB_ID_CONSTRUCTOR, + ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR, ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, ECORE_TIMER_SUB_ID_INTERVAL_SET, ECORE_TIMER_SUB_ID_INTERVAL_GET, @@ -151,7 +151,7 @@ enum * @param[in] data * */ -#define ecore_timer_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data) +#define ecore_timer_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data) /** * @def ecore_timer_loop_constructor diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index e6e488c67a..c770c14cbb 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -1002,7 +1002,7 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), - EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), _timer_constructor), + EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), _timer_constructor), EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), _timer_loop_constructor), EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), _timer_interval_set), EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), _timer_interval_get), @@ -1021,7 +1021,7 @@ _class_constructor(Eo_Class *klass) } static const Eo_Op_Description op_desc[] = { - EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."), + EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."), EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."), EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval the timer ticks of."), EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the timer ticks on."), |