merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.

SVN revision: 77542

7 files changed, 36 insertions, 36 deletions

diff --git a/src/modules/eina/mp/buddy/eina_buddy.c b/src/modules/eina/mp/buddy/eina_buddy.c
index 7d830dbfbb..8344c9db59 100644
--- a/src/modules/eina/mp/buddy/eina_buddy.c
+++ b/src/modules/eina/mp/buddy/eina_buddy.c
@@ -80,8 +80,8 @@ static inline void *_get_offset(Buddy *b, Block *block)
    return ret;
 }
 
-static void *_init(__UNUSED__ const char *context,
-                   __UNUSED__ const char *options,
+static void *_init(EINA_UNUSED const char *context,
+                   EINA_UNUSED const char *options,
                    va_list args)
 {
    Buddy *b;
diff --git a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
index e56df4cee6..c3985c2d68 100644
--- a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
+++ b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -100,7 +100,7 @@ struct _Chained_Pool
 };
 
 static inline Eina_Rbtree_Direction
-_eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, __UNUSED__ void *data)
+_eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data)
 {
    if (left < right) return EINA_RBTREE_LEFT;
    return EINA_RBTREE_RIGHT;
@@ -108,7 +108,7 @@ _eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, __U
 
 static inline int
 _eina_chained_mp_pool_key_cmp(const Eina_Rbtree *node, const void *key,
-                              __UNUSED__ int length, __UNUSED__ void *data)
+                              EINA_UNUSED int length, EINA_UNUSED void *data)
 {
    const Chained_Pool *r = EINA_RBTREE_CONTAINER_GET(node, const Chained_Pool);
 
@@ -256,7 +256,7 @@ _eina_chained_mempool_free_in(Chained_Mempool *pool, Chained_Pool *p, void *ptr)
 }
 
 static void *
-eina_chained_mempool_malloc(void *data, __UNUSED__ unsigned int size)
+eina_chained_mempool_malloc(void *data, EINA_UNUSED unsigned int size)
 {
    Chained_Mempool *pool = data;
    Chained_Pool *p = NULL;
@@ -434,16 +434,16 @@ eina_chained_mempool_repack(void *data,
 }
 
 static void *
-eina_chained_mempool_realloc(__UNUSED__ void *data,
-                             __UNUSED__ void *element,
-                             __UNUSED__ unsigned int size)
+eina_chained_mempool_realloc(EINA_UNUSED void *data,
+                             EINA_UNUSED void *element,
+                             EINA_UNUSED unsigned int size)
 {
    return NULL;
 }
 
 static void *
 eina_chained_mempool_init(const char *context,
-                          __UNUSED__ const char *option,
+                          EINA_UNUSED const char *option,
                           va_list args)
 {
    Chained_Mempool *mp;
diff --git a/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c b/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
index 0d02f80bbb..9b2deb6e89 100644
--- a/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
+++ b/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
@@ -39,7 +39,7 @@ struct _Eina_Ememoa_Fixed_Mempool
 };
 
 static void *
-eina_ememoa_fixed_malloc(void *data, __UNUSED__ unsigned int size)
+eina_ememoa_fixed_malloc(void *data, EINA_UNUSED unsigned int size)
 {
    Eina_Ememoa_Fixed_Mempool *efm = data;
 
@@ -55,9 +55,9 @@ eina_ememoa_fixed_free(void *data, void *ptr)
 }
 
 static void *
-eina_ememoa_fixed_realloc(__UNUSED__ void *data,
-                          __UNUSED__ void *element,
-                          __UNUSED__ unsigned int size)
+eina_ememoa_fixed_realloc(EINA_UNUSED void *data,
+                          EINA_UNUSED void *element,
+                          EINA_UNUSED unsigned int size)
 {
    return NULL;
 }
@@ -81,7 +81,7 @@ eina_ememoa_fixed_statistics(void *data)
 
 static void *
 eina_ememoa_fixed_init(const char *context,
-                       __UNUSED__ const char *option,
+                       EINA_UNUSED const char *option,
                        va_list args)
 {
    struct ememoa_mempool_desc_s *desc = NULL;
diff --git a/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c b/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
index 56b99f66c9..736bcc1939 100644
--- a/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
+++ b/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
@@ -80,7 +80,7 @@ eina_ememoa_unknown_size_statistics(void *data)
 
 static void *
 eina_ememoa_unknown_size_init(const char *context,
-                              __UNUSED__ const char *option,
+                              EINA_UNUSED const char *option,
                               va_list args)
 {
    struct ememoa_mempool_desc_s *desc = NULL;
diff --git a/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c b/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
index e053e15790..1fd55348db 100644
--- a/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
+++ b/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
@@ -70,7 +70,7 @@ _eina_rbtree_inlist_delta(void)
 static Eina_Rbtree_Direction
 _eina_fixed_cmp(const Eina_Rbtree *left,
                 const Eina_Rbtree *right,
-                __UNUSED__ void *data)
+                EINA_UNUSED void *data)
 {
    if (left - right < 0)
       return EINA_RBTREE_LEFT;
@@ -81,7 +81,7 @@ _eina_fixed_cmp(const Eina_Rbtree *left,
 static int
 _eina_fixed_cmp_key(const Eina_Rbtree *node,
                     const void *key,
-                    __UNUSED__ int length,
+                    EINA_UNUSED int length,
                     Eina_Fixed_Bitmap *mp)
 {
    const void *a = node;
@@ -103,13 +103,13 @@ _eina_fixed_cmp_key(const Eina_Rbtree *node,
 
 static void
 _eina_fixed_bitmap_pool_free(Eina_Fixed_Bitmap_Pool *pool,
-                             __UNUSED__ void *data)
+                             EINA_UNUSED void *data)
 {
    free(pool);
 }
 
 static void *
-eina_fixed_bitmap_malloc(void *data, __UNUSED__ unsigned int size)
+eina_fixed_bitmap_malloc(void *data, EINA_UNUSED unsigned int size)
 {
    Eina_Fixed_Bitmap *mp = data;
    Eina_Fixed_Bitmap_Pool *pool = NULL;
@@ -200,16 +200,16 @@ eina_fixed_bitmap_free(void *data, void *ptr)
 }
 
 static void *
-eina_fixed_bitmap_realloc(__UNUSED__ void *data,
-                          __UNUSED__ void *element,
-                          __UNUSED__ unsigned int size)
+eina_fixed_bitmap_realloc(EINA_UNUSED void *data,
+                          EINA_UNUSED void *element,
+                          EINA_UNUSED unsigned int size)
 {
    return NULL;
 }
 
 static void *
-eina_fixed_bitmap_init(__UNUSED__ const char *context,
-                       __UNUSED__ const char *option,
+eina_fixed_bitmap_init(EINA_UNUSED const char *context,
+                       EINA_UNUSED const char *option,
                        va_list args)
 {
    Eina_Fixed_Bitmap *mp;
diff --git a/src/modules/eina/mp/one_big/eina_one_big.c b/src/modules/eina/mp/one_big/eina_one_big.c
index 1159378dee..c23c47837c 100644
--- a/src/modules/eina/mp/one_big/eina_one_big.c
+++ b/src/modules/eina/mp/one_big/eina_one_big.c
@@ -83,7 +83,7 @@ struct _One_Big
 };
 
 static void *
-eina_one_big_malloc(void *data, __UNUSED__ unsigned int size)
+eina_one_big_malloc(void *data, EINA_UNUSED unsigned int size)
 {
    One_Big *pool = data;
    unsigned char *mem = NULL;
@@ -198,16 +198,16 @@ eina_one_big_free(void *data, void *ptr)
 }
 
 static void *
-eina_one_big_realloc(__UNUSED__ void *data,
-                     __UNUSED__ void *element,
-                     __UNUSED__ unsigned int size)
+eina_one_big_realloc(EINA_UNUSED void *data,
+                     EINA_UNUSED void *element,
+                     EINA_UNUSED unsigned int size)
 {
    return NULL;
 }
 
 static void *
 eina_one_big_init(const char *context,
-                  __UNUSED__ const char *option,
+                  EINA_UNUSED const char *option,
                   va_list args)
 {
    One_Big *pool;
diff --git a/src/modules/eina/mp/pass_through/eina_pass_through.c b/src/modules/eina/mp/pass_through/eina_pass_through.c
index 196868ecba..9aa1f22842 100644
--- a/src/modules/eina/mp/pass_through/eina_pass_through.c
+++ b/src/modules/eina/mp/pass_through/eina_pass_through.c
@@ -28,33 +28,33 @@
 #include "eina_private.h"
 
 static void *
-eina_pass_through_malloc(__UNUSED__ void *data, unsigned int size)
+eina_pass_through_malloc(EINA_UNUSED void *data, unsigned int size)
 {
    return malloc(size);
 }
 
 static void
-eina_pass_through_free(__UNUSED__ void *data, void *ptr)
+eina_pass_through_free(EINA_UNUSED void *data, void *ptr)
 {
    free(ptr);
 }
 
 static void *
-eina_pass_through_realloc(__UNUSED__ void *data, void *ptr, unsigned int size)
+eina_pass_through_realloc(EINA_UNUSED void *data, void *ptr, unsigned int size)
 {
    return realloc(ptr, size);
 }
 
 static void *
-eina_pass_through_init(__UNUSED__ const char *context,
-                       __UNUSED__ const char *option,
-                       __UNUSED__ va_list args)
+eina_pass_through_init(EINA_UNUSED const char *context,
+                       EINA_UNUSED const char *option,
+                       EINA_UNUSED va_list args)
 {
    return (void *)0x1;
 }
 
 static void
-eina_pass_through_shutdown(__UNUSED__ void *data)
+eina_pass_through_shutdown(EINA_UNUSED void *data)
 {
 }