From 42d39725b43c3739744114d361e826c7bf014aff Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Thu, 25 Sep 2008 14:46:48 +0000
Subject: [PATCH] Last part of quarium patch.

SVN revision: 36257
---
 legacy/eina/src/include/eina_private.h  | 22 +++++++++++++++++++---
 legacy/eina/src/lib/eina_magic.c        |  5 ++---
 legacy/eina/src/tests/eina_test_array.c |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/legacy/eina/src/include/eina_private.h b/legacy/eina/src/include/eina_private.h
index 8a746bf5de..e47bedf2af 100644
--- a/legacy/eina/src/include/eina_private.h
+++ b/legacy/eina/src/include/eina_private.h
@@ -48,9 +48,21 @@
 #define READBUFSIZ 65536
 
 /* eina magic types */
-#define EINA_MAGIC_STRINGSHARE 0x10452571
-#define EINA_MAGIC_STRINGSHARE_NODE 0x95204152
-#define EINA_MAGIC_STRINGSHARE_HEAD 0x35294051
+#define EINA_MAGIC_ITERATOR 0x98761233
+#define EINA_MAGIC_ACCESSOR 0x98761232
+
+#define EINA_MAGIC_STRINGSHARE 0x98761234
+#define EINA_MAGIC_STRINGSHARE_NODE 0x98761235
+#define EINA_MAGIC_STRINGSHARE_HEAD 0x98761236
+
+#define EINA_MAGIC_LIST	0x98761237
+#define EINA_MAGIC_LIST_ITERATOR 0x98761238
+#define EINA_MAGIC_LIST_ACCESSOR 0x98761239
+#define EINA_MAGIC_LIST_ACCOUNTING 0x9876123a
+
+#define EINA_MAGIC_ARRAY 0x9876123b
+#define EINA_MAGIC_ARRAY_ITERATOR 0x9876123c
+#define EINA_MAGIC_ARRAY_ACCESSOR 0x9876123d
 
 /* undef the following, we want out version */
 #undef FREE
@@ -131,6 +143,8 @@ typedef void (*Eina_Accessor_Free_Callback)(Eina_Accessor *it);
 
 struct _Eina_Iterator
 {
+   EINA_MAGIC;
+
    Eina_Iterator_Next_Callback          next;
    Eina_Iterator_Get_Container_Callback get_container;
    Eina_Iterator_Free_Callback          free;
@@ -138,6 +152,8 @@ struct _Eina_Iterator
 
 struct _Eina_Accessor
 {
+   EINA_MAGIC;
+
    Eina_Accessor_Get_At_Callback        get_at;
    Eina_Accessor_Get_Container_Callback	get_container;
    Eina_Accessor_Free_Callback          free;
diff --git a/legacy/eina/src/lib/eina_magic.c b/legacy/eina/src/lib/eina_magic.c
index d12e68cf8d..c9180c354c 100644
--- a/legacy/eina/src/lib/eina_magic.c
+++ b/legacy/eina/src/lib/eina_magic.c
@@ -22,14 +22,13 @@
 
 #include <string.h>
 
-#include "eina_array.h"
-#include "eina_error.h"
-
 #ifndef DEBUG
 # define DEBUG
 #endif
 #include "eina_magic.h"
 #include "eina_private.h"
+#include "eina_array.h"
+#include "eina_error.h"
 
 /*============================================================================*
  *                                  Local                                     *
diff --git a/legacy/eina/src/tests/eina_test_array.c b/legacy/eina/src/tests/eina_test_array.c
index f534136ead..010e1754b1 100644
--- a/legacy/eina/src/tests/eina_test_array.c
+++ b/legacy/eina/src/tests/eina_test_array.c
@@ -69,7 +69,7 @@ END_TEST
 
 START_TEST(eina_array_static)
 {
-   Eina_Array sea = { NULL, 0, 0, 0 };
+   Eina_Array sea;
    char *tmp;
    Eina_Array_Iterator it;
    unsigned int i;