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

Don't use the same macro name in each file, gives nasty compiler warnings when 

using amalgamation.



SVN revision: 50696
This commit is contained in:
Christopher Michael 2010-07-31 01:21:30 +00:00
parent d409884148
commit 55d0190185
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,7 @@ _edje_description_convert(int type,
result = eina_mempool_malloc(ce->mp.GROUP, sizeof (Edje_Part_Description_Common));
break;
#define ALLOC_POOL(Short, Type, Name) \
#define CONVERT_ALLOC_POOL(Short, Type, Name) \
case EDJE_PART_TYPE_##Short: \
{ \
Edje_Part_Description_##Type *Name; \
@ -413,12 +413,12 @@ _edje_description_convert(int type,
break; \
}
ALLOC_POOL(IMAGE, Image, image);
ALLOC_POOL(TEXT, Text, text);
ALLOC_POOL(TEXTBLOCK, Text, text);
ALLOC_POOL(BOX, Box, box);
ALLOC_POOL(TABLE, Table, table);
ALLOC_POOL(EXTERNAL, External, external_params);
CONVERT_ALLOC_POOL(IMAGE, Image, image);
CONVERT_ALLOC_POOL(TEXT, Text, text);
CONVERT_ALLOC_POOL(TEXTBLOCK, Text, text);
CONVERT_ALLOC_POOL(BOX, Box, box);
CONVERT_ALLOC_POOL(TABLE, Table, table);
CONVERT_ALLOC_POOL(EXTERNAL, External, external_params);
}
*result = oed->common;

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

@ -2654,7 +2654,7 @@ _edje_edit_state_alloc(int type, Edje *ed)
pd = eina_mempool_malloc(ce->mp.GROUP, sizeof (Edje_Part_Description_Common));
break;
#define ALLOC_POOL(Short, Type, Name) \
#define EDIT_ALLOC_POOL(Short, Type, Name) \
case EDJE_PART_TYPE_##Short: \
{ \
Edje_Part_Description_##Type *Name; \
@ -2665,12 +2665,12 @@ _edje_edit_state_alloc(int type, Edje *ed)
break; \
}
ALLOC_POOL(IMAGE, Image, image);
ALLOC_POOL(TEXT, Text, text);
ALLOC_POOL(TEXTBLOCK, Text, text);
ALLOC_POOL(BOX, Box, box);
ALLOC_POOL(TABLE, Table, table);
ALLOC_POOL(EXTERNAL, External, external_params);
EDIT_ALLOC_POOL(IMAGE, Image, image);
EDIT_ALLOC_POOL(TEXT, Text, text);
EDIT_ALLOC_POOL(TEXTBLOCK, Text, text);
EDIT_ALLOC_POOL(BOX, Box, box);
EDIT_ALLOC_POOL(TABLE, Table, table);
EDIT_ALLOC_POOL(EXTERNAL, External, external_params);
}
return pd;