Evas_Object_Box compilation. Thanks to devilhorns and onefang

Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com>
SVN revision: 77610

diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index 9adc728..3d3139d 100644 (file)
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -12544,8 +12544,8 @@ enum
 #define evas_obj_box_accessor_new(accessor) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_ACCESSOR_NEW), EO_TYPECHECK(Eina_Accessor **, accessor)
 #define evas_obj_box_option_property_name_get(property, name) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_NAME_GET), EO_TYPECHECK(int, property), EO_TYPECHECK(const char **, name)
 #define evas_obj_box_option_property_id_get(name, id) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_ID_GET), EO_TYPECHECK(const char *, name), EO_TYPECHECK(int *, id)
-#define evas_obj_box_option_property_vset(opt, property, args, ret) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_VSET), EO_TYPECHECK(Evas_Object_Box_Option *, opt), EO_TYPECHECK(int, property), EO_TYPECHECK(va_list, args), EO_TYPECHECK(Eina_Bool *, ret)
-#define evas_obj_box_option_property_vget(opt, property, args, ret) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_VGET), EO_TYPECHECK(Evas_Object_Box_Option *, opt), EO_TYPECHECK(int, property), EO_TYPECHECK(va_list, args), EO_TYPECHECK(Eina_Bool *, ret)
+#define evas_obj_box_option_property_vset(opt, property, args, ret) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_VSET), EO_TYPECHECK(Evas_Object_Box_Option *, opt), EO_TYPECHECK(int, property), EO_TYPECHECK(va_list *, args), EO_TYPECHECK(Eina_Bool *, ret)
+#define evas_obj_box_option_property_vget(opt, property, args, ret) EVAS_OBJ_BOX_ID(EVAS_OBJ_BOX_SUB_ID_OPTION_PROPERTY_VGET), EO_TYPECHECK(Evas_Object_Box_Option *, opt), EO_TYPECHECK(int, property), EO_TYPECHECK(va_list *, args), EO_TYPECHECK(Eina_Bool *, ret)
 
 /**
  * Set the default box @a api struct (Evas_Object_Box_Api)

diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c
index d2ab6e5..b486935 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/legacy/evas/src/lib/canvas/evas_object_box.c
@@ -2231,7 +2231,7 @@ EAPI Eina_Bool
 evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do(o, evas_obj_box_option_property_vset(opt, property, args, &ret));
+   eo_do(o, evas_obj_box_option_property_vset(opt, property, &args, &ret));
    return ret;
 }
 
@@ -2240,7 +2240,7 @@ _box_option_property_vset(Eo *o EINA_UNUSED, void *_pd EINA_UNUSED, va_list *lis
 {
    va_arg(*list, Evas_Object_Box_Option *);
    va_arg(*list, int);
-   va_arg(*list, va_list);
+   va_arg(*list, va_list *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
 }
@@ -2262,7 +2262,7 @@ EAPI Eina_Bool
 evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *)o, evas_obj_box_option_property_vget(opt, property, args, &ret));
+   eo_do((Eo *)o, evas_obj_box_option_property_vget(opt, property, &args, &ret));
    return ret;
 }
 
@@ -2271,7 +2271,7 @@ _box_option_property_vget(Eo *o EINA_UNUSED, void *_pd EINA_UNUSED, va_list *lis
 {
    va_arg(*list, Evas_Object_Box_Option *);
    va_arg(*list, int);
-   va_arg(*list, va_list);
+   va_arg(*list, va_list *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    *ret = EINA_FALSE;
 }