put visual studio files outside the libraries directory
authorcaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 3 Feb 2011 19:51:49 +0000 (19:51 +0000)
committercaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 3 Feb 2011 19:51:49 +0000 (19:51 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@56686 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

win32/MANIFEST.txt [deleted file]
win32/README.txt [deleted file]
win32/common/eina_config.h [deleted file]
win32/patch/eina.diff [deleted file]
win32/start.bat [deleted file]
win32/vs8/eina.sln [deleted file]
win32/vs8/libeina.vcproj [deleted file]
win32/vs9/eina.sln [deleted file]
win32/vs9/libeina.vcproj [deleted file]

diff --git a/win32/MANIFEST.txt b/win32/MANIFEST.txt
deleted file mode 100644 (file)
index 618718f..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-\r
- This folder content:\r
-\r
-   common                       - common sources necessary to build efl with MSVC\r
-\r
-     eina_config.h                - header to configure Eina\r
-\r
-   vs8                          - Visual Studio 8 project files\r
-     evil.sln                     - Eina MSVC solution\r
-     libeina.vcproj               - libeina project\r
-\r
-   vs9                          - Visual Studio 9 project files\r
-     evil.sln                     - Eina MSVC solution\r
-     libeina.vcproj               - libeina project\r
-\r
-   start.bat                    - batch script to start work with the solution\r
-   MANIFEST.txt                 - this file\r
-   README.txt                   - about this folder\r
diff --git a/win32/README.txt b/win32/README.txt
deleted file mode 100644 (file)
index 398795e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
- This folder contains Microsoft Visual Studio projects and some sources for\r
- building Eina.\r
-\r
-Important:\r
-\r
- Do not launch manually any solutions or projects in the folder, to start\r
- a solution run the start.bat script, it will setup environment for\r
- projects and will check system requirements. start.bat will detect\r
- automatically the version of Visual Studio which is installed. It\r
- currently supports Visual Studio 2005 and 2008.\r
diff --git a/win32/common/eina_config.h b/win32/common/eina_config.h
deleted file mode 100644 (file)
index be1a50c..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/* EINA - EFL data type library
- * Copyright (C) 2008 Cedric Bail
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library;
- * if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef EINA_CONFIG_H_
-#define EINA_CONFIG_H_
-
-#undef EINA_MAGIC_DEBUG
-#undef EINA_DEFAULT_MEMPOOL
-#undef EINA_SAFETY_CHECKS
-
-#ifndef NDEBUG
-# define EINA_MAGIC_DEBUG
-# define EINA_SAFETY_CHECKS
-#endif
-
-#define NVALGRIND
-
-#ifndef VMAJ
-# define VMAJ 1
-#endif
-#ifndef VMIN
-# define VMIN 0
-#endif
-#ifndef VMIC
-# define VMIC 0
-#endif
-#ifndef VREV
-# define VREV 0
-#endif
-
-#define MODULE_ARCH "win32-msc-x86"
-#define SHARED_LIB_SUFFIX ".dll"
-
-#endif /* EINA_CONFIG_H_ */
diff --git a/win32/patch/eina.diff b/win32/patch/eina.diff
deleted file mode 100644 (file)
index b68fbf4..0000000
+++ /dev/null
@@ -1,952 +0,0 @@
---- ../../src/lib/eina_array.c 2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_array_new.c     2010-04-15 06:32:11 +0000
-@@ -144,21 +144,39 @@
-        EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY);          \\r
-   } while (0)\r
\r
--#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, ...)                       \\r
-+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d)                    \\r
-   do {                                                                \\r
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR))     \\r
-        {                                                      \\r
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR);      \\r
--          return __VA_ARGS__;                                 \\r
-+          return;                                             \\r
-        }                                                      \\r
-   } while (0)\r
\r
--#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, ...)                       \\r
-+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(d,ret)         \\r
-+  do {                                                                \\r
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR))     \\r
-+       {                                                      \\r
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR);      \\r
-+          return ret;                                 \\r
-+       }                                                      \\r
-+  } while (0)\r
-+\r
-+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d)                    \\r
-+  do {                                                                \\r
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR))     \\r
-+       {                                                      \\r
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR);            \\r
-+          return;                                             \\r
-+       }                                                      \\r
-+  } while (0)\r
-+\r
-+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(d,ret)                 \\r
-   do {                                                                \\r
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR))     \\r
-        {                                                      \\r
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR);            \\r
--          return __VA_ARGS__;                                 \\r
-+          return ret;                                         \\r
-        }                                                      \\r
-   } while (0)\r
\r
-@@ -205,7 +223,7 @@
- static Eina_Bool\r
- eina_array_iterator_next(Eina_Iterator_Array *it, void **data)\r
- {\r
--   EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, EINA_FALSE);\r
-+   EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, EINA_FALSE);\r
\r
-    if (!(it->index < eina_array_count_get(it->array)))\r
-      return EINA_FALSE;\r
-@@ -218,7 +236,7 @@
- static Eina_Array *\r
- eina_array_iterator_get_container(Eina_Iterator_Array *it)\r
- {\r
--   EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, NULL);\r
-    return (Eina_Array *) it->array;\r
- }\r
\r
-@@ -232,7 +250,7 @@
- static Eina_Bool\r
- eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int idx, void **data)\r
- {\r
--   EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE);\r
-+   EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, EINA_FALSE);\r
\r
-    if (!(idx < eina_array_count_get(it->array)))\r
-      return EINA_FALSE;\r
-@@ -244,7 +262,7 @@
- static Eina_Array *\r
- eina_array_accessor_get_container(Eina_Accessor_Array *it)\r
- {\r
--   EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, NULL);\r
-    return (Eina_Array *) it->array;\r
- }\r
\r
---- ../../src/lib/eina_hash.c  2010-04-15 06:11:15 +0000
-+++ ../../src/lib/eina_hash_new.c      2010-04-14 16:59:57 +0000
-@@ -53,12 +53,21 @@
-        EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH);                           \\r
-   } while(0)\r
\r
--#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, ...)                                \\r
-+#define EINA_MAGIC_CHECK_HASH_ITERATOR(d)                             \\r
-   do {                                                                        \\r
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR))              \\r
-      {                                                                        \\r
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR);                       \\r
--          return __VA_ARGS__;                                                 \\r
-+          return;                                                     \\r
-+     }                                                                        \\r
-+  } while(0)\r
-+\r
-+#define EINA_MAGIC_CHECK_HASH_ITERATOR_RET(d, ret)                    \\r
-+  do {                                                                        \\r
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR))              \\r
-+     {                                                                        \\r
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR);                       \\r
-+          return ret;                                                 \\r
-      }                                                                        \\r
-   } while(0)\r
\r
-@@ -484,7 +493,7 @@
- {\r
-    Eina_Hash_El *stuff;\r
\r
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);\r
\r
-    stuff = it->el;\r
\r
-@@ -497,7 +506,7 @@
- {\r
-    Eina_Hash_El *stuff;\r
\r
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);\r
\r
-    stuff = it->el;\r
\r
-@@ -510,7 +519,7 @@
- {\r
-    Eina_Hash_El *stuff;\r
\r
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);\r
\r
-    stuff = it->el;\r
\r
-@@ -588,7 +597,7 @@
- static void *\r
- _eina_hash_iterator_get_container(Eina_Iterator_Hash *it)\r
- {\r
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);\r
-    return (void *) it->hash;\r
- }\r
\r
---- ../../src/lib/eina_list.c  2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_list_new.c      2010-04-15 06:33:11 +0000
-@@ -98,30 +98,57 @@
- static const char EINA_MAGIC_LIST_ACCOUNTING_STR[] = "Eina List Accounting";\r
\r
\r
--#define EINA_MAGIC_CHECK_LIST(d, ...)                         \\r
-+#define EINA_MAGIC_CHECK_LIST(d)                              \\r
-   do {                                                                \\r
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST))                        \\r
-     {                                                         \\r
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST);                  \\r
--        return __VA_ARGS__;                                   \\r
-+        return;                                                       \\r
-+    }                                                         \\r
-+  } while(0)\r
-+\r
-+#define EINA_MAGIC_CHECK_LIST_RETURN(d,ret)                   \\r
-+  do {                                                                \\r
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST))                        \\r
-+    {                                                         \\r
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST);                  \\r
-+        return ret;                                           \\r
-+    }                                                         \\r
-+  } while(0)\r
-+\r
-+#define EINA_MAGIC_CHECK_LIST_ITERATOR(d)                     \\r
-+  do {                                                                \\r
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR))               \\r
-+    {                                                         \\r
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR);         \\r
-+        return;                                                       \\r
-     }                                                         \\r
-   } while(0)\r
\r
--#define EINA_MAGIC_CHECK_LIST_ITERATOR(d, ...)                        \\r
-+#define EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(d,ret)          \\r
-   do {                                                                \\r
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR))               \\r
-     {                                                         \\r
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR);         \\r
--        return __VA_ARGS__;                                   \\r
-+        return ret;                                           \\r
-+    }                                                         \\r
-+  } while(0)\r
-+\r
-+#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d)                     \\r
-+  do {                                                                \\r
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR))               \\r
-+    {                                                         \\r
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR);         \\r
-+        return;                                                       \\r
-     }                                                         \\r
-   } while(0)\r
\r
--#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d, ...)                        \\r
-+#define EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(d,ret)          \\r
-   do {                                                                \\r
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR))               \\r
-     {                                                         \\r
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR);         \\r
--        return __VA_ARGS__;                                   \\r
-+        return ret;                                           \\r
-     }                                                         \\r
-   } while(0)\r
\r
-@@ -224,7 +251,7 @@
- static Eina_List *\r
- _eina_list_setup_accounting(Eina_List *list)\r
- {\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    list->accounting = _eina_list_mempool_accounting_new(list);\r
-    if (!list->accounting) goto on_error;\r
-@@ -267,7 +294,7 @@
- static Eina_Bool\r
- eina_list_iterator_next(Eina_Iterator_List *it, void **data)\r
- {\r
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);\r
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);\r
\r
-    if (it->current == NULL) return EINA_FALSE;\r
-    *data = eina_list_data_get(it->current);\r
-@@ -280,7 +307,7 @@
- static Eina_Bool\r
- eina_list_iterator_prev(Eina_Iterator_List *it, void **data)\r
- {\r
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);\r
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);\r
\r
-    if (it->current == NULL) return EINA_FALSE;\r
-    *data = eina_list_data_get(it->current);\r
-@@ -293,7 +320,7 @@
- static Eina_List *\r
- eina_list_iterator_get_container(Eina_Iterator_List *it)\r
- {\r
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, NULL);\r
\r
-    return (Eina_List *) it->head;\r
- }\r
-@@ -313,7 +340,7 @@
-    unsigned int middle;\r
-    unsigned int i;\r
\r
--   EINA_MAGIC_CHECK_LIST_ACCESSOR(it, EINA_FALSE);\r
-+   EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, EINA_FALSE);\r
\r
-    if (idx >= eina_list_count(it->head)) return EINA_FALSE;\r
\r
-@@ -378,7 +405,7 @@
- static Eina_List *\r
- eina_list_accessor_get_container(Eina_Accessor_List *it)\r
- {\r
--   EINA_MAGIC_CHECK_LIST_ACCESSOR(it, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, NULL);\r
\r
-    return (Eina_List *) it->head;\r
- }\r
-@@ -396,7 +423,7 @@
- {\r
-    Eina_List *prev = NULL;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    for (; list; list = list->next)\r
-      {\r
-@@ -582,7 +609,7 @@
-       return _eina_list_setup_accounting(new_l);\r
-      }\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    l = list->accounting->last;\r
-    list->accounting->last = new_l;\r
-@@ -637,7 +664,7 @@
\r
-    if (!list) return _eina_list_setup_accounting(new_l);\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    list->prev = new_l;\r
\r
-@@ -690,7 +717,7 @@
-    Eina_List *l;\r
-    void *list_data;\r
\r
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    EINA_LIST_FOREACH(list, l, list_data)\r
-      {\r
-@@ -728,7 +755,7 @@
-    new_l = _eina_list_mempool_list_new(list);\r
-    if (!new_l) return list;\r
\r
--   EINA_MAGIC_CHECK_LIST(relative, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);\r
-    new_l->next = relative->next;\r
-    new_l->data = (void *)data;\r
\r
-@@ -790,7 +817,7 @@
-    Eina_List *l;\r
-    void *list_data;\r
\r
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    EINA_LIST_FOREACH(list, l, list_data)\r
-      {\r
-@@ -827,7 +854,7 @@
-    new_l = _eina_list_mempool_list_new(list);\r
-    if (!new_l) return list;\r
\r
--   EINA_MAGIC_CHECK_LIST(relative, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);\r
\r
-    new_l->prev = relative->prev;\r
-    new_l->next = relative;\r
-@@ -899,7 +926,7 @@
- {\r
-    Eina_List *l;\r
\r
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    l = eina_list_data_find_list(list, data);\r
-    return eina_list_remove_list(list, l);\r
-@@ -946,7 +973,7 @@
-    if (!list) return NULL;\r
-    if (!remove_list) return list;\r
\r
--   EINA_MAGIC_CHECK_LIST(remove_list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(remove_list, NULL);\r
\r
-    if (remove_list->next) remove_list->next->prev = remove_list->prev;\r
-    if (remove_list->prev)\r
-@@ -958,7 +985,7 @@
-      return_l = remove_list->next;\r
-    if (remove_list == remove_list->accounting->last)\r
-      {\r
--       EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+       EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
-        list->accounting->last = remove_list->prev;\r
-      }\r
-    _eina_list_mempool_list_free(remove_list);\r
-@@ -981,7 +1008,7 @@
\r
-    if (!list) return NULL;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    for (l = list; l;)\r
-      {\r
-@@ -1032,8 +1059,8 @@
-    if (move_list == list) return list;\r
-    if (move_list->next == list) return move_list;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
--   EINA_MAGIC_CHECK_LIST(move_list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);\r
\r
-    /* Remove the promoted item from the list. */\r
-    if (!move_list->prev)\r
-@@ -1094,8 +1121,8 @@
-    /* Demoting tail to be tail. */\r
-    if (move_list == list->accounting->last) return list;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
--   EINA_MAGIC_CHECK_LIST(move_list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);\r
\r
-    /* Update pointer list if necessary. */\r
-    if (list == move_list)\r
-@@ -1160,7 +1187,7 @@
-    const Eina_List *l;\r
-    void *list_data;\r
\r
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    EINA_LIST_FOREACH(list, l, list_data)\r
-      {\r
-@@ -1211,7 +1238,7 @@
-    const Eina_List *l;\r
-    unsigned int i;\r
\r
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    /* check for non-existing nodes */\r
-    if ((!list) || (n > (list->accounting->count - 1)))\r
-@@ -1328,7 +1355,7 @@
\r
-    if (!list) return NULL;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    l1 = list;\r
-    l2 = list->accounting->last;\r
-@@ -1372,7 +1399,7 @@
\r
-    if (!list) return NULL;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    lclone = NULL;\r
-    EINA_LIST_FOREACH(list, l, data)\r
-@@ -1405,7 +1432,7 @@
\r
-    if (!list) return NULL;\r
\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    lclone = NULL;\r
-    EINA_LIST_FOREACH(list, l, data)\r
-@@ -1466,7 +1493,7 @@
\r
-    EINA_SAFETY_ON_NULL_RETURN_VAL(func, list);\r
-    if (!list) return NULL;\r
--   EINA_MAGIC_CHECK_LIST(list, NULL);\r
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);\r
\r
-    /* if the caller specified an invalid size, sort the whole list */\r
-    if ((size == 0) ||\r
---- ../../src/lib/eina_matrixsparse.c  2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_matrixsparse_new.c      2010-04-15 06:33:48 +0000
-@@ -66,12 +66,21 @@
- static const char EINA_MAGIC_MATRIXSPARSE_CELL_ITERATOR_STR[] = "Eina Matrixsparse Cell Iterator";
--#define EINA_MAGIC_CHECK_MATRIXSPARSE(d, ...)         \
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE(d)              \
-   do {                                                        \
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE))       \
-        {                                              \
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE);  \
--        return __VA_ARGS__;                           \
-+        return;                                       \
-+       }                                              \
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_RET(d, ret)     \
-+  do {                                                        \
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE))       \
-+       {                                              \
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE);  \
-+        return ret;                                   \
-        }                                              \
-   } while(0)
-@@ -93,12 +102,21 @@
-        }                                                      \
-   } while(0)
--#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d, ...)                        \
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d)                     \
-+  do {                                                                        \
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR))      \
-+       {                                                              \
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR);         \
-+        return;                                                       \
-+       }                                                              \
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(d, ret)            \
-   do {                                                                        \
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR))      \
-        {                                                              \
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR);         \
--        return __VA_ARGS__;                                           \
-+        return ret;                                                   \
-        }                                                              \
-   } while(0)
-@@ -663,7 +681,7 @@
- static Eina_Bool
- _eina_matrixsparse_iterator_next(Eina_Matrixsparse_Iterator *it, void **data)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
-    /* do not touch it->idx */
-@@ -683,7 +701,7 @@
- static Eina_Matrixsparse *
- _eina_matrixsparse_iterator_get_container(Eina_Matrixsparse_Iterator *it)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
-    return (Eina_Matrixsparse *)it->m;
- }
-@@ -699,7 +717,7 @@
- static Eina_Bool
- _eina_matrixsparse_iterator_complete_next(Eina_Matrixsparse_Iterator_Complete *it, void **data)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
-    if (it->idx.row >= it->m->size.rows)
-      return 0;
-@@ -740,7 +758,7 @@
- static Eina_Matrixsparse *
- _eina_matrixsparse_iterator_complete_get_container(Eina_Matrixsparse_Iterator_Complete *it)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
-    return (Eina_Matrixsparse *)it->m;
- }
-@@ -993,7 +1011,7 @@
-    void (*free_func)(void *, void *);
-    void *user_data;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(rows > 0, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(cols > 0, 0);
-@@ -1100,7 +1118,7 @@
- EAPI Eina_Bool
- eina_matrixsparse_cell_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col, Eina_Matrixsparse_Cell **cell)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(cell, 0);
-    *cell = NULL;
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-@@ -1142,7 +1160,7 @@
- eina_matrixsparse_data_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col)
- {
-    Eina_Matrixsparse_Cell *c;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, NULL);
-    c = _eina_matrixsparse_cell_idx_get(m, row, col);
-    if (c) return c->data;
-    else   return NULL;
-@@ -1213,7 +1231,7 @@
-    EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
-    EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
--   EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
-    m = cell->parent->parent;
-@@ -1245,7 +1263,7 @@
-    Eina_Matrixsparse_Cell *cell;
-    if (p_old) *p_old = NULL;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
-@@ -1281,7 +1299,7 @@
- {
-    Eina_Matrixsparse_Cell *cell;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
-@@ -1319,7 +1337,7 @@
- {
-    Eina_Matrixsparse_Row *r;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    r = _eina_matrixsparse_row_idx_get(m, row);
-@@ -1355,7 +1373,7 @@
-    void (*free_func)(void *, void *);
-    void *user_data;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
-    free_func = m->free.func;
-@@ -1410,7 +1428,7 @@
- {
-    Eina_Matrixsparse_Cell *c;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
-@@ -1442,7 +1460,7 @@
-    EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
-    EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
--   EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
-    m = cell->parent->parent;
---- ../../src/lib/eina_strbuf.c        2010-04-15 06:17:34 +0000
-+++ ../../src/lib/eina_strbuf_new.c    2010-04-15 06:47:16 +0000
-@@ -33,12 +33,21 @@
- static const char EINA_MAGIC_STRBUF_STR[] = "Eina Strbuf";
--#define EINA_MAGIC_CHECK_STRBUF(d, ...)                               \
-+#define EINA_MAGIC_CHECK_STRBUF(d)                            \
-    do {                                                               \
-       if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF))          \
-         {                                                     \
-            EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF);           \
--           return __VA_ARGS__;                                \
-+           return;                                            \
-+        }                                                     \
-+   } while (0)
-+
-+#define EINA_MAGIC_CHECK_STRBUF_RET(d, ret)                   \
-+   do {                                                               \
-+      if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF))          \
-+        {                                                     \
-+           EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF);           \
-+           return ret;                                        \
-         }                                                     \
-    } while (0)
-@@ -344,7 +353,7 @@
-    size_t len;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    len = strlen(str);
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + len)))
-@@ -372,7 +381,7 @@
-    char *esc;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    esc = eina_str_escape(str);
-    if (EINA_UNLIKELY(!esc))
-@@ -416,7 +425,7 @@
-    size_t len;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    len = strlen(str);
-    if (len > maxlen) len = maxlen;
-@@ -452,7 +461,7 @@
- eina_strbuf_append_length(Eina_Strbuf *buf, const char *str, size_t length)
- {
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + length)))
-      return EINA_FALSE;
-@@ -481,7 +490,7 @@
-    Eina_Bool ret;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    va_start(args, fmt);
-    len = vasprintf(&str, fmt, args);
-@@ -512,7 +521,7 @@
-    Eina_Bool ret;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    len = vasprintf(&str, fmt, args);
-@@ -544,7 +553,7 @@
-    size_t len;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (pos >= buf->len)
-      return eina_strbuf_append(buf, str);
-@@ -574,7 +583,7 @@
-    char *esc;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    esc = eina_str_escape(str);
-    if (EINA_UNLIKELY(!esc))
-@@ -609,7 +618,7 @@
-    size_t len;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (pos >= buf->len)
-      return eina_strbuf_append_n(buf, str, maxlen);
-@@ -643,7 +652,7 @@
- eina_strbuf_insert_length(Eina_Strbuf *buf, const char *str, size_t length, size_t pos)
- {
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (pos >= buf->len)
-      return eina_strbuf_append_length(buf, str, length);
-@@ -665,7 +674,7 @@
- EAPI Eina_Bool
- eina_strbuf_append_char(Eina_Strbuf *buf, char c)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + 1)))
-      return EINA_FALSE;
-@@ -690,7 +699,7 @@
- EAPI Eina_Bool
- eina_strbuf_insert_char(Eina_Strbuf *buf, char c, size_t pos)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (pos >= buf->len)
-      return eina_strbuf_append_char(buf, c);
-@@ -715,7 +724,7 @@
-    Eina_Bool ret;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    va_start(args, pos);
-    len = vasprintf(&str, fmt, args);
-@@ -745,7 +754,7 @@
-    Eina_Bool ret;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    len = vasprintf(&str, fmt, args);
-@@ -776,7 +785,7 @@
- {
-    size_t remove_len, tail_len;
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
-    if (end >= buf->len)
-      end = buf->len;
-@@ -813,7 +822,7 @@
- EAPI const char *
- eina_strbuf_string_get(const Eina_Strbuf *buf)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, NULL);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
-    return buf->buf;
- }
-@@ -836,7 +845,7 @@
- {
-    char *ret;
--   EINA_MAGIC_CHECK_STRBUF(buf, NULL);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
-    ret = buf->buf;
-    // TODO: Check return value and do something clever
-@@ -855,7 +864,7 @@
- EAPI size_t
- eina_strbuf_length_get(const Eina_Strbuf *buf)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
-    return buf->len;
- }
-@@ -881,7 +890,7 @@
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(with, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
-    if (n == 0)
-      return EINA_FALSE;
-@@ -939,7 +948,7 @@
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(with, 0);
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
-    spos = strstr(buf->buf, str);
-    if (!spos || *spos == '\0')
---- ../../src/lib/eina_stringshare.c   2010-04-15 06:53:51 +0000
-+++ ../../src/lib/eina_stringshare_new.c       2010-04-15 06:35:44 +0000
-@@ -104,13 +104,23 @@
- static const char EINA_MAGIC_STRINGSHARE_NODE_STR[] = "Eina Stringshare Node";\r
\r
\r
--#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock, ...)     \\r
-+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock)  \\r
-   do {                                                                \\r
-     if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD))  \\r
-     {                                                         \\r
-         EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD);    \\r
-         unlock;                                                       \\r
--        return __VA_ARGS__;                                   \\r
-+        return;                                                       \\r
-+    }                                                         \\r
-+  } while (0)\r
-+\r
-+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(d, unlock, ret) \\r
-+  do {                                                                \\r
-+    if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD))  \\r
-+    {                                                         \\r
-+        EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD);    \\r
-+        unlock;                                                       \\r
-+        return ret;                                           \\r
-     }                                                         \\r
-   } while (0)\r
\r
-@@ -371,7 +381,7 @@
- static int\r
- _eina_stringshare_cmp(const Eina_Stringshare_Head *ed, const int *hash, __UNUSED__ int length, __UNUSED__ void *data)\r
- {\r
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, , 0);\r
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, , 0);\r
\r
-    return ed->hash - *hash;\r
- }\r
-@@ -379,8 +389,8 @@
- static Eina_Rbtree_Direction\r
- _eina_stringshare_node(const Eina_Stringshare_Head *left, const Eina_Stringshare_Head *right, __UNUSED__ void *data)\r
- {\r
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(left, , 0);\r
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(right, , 0);\r
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(left, , 0);\r
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(right, , 0);\r
\r
-    if (left->hash - right->hash < 0)\r
-      return EINA_RBTREE_LEFT;\r
-@@ -1138,7 +1148,7 @@
-       return s;\r
-      }\r
\r
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, STRINGSHARE_UNLOCK_BIG(), NULL);\r
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, STRINGSHARE_UNLOCK_BIG(), NULL);\r
\r
-    el = _eina_stringshare_head_find(ed, str, slen);\r
-    if (el)\r
---- ../../src/lib/eina_tiler.c 2010-04-15 06:11:15 +0000
-+++ ../../src/lib/eina_tiler_new.c     2010-04-14 16:50:29 +0000
-@@ -110,22 +110,40 @@
-       splitter_t splitter;
- };
--#define EINA_MAGIC_CHECK_TILER(d, ...)                                        \
-+#define EINA_MAGIC_CHECK_TILER(d)                                     \
-       do {                                                            \
-               if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER))             \
-               {                                                       \
-                       EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER);           \
--                      return __VA_ARGS__;                             \
-+                      return;                                         \
-               }                                                       \
-       } while(0)
-+#define EINA_MAGIC_CHECK_TILER_RETURN(d,ret)                          \
-+      do {                                                            \
-+              if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER))             \
-+              {                                                       \
-+                      EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER);           \
-+                      return ret;                                     \
-+              }                                                       \
-+      } while(0)
-+
-+
-+#define EINA_MAGIC_CHECK_TILER_ITERATOR(d)                            \
-+      do {                                                            \
-+              if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR))    \
-+              {                                                       \
-+                      EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR);  \
-+                      return;                                         \
-+              }                                                       \
-+      } while(0)
--#define EINA_MAGIC_CHECK_TILER_ITERATOR(d, ...)                               \
-+#define EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(d,ret)                 \
-       do {                                                            \
-               if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR))    \
-               {                                                       \
-                       EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR);  \
--                      return __VA_ARGS__;                             \
-+                      return ret;                                     \
-               }                                                       \
-       } while(0)
-@@ -1081,7 +1099,7 @@
- static void * _iterator_get_container(Eina_Iterator_Tiler *it)
- {
--      EINA_MAGIC_CHECK_TILER_ITERATOR(it, NULL);
-+      EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(it, NULL);
-       return (void *)it->tiler;
- }
-@@ -1134,7 +1152,7 @@
- {
-       Eina_Rectangle tmp;
--      EINA_MAGIC_CHECK_TILER(t, EINA_FALSE);
-+      EINA_MAGIC_CHECK_TILER_RETURN(t, EINA_FALSE);
-       if ((r->w <= 0) || (r->h <= 0))
-               return EINA_FALSE;
-       tmp = *r;
-@@ -1171,7 +1189,7 @@
- {
-       Eina_Iterator_Tiler *it;
--      EINA_MAGIC_CHECK_TILER(t, NULL);
-+      EINA_MAGIC_CHECK_TILER_RETURN(t, NULL);
-       it = calloc(1, sizeof (Eina_Iterator_Tiler));
-       if (!it) return NULL;
diff --git a/win32/start.bat b/win32/start.bat
deleted file mode 100644 (file)
index a717124..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-@echo off\r
-\r
-rem Set external libraries directory.\r
-set EXT_DIR=%cd%\..\..\..\extern\r
-\r
-if not exist %EXT_DIR% (\r
-       set EXT_DIR=\r
-       echo ERROR: External libs dir is not set.\r
-       pause\r
-       goto END\r
-)\r
-\r
-rem Check for basic requirements for Visual Studio 2008\r
-if "%VS90COMNTOOLS%" == "" (\r
-       echo ERROR: Microsoft Visual Studio 2008 is not installed.\r
-       echo ERROR: Try to launch Microsoft Visual Studio 2005.\r
-       pause\r
-       goto NOVS9\r
-)\r
-\r
-set PROJECT_TYPE=vs9\r
-set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat\r
-\r
-goto STARTVS\r
-\r
-:NOVS9\r
-\r
-rem Check for basic requirements for Visual Studio 2005\r
-if "%VS80COMNTOOLS%" == "" (\r
-       echo ERROR: Microsoft Visual Studio 2005 is not installed.\r
-       pause\r
-       goto END\r
-)\r
-\r
-set PROJECT_TYPE=vs8\r
-set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat\r
-\r
-rem Patching Eina\r
-patch.exe --binary -p1 < %cd%\patch\eina.diff\r
-echo INFO: Eina patched.\r
-\r
-pause\r
-\r
-:STARTVS\r
-\r
-rem Setup common Win32 environment variables\r
-\r
-rem Add Evil lib path\r
-set EvilInclude=%cd%\..\..\evil\src\lib\r
-set EvilCommon=%cd%\..\..\evil\win32\common\r
-set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out\r
-\r
-set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%\r
-set LIB=%EvilOut%;%LIB%\r
-\r
-rem Add installation directory pathes.\r
-set INCLUDE=%EXT_DIR%\include;%INCLUDE%\r
-set LIB=%EXT_DIR%\lib;%LIB%\r
-\r
-set INCLUDE=%cd%\common;%cd%\..\src\include;%cd%\..\src\lib;%INCLUDE%\r
-\r
-set SolutionDirectory=%cd%\%PROJECT_TYPE%\r
-set DebugOutputDirectory=%SolutionDirectory%\out\r
-set ReleaseOutputDirectory=%SolutionDirectory%\out\r
-set DebugLibraryDirectory=%SolutionDirectory%\out\r
-set ReleaseLibraryDirectory=%SolutionDirectory%\out\r
-set TemporaryDirectory=%SolutionDirectory%\temp\r
-\r
-rem Setting environment for using Microsoft Visual Studio x86 tools.\r
-call "%VSCOMMONTOOLS%"\r
-\r
-%PROJECT_TYPE%\eina.sln\r
-\r
-:END\r
diff --git a/win32/vs8/eina.sln b/win32/vs8/eina.sln
deleted file mode 100644 (file)
index 1051362..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Studio 2005\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Release|Win32 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
diff --git a/win32/vs8/libeina.vcproj b/win32/vs8/libeina.vcproj
deleted file mode 100644 (file)
index 560ba47..0000000
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="libeina"\r
-       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-       RootNamespace="eina"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(DebugOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libevil.lib libdl.lib iconv.lib"\r
-                               OutputFile="$(OutDir)\libeina.dll"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ReleaseOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libevil.lib libdl.lib iconv.lib"\r
-                               OutputFile="$(OutDir)\libeina.dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_accessor.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_array.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_benchmark.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_binshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_convert.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_counter.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_cpu.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_error.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_file_win32.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_fp.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_hamster.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_hash.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_inlist.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_iterator.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_lalloc.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_list.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_log.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_magic.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_main.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_matrixsparse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_mempool.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_module.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_quadtree.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_rbtree.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_rectangle.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_safety_checks.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_share_common.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_strbuf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_strbuf_common.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_str.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_stringshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_tiler.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_unicode.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_ustrbuf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_ustringshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_value.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\include\Eina.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_accessor.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_array.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_benchmark.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_binshare.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_convert.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_counter.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_cpu.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_error.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_file.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_fp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_hamster.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_hash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_inlist.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_iterator.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_lalloc.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_list.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_log.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_magic.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_main.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_matrixsparse.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_mempool.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_module.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_private.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_quadtree.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_rbtree.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_rectangle.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_safety_checks.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_strbuf.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_strbuf_common.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_str.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_stringshare.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_tiler.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_trash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_types.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_unicode.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_ustrbuf.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_ustringshare.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/win32/vs9/eina.sln b/win32/vs9/eina.sln
deleted file mode 100644 (file)
index 4ab4a53..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual C++ Express 2008\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Release|Win32 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
diff --git a/win32/vs9/libeina.vcproj b/win32/vs9/libeina.vcproj
deleted file mode 100644 (file)
index 24f3d8b..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="libeina"\r
-       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-       RootNamespace="eina"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(DebugOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libevil.lib libdl.lib iconv.lib"\r
-                               OutputFile="$(OutDir)\libeina.dll"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ReleaseOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libevil.lib libdl.lib iconv.lib"\r
-                               OutputFile="$(OutDir)\libeina.dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_accessor.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_array.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_benchmark.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_binshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-\r
-                               RelativePath="..\..\src\lib\eina_convert.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_counter.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_cpu.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_error.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_file_win32.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_fp.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_hamster.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_hash.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_inlist.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_iterator.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_lalloc.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_list.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_log.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_magic.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_main.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_matrixsparse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_mempool.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_module.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_quadtree.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_rbtree.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_rectangle.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_safety_checks.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_sched.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_share_common.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_strbuf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_strbuf_common.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_str.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_stringshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_tiler.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_unicode.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_ustrbuf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_ustringshare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-\r
-                               RelativePath="..\..\src\lib\eina_value.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\include\Eina.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_accessor.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_array.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_benchmark.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_binshare.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_convert.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_counter.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_cpu.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_error.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_file.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_fp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_hamster.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_hash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_inlist.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_iterator.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_lalloc.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_list.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_log.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_magic.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_main.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_matrixsparse.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_mempool.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_module.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eina_private.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_quadtree.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_rbtree.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_rectangle.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_safety_checks.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_strbuf.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_strbuf_common.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_str.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_stringshare.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_stringshare.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_tiler.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_trash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_types.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_unicode.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_ustrbuf.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\include\eina_ustringshare.h"\r
-                               >\r
-                       </File>\r
-\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r