From 4eb9ea75879145ed82346f2a446694c36001863b Mon Sep 17 00:00:00 2001
From: Daniel Zaoui <daniel.zaoui@samsung.com>
Date: Mon, 22 Oct 2012 09:36:23 +0000
Subject: [PATCH] Fix for amalgamation.

Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com>

SVN revision: 78325
---
 legacy/edje/src/lib/edje_edit.c  | 16 ++++++++++------
 legacy/edje/src/lib/edje_smart.c | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 07ad3599b4..adf52e89c3 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -14,6 +14,10 @@
 
 #include <Eo.h>
 
+#ifdef MY_CLASS
+# undef MY_CLASS
+#endif
+
 #define MY_CLASS EDJE_EDIT_CLASS
 
 static const char EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED_STR[] = "Current group cannot be deleted";
@@ -257,7 +261,7 @@ edje_edit_object_add(Evas *evas)
 }
 
 static void
-_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
+_edje_edit_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
    Edje_Edit *eed = class_data;
    eed->base = eo_data_get(obj, EDJE_OBJ_CLASS);
@@ -7804,10 +7808,10 @@ edje_edit_print_internal_status(Evas_Object *obj)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_edje_edit_class_constructor(Eo_Class *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
-        EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
+        EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_edit_constructor),
         EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_edit_smart_del),
         EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_FILE_SET), _edje_edit_smart_file_set),
         EO_OP_FUNC_SENTINEL
@@ -7816,16 +7820,16 @@ _class_constructor(Eo_Class *klass)
    eo_class_funcs_set(klass, func_desc);
 }
 
-static const Eo_Class_Description class_desc = {
+static const Eo_Class_Description edje_edit_class_desc = {
      EO_VERSION,
      "Edje_Edit",
      EO_CLASS_TYPE_REGULAR,
      EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
      NULL,
      sizeof(Edje_Edit),
-     _class_constructor,
+     _edje_edit_class_constructor,
      NULL
 };
 
-EO_DEFINE_CLASS(edje_edit_class_get, &class_desc, EDJE_OBJ_CLASS, NULL);
+EO_DEFINE_CLASS(edje_edit_class_get, &edje_edit_class_desc, EDJE_OBJ_CLASS, NULL);
 
diff --git a/legacy/edje/src/lib/edje_smart.c b/legacy/edje/src/lib/edje_smart.c
index 22ea2bfcfb..24c83534e3 100644
--- a/legacy/edje/src/lib/edje_smart.c
+++ b/legacy/edje/src/lib/edje_smart.c
@@ -4,6 +4,10 @@
 
 EAPI Eo_Op EDJE_OBJ_BASE_ID = EO_NOOP;
 
+#ifdef MY_CLASS
+# undef MY_CLASS
+#endif
+
 #define MY_CLASS EDJE_OBJ_CLASS
 
 Eina_List *_edje_edjes = NULL;
@@ -20,7 +24,7 @@ edje_object_add(Evas *evas)
 }
 
 static void
-_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
+_edje_smart_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
    Edje *ed = class_data;
    ed->base = eo_data_get(obj, EVAS_OBJ_SMART_CLIPPED_CLASS);
@@ -292,10 +296,10 @@ _edje_smart_file_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_edje_smart_class_constructor(Eo_Class *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
-        EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
+        EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_smart_constructor),
         EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _edje_smart_add),
         EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _edje_smart_del),
         EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_MOVE), _edje_smart_move),
@@ -587,16 +591,16 @@ static const Eo_Op_Description op_desc[] = {
      EO_OP_DESCRIPTION_SENTINEL
 };
 
-static const Eo_Class_Description class_desc = {
+static const Eo_Class_Description edje_smart_class_desc = {
      EO_VERSION,
      "Edje_Smart",
      EO_CLASS_TYPE_REGULAR,
      EO_CLASS_DESCRIPTION_OPS(&EDJE_OBJ_BASE_ID, op_desc, EDJE_OBJ_SUB_ID_LAST),
      NULL,
      sizeof(Edje),
-     _class_constructor,
+     _edje_smart_class_constructor,
      NULL
 };
 
-EO_DEFINE_CLASS(edje_object_class_get, &class_desc, EVAS_OBJ_SMART_CLIPPED_CLASS, NULL);
+EO_DEFINE_CLASS(edje_object_class_get, &edje_smart_class_desc, EVAS_OBJ_SMART_CLIPPED_CLASS, NULL);