diff --git a/legacy/edje/src/lib/edje_convert.c b/legacy/edje/src/lib/edje_convert.c index dbc5d4c7a5..56774d63b8 100644 --- a/legacy/edje/src/lib/edje_convert.c +++ b/legacy/edje/src/lib/edje_convert.c @@ -281,19 +281,19 @@ _edje_collection_convert(Edje_File *file, Old_Edje_Part_Collection *oedc) } ce->count.part = eina_list_count(oedc->parts); -#define EMN(Tp, Sz, Ce) \ +#define CONVERT_EMN(Tp, Sz, Ce) \ Ce->mp.Tp = eina_mempool_add("one_big", #Tp, NULL, sizeof (Sz), Ce->count.Tp); - EMN(RECTANGLE, Edje_Part_Description_Common, ce); - EMN(TEXT, Edje_Part_Description_Text, ce); - EMN(IMAGE, Edje_Part_Description_Image, ce); - EMN(SWALLOW, Edje_Part_Description_Common, ce); - EMN(TEXTBLOCK, Edje_Part_Description_Text, ce); - EMN(GROUP, Edje_Part_Description_Common, ce); - EMN(BOX, Edje_Part_Description_Box, ce); - EMN(TABLE, Edje_Part_Description_Table, ce); - EMN(EXTERNAL, Edje_Part_Description_External, ce); - EMN(part, Edje_Part, ce); + CONVERT_EMN(RECTANGLE, Edje_Part_Description_Common, ce); + CONVERT_EMN(TEXT, Edje_Part_Description_Text, ce); + CONVERT_EMN(IMAGE, Edje_Part_Description_Image, ce); + CONVERT_EMN(SWALLOW, Edje_Part_Description_Common, ce); + CONVERT_EMN(TEXTBLOCK, Edje_Part_Description_Text, ce); + CONVERT_EMN(GROUP, Edje_Part_Description_Common, ce); + CONVERT_EMN(BOX, Edje_Part_Description_Box, ce); + CONVERT_EMN(TABLE, Edje_Part_Description_Table, ce); + CONVERT_EMN(EXTERNAL, Edje_Part_Description_External, ce); + CONVERT_EMN(part, Edje_Part, ce); /* Change structure layout */ edc = calloc(1, sizeof (Edje_Part_Collection)); diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index aa085b1d5f..8379f899dc 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -917,19 +917,19 @@ edje_edit_group_add(Evas_Object *obj, const char *name) //cd = _alloc(sizeof(Code)); //codes = eina_list_append(codes, cd); -#define EMN(Tp, Sz, Ce) \ +#define EDIT_EMN(Tp, Sz, Ce) \ Ce->mp.Tp = eina_mempool_add("chained_mempool", #Tp, NULL, sizeof (Sz), 10); - EMN(RECTANGLE, Edje_Part_Description_Common, de); - EMN(TEXT, Edje_Part_Description_Text, de); - EMN(IMAGE, Edje_Part_Description_Image, de); - EMN(SWALLOW, Edje_Part_Description_Common, de); - EMN(TEXTBLOCK, Edje_Part_Description_Text, de); - EMN(GROUP, Edje_Part_Description_Common, de); - EMN(BOX, Edje_Part_Description_Box, de); - EMN(TABLE, Edje_Part_Description_Table, de); - EMN(EXTERNAL, Edje_Part_Description_External, de); - EMN(part, Edje_Part, de); + EDIT_EMN(RECTANGLE, Edje_Part_Description_Common, de); + EDIT_EMN(TEXT, Edje_Part_Description_Text, de); + EDIT_EMN(IMAGE, Edje_Part_Description_Image, de); + EDIT_EMN(SWALLOW, Edje_Part_Description_Common, de); + EDIT_EMN(TEXTBLOCK, Edje_Part_Description_Text, de); + EDIT_EMN(GROUP, Edje_Part_Description_Common, de); + EDIT_EMN(BOX, Edje_Part_Description_Box, de); + EDIT_EMN(TABLE, Edje_Part_Description_Table, de); + EDIT_EMN(EXTERNAL, Edje_Part_Description_External, de); + EDIT_EMN(part, Edje_Part, de); ed->file->collection_cache = eina_list_prepend(ed->file->collection_cache, pc); _edje_cache_coll_clean(ed->file);