From: Cedric Bail <cedric@osg.samsung.com>
Date: Fri, 22 Apr 2016 21:15:04 +0000 (-0700)
Subject: elementary: fix callback array declaration to build on Windows.
X-Git-Tag: upstream/1.20.0~6644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1aaeaf2b3b4a08480694475217883855f298ab89;p=platform%2Fupstream%2Fefl.git

elementary: fix callback array declaration to build on Windows.
---

diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index f0af2ff..e0cec74 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -66,10 +66,8 @@ struct _Custom_Table_Data
    Efl_Ui_Grid_Data *gd;
 };
 
-static const Eo_Callback_Array_Item subobj_callbacks [] = {
-   { EO_BASE_EVENT_DEL, _subobj_del_cb },
-   { NULL, NULL }
-};
+EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
+                          { EO_BASE_EVENT_DEL, _subobj_del_cb });
 
 static inline Eina_Bool
 _horiz(Efl_Orient dir)
@@ -400,7 +398,7 @@ _subobj_del_cb(void *data, const Eo_Event *event)
    Efl_Ui_Grid *obj = data;
    Efl_Ui_Grid_Data *pd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
 
-   eo_event_callback_array_del(event->obj, subobj_callbacks, data);
+   eo_event_callback_array_del(event->obj, subobj_callbacks(), data);
    _item_remove(obj, pd, event->obj);
 
    if (!elm_widget_sub_object_del(obj, event->obj))
@@ -467,7 +465,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj,
         eo_key_data_set(subobj, GRID_ITEM_KEY, gi);
         elm_widget_sub_object_add(obj, subobj);
         eo_event_callback_call(obj, EFL_PACK_EVENT_CONTENT_ADDED, subobj);
-        eo_event_callback_array_add(subobj, subobj_callbacks, obj);
+        eo_event_callback_array_add(subobj, subobj_callbacks(), obj);
      }
 
    evas_object_table_pack(wd->resize_obj, subobj, col, row, colspan, rowspan);