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

using amalgamation.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@50696 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/edje_convert.c b/src/lib/edje_convert.c
index 237c668..dbc5d4c 100644 (file)
--- a/src/lib/edje_convert.c
+++ b/src/lib/edje_convert.c
@@ -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;

diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c
index 2becd59..e30c9b3 100644 (file)
--- a/src/lib/edje_edit.c
+++ b/src/lib/edje_edit.c
@@ -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;