diff options
author | Sebastian Dransfeld <sd@tango.flipp.net> | 2012-10-09 11:34:16 +0000 |
---|---|---|
committer | Sebastian Dransfeld <sd@tango.flipp.net> | 2012-10-09 11:34:16 +0000 |
commit | 616e6b4a6acc61200de59c07a8a2f2784c6c8436 (patch) | |
tree | 55b5b45e8da36a2b4254cafe3b16298c12e49f67 /src | |
parent | 2d2b04a7356a8819df7a5743e9369f0f5a67e72f (diff) |
efl: patch from eobj
port r77631
fix eo on 64bit.. bad valist fun
SVN revision: 77637
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/eo/eo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index b2d8b82886..9944f69ed8 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c | |||
@@ -386,7 +386,7 @@ _eo_op_internal(Eo *obj, Eo_Op_Type op_type, Eo_Op op, va_list *p_list) | |||
386 | } | 386 | } |
387 | 387 | ||
388 | static inline Eina_Bool | 388 | static inline Eina_Bool |
389 | _eo_dov_internal(Eo *obj, Eo_Op_Type op_type, va_list p_list) | 389 | _eo_dov_internal(Eo *obj, Eo_Op_Type op_type, va_list *p_list) |
390 | { | 390 | { |
391 | Eina_Bool prev_error; | 391 | Eina_Bool prev_error; |
392 | Eina_Bool ret = EINA_TRUE; | 392 | Eina_Bool ret = EINA_TRUE; |
@@ -396,18 +396,18 @@ _eo_dov_internal(Eo *obj, Eo_Op_Type op_type, va_list p_list) | |||
396 | prev_error = obj->do_error; | 396 | prev_error = obj->do_error; |
397 | _eo_ref(obj); | 397 | _eo_ref(obj); |
398 | 398 | ||
399 | op = va_arg(p_list, Eo_Op); | 399 | op = va_arg(*p_list, Eo_Op); |
400 | while (op) | 400 | while (op) |
401 | { | 401 | { |
402 | _eo_kls_itr_init(obj->klass, &obj->mro_itr, &prev_state); | 402 | _eo_kls_itr_init(obj->klass, &obj->mro_itr, &prev_state); |
403 | if (!_eo_op_internal(obj, op_type, op, &p_list)) | 403 | if (!_eo_op_internal(obj, op_type, op, p_list)) |
404 | { | 404 | { |
405 | _EO_OP_ERR_NO_OP_PRINT(op, obj->klass); | 405 | _EO_OP_ERR_NO_OP_PRINT(op, obj->klass); |
406 | ret = EINA_FALSE; | 406 | ret = EINA_FALSE; |
407 | _eo_kls_itr_end(&obj->mro_itr, &prev_state); | 407 | _eo_kls_itr_end(&obj->mro_itr, &prev_state); |
408 | break; | 408 | break; |
409 | } | 409 | } |
410 | op = va_arg(p_list, Eo_Op); | 410 | op = va_arg(*p_list, Eo_Op); |
411 | _eo_kls_itr_end(&obj->mro_itr, &prev_state); | 411 | _eo_kls_itr_end(&obj->mro_itr, &prev_state); |
412 | } | 412 | } |
413 | 413 | ||
@@ -431,7 +431,7 @@ eo_do_internal(Eo *obj, Eo_Op_Type op_type, ...) | |||
431 | 431 | ||
432 | va_start(p_list, op_type); | 432 | va_start(p_list, op_type); |
433 | 433 | ||
434 | ret = _eo_dov_internal(obj, op_type, p_list); | 434 | ret = _eo_dov_internal(obj, op_type, &p_list); |
435 | 435 | ||
436 | va_end(p_list); | 436 | va_end(p_list); |
437 | 437 | ||
@@ -1142,7 +1142,7 @@ eo_add_internal(const Eo_Class *klass, Eo *parent, ...) | |||
1142 | { | 1142 | { |
1143 | va_list p_list; | 1143 | va_list p_list; |
1144 | va_start(p_list, parent); | 1144 | va_start(p_list, parent); |
1145 | do_err = !_eo_dov_internal(obj, EO_OP_TYPE_REGULAR, p_list); | 1145 | do_err = !_eo_dov_internal(obj, EO_OP_TYPE_REGULAR, &p_list); |
1146 | va_end(p_list); | 1146 | va_end(p_list); |
1147 | } | 1147 | } |
1148 | 1148 | ||