enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Rename 'same named' macros. 

NB - Please use different macro names in the future for stuff like this 
(ie: not the same macro name in each file) as it spits nasty compiler 
warnings when compiling w/ amalgamation.



SVN revision: 50748
This commit is contained in:
Christopher Michael 2010-08-02 19:06:07 +00:00
parent 54a05dc2aa
commit a7049f1f16
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/edje/src/lib/edje_convert.c
View File

@ -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));

22
legacy/edje/src/lib/edje_edit.c
View File

@ -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);