summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-02-16 11:50:13 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-02-16 13:06:14 +0200
commitf7808f1f22f1d149d61e2f5b086006e943a68b61 (patch)
treec550317d41d29fd6c00aa0e889a93903fad5392f
parent16c43796a6e888b858233e393c4b65c0ee6779a0 (diff)
ecore timer: change name of Eo constructor, to avoid clash in Eolian
-rw-r--r--src/lib/ecore/Ecore_Eo.h4
-rw-r--r--src/lib/ecore/ecore_timer.c4
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;
128 128
129enum 129enum
130{ 130{
131 ECORE_TIMER_SUB_ID_CONSTRUCTOR, 131 ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR,
132 ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, 132 ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
133 ECORE_TIMER_SUB_ID_INTERVAL_SET, 133 ECORE_TIMER_SUB_ID_INTERVAL_SET,
134 ECORE_TIMER_SUB_ID_INTERVAL_GET, 134 ECORE_TIMER_SUB_ID_INTERVAL_GET,
@@ -151,7 +151,7 @@ enum
151 * @param[in] data 151 * @param[in] data
152 * 152 *
153 */ 153 */
154#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) 154#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)
155 155
156/** 156/**
157 * @def ecore_timer_loop_constructor 157 * @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)
1002 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 1002 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
1003 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), 1003 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
1004 1004
1005 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), _timer_constructor), 1005 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), _timer_constructor),
1006 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), _timer_loop_constructor), 1006 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), _timer_loop_constructor),
1007 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), _timer_interval_set), 1007 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), _timer_interval_set),
1008 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), _timer_interval_get), 1008 EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), _timer_interval_get),
@@ -1021,7 +1021,7 @@ _class_constructor(Eo_Class *klass)
1021} 1021}
1022 1022
1023static const Eo_Op_Description op_desc[] = { 1023static const Eo_Op_Description op_desc[] = {
1024 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."), 1024 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."),
1025 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."), 1025 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."),
1026 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval the timer ticks of."), 1026 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval the timer ticks of."),
1027 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the timer ticks on."), 1027 EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the timer ticks on."),