From 55d01901859bb2fcca1befeb1011e204d271d59f Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Sat, 31 Jul 2010 01:21:30 +0000
Subject: [PATCH] Don't use the same macro name in each file, gives nasty
 compiler warnings when using amalgamation.

SVN revision: 50696
---
 legacy/edje/src/lib/edje_convert.c | 14 +++++++-------
 legacy/edje/src/lib/edje_edit.c    | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/legacy/edje/src/lib/edje_convert.c b/legacy/edje/src/lib/edje_convert.c
index 237c668cd7..dbc5d4c7a5 100644
--- a/legacy/edje/src/lib/edje_convert.c
+++ b/legacy/edje/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/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 2becd59748..e30c9b3175 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/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;