aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/benchmarks/eina/eina_bench_array.c12
-rw-r--r--src/benchmarks/eina/eina_bench_hash.c10
-rw-r--r--src/benchmarks/eina/evas_mempool.c2
-rw-r--r--src/examples/eo/Makefile.am4
-rw-r--r--src/examples/eo/evas/evas_elw_box.c4
-rw-r--r--src/examples/eo/evas/evas_elw_boxedbutton.c8
-rw-r--r--src/examples/eo/evas/evas_elw_button.c4
-rw-r--r--src/examples/eo/evas/evas_elw_win.c4
-rw-r--r--src/examples/eo/evas/evas_evas_obj.c2
-rw-r--r--src/examples/eo/evas/evas_test.c10
-rw-r--r--src/lib/eet/eet_data.c60
-rw-r--r--src/lib/eet/eet_image.c6
-rw-r--r--src/lib/eina/eina_file.c8
-rw-r--r--src/lib/eina/eina_file_win32.c16
-rw-r--r--src/lib/eina/eina_hash.c30
-rw-r--r--src/lib/eina/eina_list.c4
-rw-r--r--src/lib/eina/eina_log.c30
-rw-r--r--src/lib/eina/eina_mmap.c4
-rw-r--r--src/lib/eina/eina_model.c8
-rw-r--r--src/lib/eina/eina_object.c4
-rw-r--r--src/lib/eina/eina_share_common.c38
-rw-r--r--src/lib/eina/eina_str.c6
-rw-r--r--src/lib/eina/eina_strbuf_common.c2
-rw-r--r--src/lib/eina/eina_tiler.c4
-rw-r--r--src/lib/eina/eina_types.h14
-rw-r--r--src/lib/eina/eina_value.c326
-rw-r--r--src/lib/eina/eina_xattr.c2
-rw-r--r--src/lib/eo/Makefile.am6
-rw-r--r--src/lib/evil/dlfcn.c5
-rw-r--r--src/lib/evil/evil_mman.c5
-rw-r--r--src/lib/evil/evil_private.h8
-rw-r--r--src/lib/evil/evil_stdio.c2
-rw-r--r--src/lib/evil/evil_string.c3
-rw-r--r--src/lib/evil/evil_unistd.c4
-rw-r--r--src/modules/eina/mp/buddy/eina_buddy.c4
-rw-r--r--src/modules/eina/mp/chained_pool/eina_chained_mempool.c14
-rw-r--r--src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c10
-rw-r--r--src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c2
-rw-r--r--src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c18
-rw-r--r--src/modules/eina/mp/one_big/eina_one_big.c10
-rw-r--r--src/modules/eina/mp/pass_through/eina_pass_through.c14
-rw-r--r--src/tests/eet/eet_suite.c14
-rw-r--r--src/tests/eina/eina_test_accessor.c6
-rw-r--r--src/tests/eina/eina_test_counter.c2
-rw-r--r--src/tests/eina/eina_test_error.c2
-rw-r--r--src/tests/eina/eina_test_file.c2
-rw-r--r--src/tests/eina/eina_test_hash.c4
-rw-r--r--src/tests/eina/eina_test_inarray.c4
-rw-r--r--src/tests/eina/eina_test_inlist.c2
-rw-r--r--src/tests/eina/eina_test_iterator.c20
-rw-r--r--src/tests/eina/eina_test_log.c6
-rw-r--r--src/tests/eina/eina_test_magic.c4
-rw-r--r--src/tests/eina/eina_test_matrixsparse.c8
-rw-r--r--src/tests/eina/eina_test_module.c2
-rw-r--r--src/tests/eina/eina_test_rbtree.c6
-rw-r--r--src/tests/eina/eina_test_sched.c2
-rw-r--r--src/tests/eina/eina_test_ustr.c2
-rw-r--r--src/tests/eo/Makefile.am2
58 files changed, 423 insertions, 392 deletions
diff --git a/src/benchmarks/eina/eina_bench_array.c b/src/benchmarks/eina/eina_bench_array.c
index 425eddd94..5b974d124 100644
--- a/src/benchmarks/eina/eina_bench_array.c
+++ b/src/benchmarks/eina/eina_bench_array.c
@@ -47,7 +47,7 @@ struct _Eina_Bench_Object
Eina_Bool keep;
};
-static Eina_Bool keep(void *data, __UNUSED__ void *gdata)
+static Eina_Bool keep(void *data, EINA_UNUSED void *gdata)
{
Eina_Bench_Object *bo = data;
@@ -109,16 +109,16 @@ eina_bench_array_4evas_render_inline(int request)
}
static Eina_Bool
-eina_iterator_ebo_free(__UNUSED__ const Eina_Array *array,
- Eina_Bench_Object *ebo, __UNUSED__ void *fdata)
+eina_iterator_ebo_free(EINA_UNUSED const Eina_Array *array,
+ Eina_Bench_Object *ebo, EINA_UNUSED void *fdata)
{
free(ebo);
return EINA_TRUE;
}
static Eina_Bool
-eina_iterator_ebo_rand(__UNUSED__ const void *container,
- Eina_Bench_Object *ebo, __UNUSED__ void *fdata)
+eina_iterator_ebo_rand(EINA_UNUSED const void *container,
+ Eina_Bench_Object *ebo, EINA_UNUSED void *fdata)
{
ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE;
return EINA_TRUE;
@@ -609,7 +609,7 @@ _eina_ecore_for_each_remove(void *value, void *user_data)
}
static void
-_eina_ecore_for_each_rand(void *value, __UNUSED__ void *user_data)
+_eina_ecore_for_each_rand(void *value, EINA_UNUSED void *user_data)
{
Eina_Bench_Object *ebo = value;
diff --git a/src/benchmarks/eina/eina_bench_hash.c b/src/benchmarks/eina/eina_bench_hash.c
index 0429097c7..e0e977450 100644
--- a/src/benchmarks/eina/eina_bench_hash.c
+++ b/src/benchmarks/eina/eina_bench_hash.c
@@ -52,8 +52,8 @@ _eina_string_key_length(const char *key)
}
static int
-_eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length,
- const char *key2, __UNUSED__ int key2_length)
+_eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length,
+ const char *key2, EINA_UNUSED int key2_length)
{
return strcmp(key1, key2);
}
@@ -71,7 +71,7 @@ struct _Eina_Bench_Rbtree
static Eina_Rbtree_Direction
_eina_bench_rbtree_cmp(const Eina_Bench_Rbtree *left,
const Eina_Bench_Rbtree *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
if (!left)
return EINA_RBTREE_RIGHT;
@@ -87,13 +87,13 @@ static inline int
_eina_bench_rbtree_key(const Eina_Bench_Rbtree *node,
const char *key,
int length,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
return strncmp(node->key, key, length);
}
static void
-_eina_bench_rbtree_free(Eina_Rbtree *node, __UNUSED__ void *data)
+_eina_bench_rbtree_free(Eina_Rbtree *node, EINA_UNUSED void *data)
{
free(node);
}
diff --git a/src/benchmarks/eina/evas_mempool.c b/src/benchmarks/eina/evas_mempool.c
index 709821464..921b7dfaf 100644
--- a/src/benchmarks/eina/evas_mempool.c
+++ b/src/benchmarks/eina/evas_mempool.c
@@ -56,7 +56,7 @@ _evas_mp_pool_free(Pool *p)
}
void *
-evas_mempool_malloc(Evas_Mempool *pool, int size __UNUSED__)
+evas_mempool_malloc(Evas_Mempool *pool, int size EINA_UNUSED)
{
#ifdef NOPOOL
return malloc(size);
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index d7719be5b..2a2072e45 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I. \
+-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
@@ -30,6 +32,8 @@ eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
if EO_BUILD_EXAMPLE_EVAS
+AM_CPPFLAGS += @ELM_CFLAGS@
+
eo_evas_SOURCES = \
evas/evas_elw_box.c \
evas/evas_elw_box.h \
diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c
index 1a2330f84..3efaded84 100644
--- a/src/examples/eo/evas/evas_elw_box.c
+++ b/src/examples/eo/evas/evas_elw_box.c
@@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
-#include "evas_obj.h"
-#include "elw_box.h"
+#include "evas_evas_obj.h"
+#include "evas_elw_box.h"
EAPI Eo_Op ELW_BOX_BASE_ID = 0;
diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c
index 457dba892..f6a14640f 100644
--- a/src/examples/eo/evas/evas_elw_boxedbutton.c
+++ b/src/examples/eo/evas/evas_elw_boxedbutton.c
@@ -5,10 +5,10 @@
#include <Elementary.h>
#include "Eo.h"
-#include "evas_obj.h"
-#include "elw_box.h"
-#include "elw_button.h"
-#include "elw_boxedbutton.h"
+#include "evas_evas_obj.h"
+#include "evas_elw_box.h"
+#include "evas_elw_button.h"
+#include "evas_elw_boxedbutton.h"
typedef struct
{
diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c
index 82fa39b35..6ee294f98 100644
--- a/src/examples/eo/evas/evas_elw_button.c
+++ b/src/examples/eo/evas/evas_elw_button.c
@@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
-#include "evas_obj.h"
-#include "elw_button.h"
+#include "evas_evas_obj.h"
+#include "evas_elw_button.h"
EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c
index dd9e1002f..25065212e 100644
--- a/src/examples/eo/evas/evas_elw_win.c
+++ b/src/examples/eo/evas/evas_elw_win.c
@@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
-#include "evas_obj.h"
-#include "elw_win.h"
+#include "evas_evas_obj.h"
+#include "evas_elw_win.h"
typedef struct
{
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c
index 9d13c6681..3d5a1834a 100644
--- a/src/examples/eo/evas/evas_evas_obj.c
+++ b/src/examples/eo/evas/evas_evas_obj.c
@@ -5,7 +5,7 @@
#include <Elementary.h>
#include "Eo.h"
-#include "evas_obj.h"
+#include "evas_evas_obj.h"
#define MY_CLASS EXEVAS_OBJ_CLASS
diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c
index 7a5751367..1502e31dd 100644
--- a/src/examples/eo/evas/evas_test.c
+++ b/src/examples/eo/evas/evas_test.c
@@ -4,11 +4,11 @@
#include <Elementary.h>
-#include "evas_obj.h"
-#include "elw_button.h"
-#include "elw_box.h"
-#include "elw_boxedbutton.h"
-#include "elw_win.h"
+#include "evas_evas_obj.h"
+#include "evas_elw_button.h"
+#include "evas_elw_box.h"
+#include "evas_elw_boxedbutton.h"
+#include "evas_elw_win.h"
Eina_Bool
_btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index f99535316..6cf8a3dbe 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -624,7 +624,7 @@ static int _eet_data_words_bigendian = -1;
/* CHAR TYPE */
static int
-eet_data_get_char(const Eet_Dictionary *ed __UNUSED__,
+eet_data_get_char(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@@ -642,7 +642,7 @@ eet_data_get_char(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
+eet_data_put_char(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@@ -661,7 +661,7 @@ eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
/* SHORT TYPE */
static int
-eet_data_get_short(const Eet_Dictionary *ed __UNUSED__,
+eet_data_get_short(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@@ -678,7 +678,7 @@ eet_data_get_short(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
+eet_data_put_short(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@@ -697,7 +697,7 @@ eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
/* INT TYPE */
static inline int
-eet_data_get_int(const Eet_Dictionary *ed __UNUSED__,
+eet_data_get_int(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@@ -714,7 +714,7 @@ eet_data_get_int(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
+eet_data_put_int(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@@ -733,7 +733,7 @@ eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
/* LONG LONG TYPE */
static int
-eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__,
+eet_data_get_long_long(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@@ -750,7 +750,7 @@ eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__,
+eet_data_put_long_long(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@@ -863,7 +863,7 @@ eet_data_put_string(Eet_Dictionary *ed,
/* ALWAYS INLINED STRING TYPE */
static int
-eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__,
+eet_data_get_istring(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@@ -872,7 +872,7 @@ eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
+eet_data_put_istring(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@@ -881,9 +881,9 @@ eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
/* ALWAYS NULL TYPE */
static int
-eet_data_get_null(const Eet_Dictionary *ed __UNUSED__,
- const void *src __UNUSED__,
- const void *src_end __UNUSED__,
+eet_data_get_null(const Eet_Dictionary *ed EINA_UNUSED,
+ const void *src EINA_UNUSED,
+ const void *src_end EINA_UNUSED,
void *dst)
{
char **d;
@@ -895,8 +895,8 @@ eet_data_get_null(const Eet_Dictionary *ed __UNUSED__,
}
static void *
-eet_data_put_null(Eet_Dictionary *ed __UNUSED__,
- const void *src __UNUSED__,
+eet_data_put_null(Eet_Dictionary *ed EINA_UNUSED,
+ const void *src EINA_UNUSED,
int *size_ret)
{
*size_ret = 0;
@@ -1725,7 +1725,7 @@ _eet_str_direct_alloc(const char *str)
}
static void
-_eet_str_direct_free(const char *str __UNUSED__)
+_eet_str_direct_free(const char *str EINA_UNUSED)
{
}
@@ -2512,7 +2512,7 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context)
}
static int
-eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__,
+eet_data_descriptor_encode_hash_cb(void *hash EINA_UNUSED,
const char *cipher_key,
void *hdata,
void *fdata)
@@ -3506,7 +3506,7 @@ eet_data_get_list(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
- int group_type __UNUSED__,
+ int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@@ -3573,7 +3573,7 @@ eet_data_get_hash(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
- int group_type __UNUSED__,
+ int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@@ -3817,7 +3817,7 @@ on_error:
static void
eet_data_put_union(Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@@ -3874,7 +3874,7 @@ eet_data_put_union(Eet_Dictionary *ed,
static int
eet_data_get_union(Eet_Free_Context *context,
const Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
@@ -3971,7 +3971,7 @@ on_error:
static void
eet_data_put_variant(Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@@ -4083,11 +4083,11 @@ eet_data_put_variant(Eet_Dictionary *ed,
static int
eet_data_get_variant(Eet_Free_Context *context,
const Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
- int type __UNUSED__,
- int group_type __UNUSED__,
+ int type EINA_UNUSED,
+ int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@@ -4279,10 +4279,10 @@ eet_data_get_unknown(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
- int group_type __UNUSED__,
+ int group_type EINA_UNUSED,
void *data,
- char **p __UNUSED__,
- int *size __UNUSED__)
+ char **p EINA_UNUSED,
+ int *size EINA_UNUSED)
{
int ret;
void *data_ret;
@@ -4390,7 +4390,7 @@ eet_data_get_unknown(Eet_Free_Context *context,
static void
eet_data_put_array(Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@@ -4466,7 +4466,7 @@ eet_data_put_array(Eet_Dictionary *ed,
static void
eet_data_put_unknown(Eet_Dictionary *ed,
- Eet_Data_Descriptor *edd __UNUSED__,
+ Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 7116a3cd3..149fa1aa2 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -342,7 +342,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo)
}
static void
-_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
+_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED)
{
/* emptr errmgr; */
@@ -353,8 +353,8 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
}
static void
-_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__,
- int msg_level __UNUSED__)
+_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED,
+ int msg_level EINA_UNUSED)
{
/* emptr errmgr; */
diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c
index d34f917b1..ea382d73c 100644
--- a/src/lib/eina/eina_file.c
+++ b/src/lib/eina/eina_file.c
@@ -402,21 +402,21 @@ _eina_file_map_close(Eina_File_Map *map)
}
static unsigned int
-_eina_file_map_key_length(const void *key __UNUSED__)
+_eina_file_map_key_length(const void *key EINA_UNUSED)
{
return sizeof (unsigned long int) * 2;
}
static int
-_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__,
- const unsigned long int *key2, int key2_length __UNUSED__)
+_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED,
+ const unsigned long int *key2, int key2_length EINA_UNUSED)
{
if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
return key1[0] - key2[0];
}
static int
-_eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__)
+_eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED)
{
return eina_hash_int64(&key[0], sizeof (unsigned long int))
^ eina_hash_int64(&key[1], sizeof (unsigned long int));
diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c
index 61bd0d19e..927ca7758 100644
--- a/src/lib/eina/eina_file_win32.c
+++ b/src/lib/eina/eina_file_win32.c
@@ -469,21 +469,21 @@ _eina_file_map_close(Eina_File_Map *map)
}
static unsigned int
-_eina_file_map_key_length(const void *key __UNUSED__)
+_eina_file_map_key_length(const void *key EINA_UNUSED)
{
return sizeof (unsigned long int) * 2;
}
static int
-_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__,
- const unsigned long int *key2, int key2_length __UNUSED__)
+_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED,
+ const unsigned long int *key2, int key2_length EINA_UNUSED)
{
if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
return key1[0] - key2[0];
}
static int
-_eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__)
+_eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED)
{
return eina_hash_int64(&key[0], sizeof (unsigned long int))
^ eina_hash_int64(&key[1], sizeof (unsigned long int));
@@ -1122,18 +1122,18 @@ eina_file_filename_get(Eina_File *file)
return file->filename;
}
-EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file __UNUSED__)
+EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file EINA_UNUSED)
{
return NULL;
}
-EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file __UNUSED__)
+EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file EINA_UNUSED)
{
return NULL;
}
EAPI void *
-eina_file_map_all(Eina_File *file, Eina_File_Populate rule __UNUSED__)
+eina_file_map_all(Eina_File *file, Eina_File_Populate rule EINA_UNUSED)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL);
@@ -1342,7 +1342,7 @@ eina_file_map_faulted(Eina_File *file, void *map)
}
EAPI int
-eina_file_statat(void *container __UNUSED__, Eina_File_Direct_Info *info, Eina_Stat *st)
+eina_file_statat(void *container EINA_UNUSED, Eina_File_Direct_Info *info, Eina_Stat *st)
{
struct __stat64 buf;
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 821d2254d..594d54ac4 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -156,8 +156,8 @@ struct _Eina_Hash_Each
static inline int
_eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head,
const int *hash,
- __UNUSED__ int key_length,
- __UNUSED__ void *data)
+ EINA_UNUSED int key_length,
+ EINA_UNUSED void *data)
{
return hash_head->hash - *hash;
}
@@ -165,7 +165,7 @@ _eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head,
static Eina_Rbtree_Direction
_eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left,
const Eina_Hash_Head *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
if (left->hash - right->hash < 0)
return EINA_RBTREE_LEFT;
@@ -176,7 +176,7 @@ _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left,
static inline int
_eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element,
const Eina_Hash_Tuple *tuple,
- __UNUSED__ unsigned int key_length,
+ EINA_UNUSED unsigned int key_length,
Eina_Key_Cmp cmp)
{
int result;
@@ -307,7 +307,7 @@ on_error:
}
static Eina_Bool
-_eina_hash_rbtree_each(__UNUSED__ const Eina_Rbtree *container,
+_eina_hash_rbtree_each(EINA_UNUSED const Eina_Rbtree *container,
const Eina_Hash_Head *hash_head,
Eina_Hash_Each *data)
{
@@ -507,41 +507,41 @@ _eina_string_key_length(const char *key)
}
static int
-_eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length,
- const char *key2, __UNUSED__ int key2_length)
+_eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length,
+ const char *key2, EINA_UNUSED int key2_length)
{
return strcmp(key1, key2);
}
static int
-_eina_stringshared_key_cmp(const char *key1, __UNUSED__ int key1_length,
- const char *key2, __UNUSED__ int key2_length)
+_eina_stringshared_key_cmp(const char *key1, EINA_UNUSED int key1_length,
+ const char *key2, EINA_UNUSED int key2_length)
{
return key1 - key2;
}
static unsigned int
-_eina_int32_key_length(__UNUSED__ const uint32_t *key)
+_eina_int32_key_length(EINA_UNUSED const uint32_t *key)
{
return 4;
}
static int
-_eina_int32_key_cmp(const uint32_t *key1, __UNUSED__ int key1_length,
- const uint32_t *key2, __UNUSED__ int key2_length)
+_eina_int32_key_cmp(const uint32_t *key1, EINA_UNUSED int key1_length,
+ const uint32_t *key2, EINA_UNUSED int key2_length)
{
return *key1 - *key2;
}
static unsigned int
-_eina_int64_key_length(__UNUSED__ const uint32_t *key)
+_eina_int64_key_length(EINA_UNUSED const uint32_t *key)
{
return 8;
}
static int
-_eina_int64_key_cmp(const uint64_t *key1, __UNUSED__ int key1_length,
- const uint64_t *key2, __UNUSED__ int key2_length)
+_eina_int64_key_cmp(const uint64_t *key1, EINA_UNUSED int key1_length,
+ const uint64_t *key2, EINA_UNUSED int key2_length)
{
return *key1 - *key2;
}
diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c
index 7ef219def..01871b20f 100644
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@@ -168,7 +168,7 @@ static int _eina_list_log_dom = -1;
#define DBG(...) EINA_LOG_DOM_DBG(_eina_list_log_dom, __VA_ARGS__)
static inline Eina_List_Accounting *
-_eina_list_mempool_accounting_new(__UNUSED__ Eina_List *list)
+_eina_list_mempool_accounting_new(EINA_UNUSED Eina_List *list)
{
Eina_List_Accounting *tmp;
@@ -192,7 +192,7 @@ _eina_list_mempool_accounting_free(Eina_List_Accounting *accounting)
}
static inline Eina_List *
-_eina_list_mempool_list_new(__UNUSED__ Eina_List *list)
+_eina_list_mempool_list_new(EINA_UNUSED Eina_List *list)
{
Eina_List *tmp;
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 4316eae30..bd2e52d32 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -467,9 +467,9 @@ static void
eina_log_print_prefix_NOthreads_NOcolor_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
- const char *file __UNUSED__,
+ const char *file EINA_UNUSED,
const char *fnc,
- int line __UNUSED__)
+ int line EINA_UNUSED)
{
DECLARE_LEVEL_NAME(level);
fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str,
@@ -481,7 +481,7 @@ eina_log_print_prefix_NOthreads_NOcolor_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
- const char *fnc __UNUSED__,
+ const char *fnc EINA_UNUSED,
int line)
{
DECLARE_LEVEL_NAME(level);
@@ -535,9 +535,9 @@ static void
eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
- const char *file __UNUSED__,
+ const char *file EINA_UNUSED,
const char *fnc,
- int line __UNUSED__)
+ int line EINA_UNUSED)
{
DECLARE_LEVEL_NAME_COLOR(level);
#ifdef _WIN32_WCE
@@ -574,7 +574,7 @@ eina_log_print_prefix_NOthreads_color_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
- const char *fnc __UNUSED__,
+ const char *fnc EINA_UNUSED,
int line)
{
DECLARE_LEVEL_NAME_COLOR(level);
@@ -630,9 +630,9 @@ static void
eina_log_print_prefix_threads_NOcolor_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
- const char *file __UNUSED__,
+ const char *file EINA_UNUSED,
const char *fnc,
- int line __UNUSED__)
+ int line EINA_UNUSED)
{
Thread cur;
@@ -654,7 +654,7 @@ eina_log_print_prefix_threads_NOcolor_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
- const char *fnc __UNUSED__,
+ const char *fnc EINA_UNUSED,
int line)
{
Thread cur;
@@ -752,9 +752,9 @@ static void
eina_log_print_prefix_threads_color_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
- const char *file __UNUSED__,
+ const char *file EINA_UNUSED,
const char *fnc,
- int line __UNUSED__)
+ int line EINA_UNUSED)
{
Thread cur;
@@ -822,7 +822,7 @@ eina_log_print_prefix_threads_color_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
- const char *fnc __UNUSED__,
+ const char *fnc EINA_UNUSED,
int line)
{
Thread cur;
@@ -1887,7 +1887,7 @@ eina_log_print_cb_stderr(const Eina_Log_Domain *d,
const char *fnc,
int line,
const char *fmt,
- __UNUSED__ void *data,
+ EINA_UNUSED void *data,
va_list args)
{
#ifdef EINA_ENABLE_LOG
@@ -1914,7 +1914,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d,
const char *fnc,
int line,
const char *fmt,
- __UNUSED__ void *data,
+ EINA_UNUSED void *data,
va_list args)
{
#ifdef EINA_ENABLE_LOG
@@ -1936,7 +1936,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d,
EAPI void
eina_log_print_cb_file(const Eina_Log_Domain *d,
- __UNUSED__ Eina_Log_Level level,
+ EINA_UNUSED Eina_Log_Level level,
const char *file,
const char *fnc,
int line,
diff --git a/src/lib/eina/eina_mmap.c b/src/lib/eina/eina_mmap.c
index 90809a23b..0c4dec6b4 100644
--- a/src/lib/eina/eina_mmap.c
+++ b/src/lib/eina/eina_mmap.c
@@ -76,9 +76,9 @@ static long _eina_mmap_pagesize = -1;
#define DBG(...) EINA_LOG_DOM_DBG(_eina_mmap_log_dom, __VA_ARGS__)
static void
-_eina_mmap_safe_sigbus(int sig __UNUSED__,
+_eina_mmap_safe_sigbus(int sig EINA_UNUSED,
siginfo_t *siginfo,
- void *ptr __UNUSED__)
+ void *ptr EINA_UNUSED)
{
unsigned char *addr = (unsigned char *)(siginfo->si_addr);
int perrno;
diff --git a/src/lib/eina/eina_model.c b/src/lib/eina/eina_model.c
index 22ca71867..16293284c 100644
--- a/src/lib/eina/eina_model.c
+++ b/src/lib/eina/eina_model.c
@@ -2465,7 +2465,7 @@ _eina_model_interface_properties_hash_constructor(Eina_Model *model)
}
static Eina_Bool
-_eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
{
eina_value_free(data);
return EINA_TRUE;
@@ -2551,7 +2551,7 @@ _eina_model_interface_properties_hash_del(Eina_Model *model, const char *name)
}
static Eina_Bool
-_eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata)
+_eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata)
{
Eina_List **p_list = fdata;
*p_list = eina_list_append(*p_list, eina_stringshare_add(key));
@@ -2686,7 +2686,7 @@ _eina_model_interface_properties_struct_set(Eina_Model *model, const char *name,
}
static Eina_Bool
-_eina_model_interface_properties_struct_del(Eina_Model *model __UNUSED__, const char *name __UNUSED__)
+_eina_model_interface_properties_struct_del(Eina_Model *model EINA_UNUSED, const char *name EINA_UNUSED)
{
return EINA_FALSE; /* not allowed */
}
@@ -4888,7 +4888,7 @@ eina_model_type_subclass_check(const Eina_Model_Type *type, const Eina_Model_Typ
}
static inline const Eina_Model_Interface *
-_eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp __UNUSED__)
+_eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp EINA_UNUSED)
{
const Eina_Model_Interface **itr;
diff --git a/src/lib/eina/eina_object.c b/src/lib/eina/eina_object.c
index f82aef39b..218c9e0d4 100644
--- a/src/lib/eina/eina_object.c
+++ b/src/lib/eina/eina_object.c
@@ -176,7 +176,7 @@ static unsigned int _eina_object_item_size = 0;
static int
_eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key,
- __UNUSED__ int length, __UNUSED__ void *data)
+ EINA_UNUSED int length, EINA_UNUSED void *data)
{
Eina_Class_Range *range;
Eina_Object_ID id;
@@ -192,7 +192,7 @@ _eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key,
static Eina_Rbtree_Direction
_eina_class_direction_range(const Eina_Rbtree *left,
const Eina_Rbtree *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
Eina_Class_Range *rl;
Eina_Class_Range *rr;
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 91ad0dbaf..c68e399cc 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -305,31 +305,31 @@ _eina_share_common_population_head_del(Eina_Share *share,
#else /* EINA_SHARE_COMMON_USAGE undefined */
-static void _eina_share_common_population_init(__UNUSED__ Eina_Share *share) {
+static void _eina_share_common_population_init(EINA_UNUSED Eina_Share *share) {
}
-static void _eina_share_common_population_shutdown(__UNUSED__ Eina_Share *share)
+static void _eina_share_common_population_shutdown(EINA_UNUSED Eina_Share *share)
{
}
-static void _eina_share_common_population_stats(__UNUSED__ Eina_Share *share) {
+static void _eina_share_common_population_stats(EINA_UNUSED Eina_Share *share) {
}
-void eina_share_common_population_add(__UNUSED__ Eina_Share *share,
- __UNUSED__ int slen) {
+void eina_share_common_population_add(EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED int slen) {
}
-void eina_share_common_population_del(__UNUSED__ Eina_Share *share,
- __UNUSED__ int slen) {
+void eina_share_common_population_del(EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED int slen) {
}
static void _eina_share_common_population_head_init(
- __UNUSED__ Eina_Share *share,
- __UNUSED__ Eina_Share_Common_Head *head) {
+ EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED Eina_Share_Common_Head *head) {
}
static void _eina_share_common_population_head_add(
- __UNUSED__ Eina_Share *share,
- __UNUSED__
+ EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED
Eina_Share_Common_Head *head) {
}
static void _eina_share_common_population_head_del(
- __UNUSED__ Eina_Share *share,
- __UNUSED__
+ EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED
Eina_Share_Common_Head *head) {
}
#endif
@@ -337,8 +337,8 @@ static void _eina_share_common_population_head_del(
static int
_eina_share_common_cmp(const Eina_Share_Common_Head *ed,
const int *hash,
- __UNUSED__ int length,
- __UNUSED__ void *data)
+ EINA_UNUSED int length,
+ EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, , 0);
@@ -348,7 +348,7 @@ _eina_share_common_cmp(const Eina_Share_Common_Head *ed,
static Eina_Rbtree_Direction
_eina_share_common_node(const Eina_Share_Common_Head *left,
const Eina_Share_Common_Head *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(left, , 0);
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(right, , 0);
@@ -360,7 +360,7 @@ _eina_share_common_node(const Eina_Share_Common_Head *left,
}
static void
-_eina_share_common_head_free(Eina_Share_Common_Head *ed, __UNUSED__ void *data)
+_eina_share_common_head_free(Eina_Share_Common_Head *ed, EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, );
@@ -546,7 +546,7 @@ _eina_share_common_node_from_str(const char *str, Eina_Magic node_magic)
}
static Eina_Bool
-eina_iterator_array_check(const Eina_Rbtree *rbtree __UNUSED__,
+eina_iterator_array_check(const Eina_Rbtree *rbtree EINA_UNUSED,
Eina_Share_Common_Head *head,
struct dumpinfo *fdata)
{
@@ -867,7 +867,7 @@ on_error:
}
int
-eina_share_common_length(__UNUSED__ Eina_Share *share, const char *str)
+eina_share_common_length(EINA_UNUSED Eina_Share *share, const char *str)
{
const Eina_Share_Common_Node *node;
diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c
index 5db38394b..65389c7cd 100644
--- a/src/lib/eina/eina_str.c
+++ b/src/lib/eina/eina_str.c
@@ -514,9 +514,9 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
}
#else
EAPI char *
-eina_str_convert(const char *enc_from __UNUSED__,
- const char *enc_to __UNUSED__,
- const char *text __UNUSED__)
+eina_str_convert(const char *enc_from EINA_UNUSED,
+ const char *enc_to EINA_UNUSED,
+ const char *text EINA_UNUSED)
{
return NULL;
}
diff --git a/src/lib/eina/eina_strbuf_common.c b/src/lib/eina/eina_strbuf_common.c
index 64c2c1418..31ad6832c 100644
--- a/src/lib/eina/eina_strbuf_common.c
+++ b/src/lib/eina/eina_strbuf_common.c
@@ -109,7 +109,7 @@ _eina_strbuf_common_init(size_t csize, Eina_Strbuf *buf)
* @return #EINA_TRUE on success, #EINA_FALSE on failure.
*/
static Eina_Bool
-_eina_strbuf_common_manage_init(size_t csize __UNUSED__,
+_eina_strbuf_common_manage_init(size_t csize EINA_UNUSED,
Eina_Strbuf *buf,
void *str,
size_t len)
diff --git a/src/lib/eina/eina_tiler.c b/src/lib/eina/eina_tiler.c
index b436ba658..2afb4f7a2 100644
--- a/src/lib/eina/eina_tiler.c
+++ b/src/lib/eina/eina_tiler.c
@@ -997,8 +997,8 @@ static inline void _splitter_del(Eina_Tiler *t)
}
static inline void _splitter_tile_size_set(Eina_Tiler *t,
- int w __UNUSED__,
- int h __UNUSED__)
+ int w EINA_UNUSED,
+ int h EINA_UNUSED)
{
/* TODO are w and h used for something? */
t->splitter.rects = list_zeroed;
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 9e3a6f153..d74d200a3 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -164,10 +164,11 @@
# define EINA_SENTINEL
# endif
-#elif defined(_WIN32)
+#elif defined(_MSC_VER)
+# define EINA_UNUSED
# define EINA_WARN_UNUSED_RESULT
# define EINA_ARG_NONNULL(...)
-# if defined(_MSC_VER) && _MSC_VER >= 1300
+# if _MSC_VER >= 1300
# define EINA_DEPRECATED __declspec(deprecated)
# else
# define EINA_DEPRECATED
@@ -184,6 +185,7 @@
# define EINA_SENTINEL
#elif defined(__SUNPRO_C)
+# define EINA_UNUSED
# define EINA_WARN_UNUSED_RESULT
# define EINA_ARG_NONNULL(...)
# define EINA_DEPRECATED
@@ -207,7 +209,13 @@
# define EINA_LIKELY(exp) exp
# define EINA_SENTINEL
-#else /* ! __GNUC__ && ! _WIN32 && ! __SUNPRO_C */
+#else /* ! __GNUC__ && ! _MSC_VER && ! __SUNPRO_C */
+
+/**
+ * @def EINA_UNUSED
+ * Used to warn when an argument of the function is not used.
+ */
+# define EINA_UNUSED
/**
* @def EINA_WARN_UNUSED_RESULT
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index 9b132b7fe..d6446cca5 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -112,7 +112,7 @@ static const long eina_value_long_min = -2147483647 - 1;
static Eina_Bool
-_eina_value_type_uchar_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_uchar_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
unsigned char *tmem = mem;
*tmem = 0;
@@ -120,13 +120,13 @@ _eina_value_type_uchar_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_uchar_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_uchar_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_uchar_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_uchar_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const unsigned char *s = src;
unsigned char *d = dst;
@@ -135,7 +135,7 @@ _eina_value_type_uchar_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_uchar_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_uchar_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const unsigned char *ta = a, *tb = b;
if (*ta < *tb)
@@ -146,7 +146,7 @@ _eina_value_type_uchar_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_uchar_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_uchar_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const unsigned char v = *(const unsigned char *)type_mem;
@@ -233,7 +233,7 @@ _eina_value_type_uchar_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_uchar_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_uchar_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
unsigned char *tmem = mem;
*tmem = va_arg(args, unsigned int); /* char is promoted to int for va_arg */
@@ -241,7 +241,7 @@ _eina_value_type_uchar_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_uchar_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_uchar_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
unsigned char *tmem = mem;
const unsigned char *p = ptr;
@@ -250,7 +250,7 @@ _eina_value_type_uchar_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_uchar_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_uchar_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const unsigned char *tmem = mem;
unsigned char *p = ptr;
@@ -259,7 +259,7 @@ _eina_value_type_uchar_pget(const Eina_Value_Type *type __UNUSED__, const void *
}
static Eina_Bool
-_eina_value_type_ushort_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_ushort_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
unsigned short *tmem = mem;
*tmem = 0;
@@ -267,13 +267,13 @@ _eina_value_type_ushort_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_ushort_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_ushort_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_ushort_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_ushort_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const unsigned short *s = src;
unsigned short *d = dst;
@@ -282,7 +282,7 @@ _eina_value_type_ushort_copy(const Eina_Value_Type *type __UNUSED__, const void
}
static int
-_eina_value_type_ushort_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_ushort_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const unsigned short *ta = a, *tb = b;
if (*ta < *tb)
@@ -293,7 +293,7 @@ _eina_value_type_ushort_compare(const Eina_Value_Type *type __UNUSED__, const vo
}
static Eina_Bool
-_eina_value_type_ushort_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_ushort_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const unsigned short v = *(const unsigned short *)type_mem;
@@ -384,7 +384,7 @@ _eina_value_type_ushort_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_ushort_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_ushort_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
unsigned short *tmem = mem;
*tmem = va_arg(args, unsigned int); /* short is promoted to int for va_arg */
@@ -392,7 +392,7 @@ _eina_value_type_ushort_vset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_ushort_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_ushort_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
unsigned short *tmem = mem;
const unsigned short *p = ptr;
@@ -401,7 +401,7 @@ _eina_value_type_ushort_pset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_ushort_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_ushort_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const unsigned short *tmem = mem;
unsigned short *p = ptr;
@@ -410,7 +410,7 @@ _eina_value_type_ushort_pget(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_uint_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_uint_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
unsigned int *tmem = mem;
*tmem = 0;
@@ -418,13 +418,13 @@ _eina_value_type_uint_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_uint_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_uint_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_uint_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_uint_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const unsigned int *s = src;
unsigned int *d = dst;
@@ -433,7 +433,7 @@ _eina_value_type_uint_copy(const Eina_Value_Type *type __UNUSED__, const void *s
}
static int
-_eina_value_type_uint_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_uint_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const unsigned int *ta = a, *tb = b;
if (*ta < *tb)
@@ -444,7 +444,7 @@ _eina_value_type_uint_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_uint_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_uint_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const unsigned int v = *(const unsigned int *)type_mem;
@@ -539,7 +539,7 @@ _eina_value_type_uint_convert_to(const Eina_Value_Type *type __UNUSED__, const E
}
static Eina_Bool
-_eina_value_type_uint_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_uint_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
unsigned int *tmem = mem;
*tmem = va_arg(args, unsigned int);
@@ -547,7 +547,7 @@ _eina_value_type_uint_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va
}
static Eina_Bool
-_eina_value_type_uint_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_uint_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
unsigned int *tmem = mem;
const unsigned int *p = ptr;
@@ -556,7 +556,7 @@ _eina_value_type_uint_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co
}
static Eina_Bool
-_eina_value_type_uint_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_uint_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const unsigned int *tmem = mem;
unsigned int *p = ptr;
@@ -565,7 +565,7 @@ _eina_value_type_uint_pget(const Eina_Value_Type *type __UNUSED__, const void *m
}
static Eina_Bool
-_eina_value_type_ulong_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_ulong_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
unsigned long *tmem = mem;
*tmem = 0;
@@ -573,13 +573,13 @@ _eina_value_type_ulong_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_ulong_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_ulong_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_ulong_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_ulong_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const unsigned long *s = src;
unsigned long *d = dst;
@@ -588,7 +588,7 @@ _eina_value_type_ulong_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_ulong_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_ulong_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const unsigned long *ta = a, *tb = b;
if (*ta < *tb)
@@ -599,7 +599,7 @@ _eina_value_type_ulong_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_ulong_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_ulong_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const unsigned long v = *(const unsigned long *)type_mem;
@@ -698,7 +698,7 @@ _eina_value_type_ulong_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_ulong_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_ulong_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
unsigned long *tmem = mem;
*tmem = va_arg(args, unsigned long);
@@ -706,7 +706,7 @@ _eina_value_type_ulong_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_ulong_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_ulong_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
unsigned long *tmem = mem;
const unsigned long *p = ptr;
@@ -715,7 +715,7 @@ _eina_value_type_ulong_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_ulong_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_ulong_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const unsigned long *tmem = mem;
unsigned long *p = ptr;
@@ -724,7 +724,7 @@ _eina_value_type_ulong_pget(const Eina_Value_Type *type __UNUSED__, const void *
}
static Eina_Bool
-_eina_value_type_uint64_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_uint64_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
uint64_t *tmem = mem;
*tmem = 0;
@@ -732,13 +732,13 @@ _eina_value_type_uint64_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_uint64_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_uint64_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_uint64_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_uint64_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const uint64_t *s = src;
uint64_t *d = dst;
@@ -747,7 +747,7 @@ _eina_value_type_uint64_copy(const Eina_Value_Type *type __UNUSED__, const void
}
static int
-_eina_value_type_uint64_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_uint64_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const uint64_t *ta = a, *tb = b;
if (*ta < *tb)
@@ -758,7 +758,7 @@ _eina_value_type_uint64_compare(const Eina_Value_Type *type __UNUSED__, const vo
}
static Eina_Bool
-_eina_value_type_uint64_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_uint64_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const uint64_t v = *(const uint64_t *)type_mem;
@@ -862,7 +862,7 @@ _eina_value_type_uint64_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_uint64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_uint64_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
uint64_t *tmem = mem;
*tmem = va_arg(args, uint64_t);
@@ -870,7 +870,7 @@ _eina_value_type_uint64_vset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_uint64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_uint64_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
uint64_t *tmem = mem;
const uint64_t *p = ptr;
@@ -879,7 +879,7 @@ _eina_value_type_uint64_pset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_uint64_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_uint64_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const uint64_t *tmem = mem;
uint64_t *p = ptr;
@@ -888,7 +888,7 @@ _eina_value_type_uint64_pget(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_char_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_char_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
char *tmem = mem;
*tmem = 0;
@@ -896,13 +896,13 @@ _eina_value_type_char_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_char_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_char_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_char_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_char_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const char *s = src;
char *d = dst;
@@ -911,7 +911,7 @@ _eina_value_type_char_copy(const Eina_Value_Type *type __UNUSED__, const void *s
}
static int
-_eina_value_type_char_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_char_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const char *ta = a, *tb = b;
if (*ta < *tb)
@@ -922,7 +922,7 @@ _eina_value_type_char_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_char_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_char_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const signed char v = *(const signed char *)type_mem;
@@ -1017,7 +1017,7 @@ _eina_value_type_char_convert_to(const Eina_Value_Type *type __UNUSED__, const E
}
static Eina_Bool
-_eina_value_type_char_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_char_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
char *tmem = mem;
*tmem = va_arg(args, int); /* char is promoted to int for va_arg */
@@ -1025,7 +1025,7 @@ _eina_value_type_char_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va
}
static Eina_Bool
-_eina_value_type_char_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_char_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
char *tmem = mem;
const char *p = ptr;
@@ -1034,7 +1034,7 @@ _eina_value_type_char_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co
}
static Eina_Bool
-_eina_value_type_char_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_char_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const char *tmem = mem;
char *p = ptr;
@@ -1043,7 +1043,7 @@ _eina_value_type_char_pget(const Eina_Value_Type *type __UNUSED__, const void *m
}
static Eina_Bool
-_eina_value_type_short_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_short_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
short *tmem = mem;
*tmem = 0;
@@ -1051,13 +1051,13 @@ _eina_value_type_short_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_short_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_short_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_short_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_short_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const short *s = src;
short *d = dst;
@@ -1066,7 +1066,7 @@ _eina_value_type_short_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_short_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_short_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const short *ta = a, *tb = b;
if (*ta < *tb)
@@ -1077,7 +1077,7 @@ _eina_value_type_short_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_short_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_short_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const short v = *(const short *)type_mem;
@@ -1178,7 +1178,7 @@ _eina_value_type_short_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_short_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_short_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
short *tmem = mem;
*tmem = va_arg(args, int); /* short int is promoted to int for va_arg */
@@ -1186,7 +1186,7 @@ _eina_value_type_short_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_short_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_short_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
short *tmem = mem;
const short *p = ptr;
@@ -1195,7 +1195,7 @@ _eina_value_type_short_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_short_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_short_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const short *tmem = mem;
short *p = ptr;
@@ -1204,7 +1204,7 @@ _eina_value_type_short_pget(const Eina_Value_Type *type __UNUSED__, const void *
}
static Eina_Bool
-_eina_value_type_int_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_int_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
int *tmem = mem;
*tmem = 0;
@@ -1212,13 +1212,13 @@ _eina_value_type_int_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_int_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_int_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_int_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_int_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const int *s = src;
int *d = dst;
@@ -1227,7 +1227,7 @@ _eina_value_type_int_copy(const Eina_Value_Type *type __UNUSED__, const void *sr
}
static int
-_eina_value_type_int_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_int_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const int *ta = a, *tb = b;
if (*ta < *tb)
@@ -1238,7 +1238,7 @@ _eina_value_type_int_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_int_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_int_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const int v = *(const int *)type_mem;
@@ -1345,7 +1345,7 @@ _eina_value_type_int_convert_to(const Eina_Value_Type *type __UNUSED__, const Ei
}
static Eina_Bool
-_eina_value_type_int_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_int_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
int *tmem = mem;
*tmem = va_arg(args, int);
@@ -1353,7 +1353,7 @@ _eina_value_type_int_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_
}
static Eina_Bool
-_eina_value_type_int_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_int_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
int *tmem = mem;
const int *p = ptr;
@@ -1362,7 +1362,7 @@ _eina_value_type_int_pset(const Eina_Value_Type *type __UNUSED__, void *mem, con
}
static Eina_Bool
-_eina_value_type_int_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_int_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const int *tmem = mem;
int *p = ptr;
@@ -1371,7 +1371,7 @@ _eina_value_type_int_pget(const Eina_Value_Type *type __UNUSED__, const void *me
}
static Eina_Bool
-_eina_value_type_long_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_long_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
long *tmem = mem;
*tmem = 0;
@@ -1379,13 +1379,13 @@ _eina_value_type_long_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_long_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_long_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_long_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_long_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const long *s = src;
long *d = dst;
@@ -1394,7 +1394,7 @@ _eina_value_type_long_copy(const Eina_Value_Type *type __UNUSED__, const void *s
}
static int
-_eina_value_type_long_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_long_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const long *ta = a, *tb = b;
if (*ta < *tb)
@@ -1405,7 +1405,7 @@ _eina_value_type_long_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_long_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_long_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const long v = *(const long *)type_mem;
@@ -1518,7 +1518,7 @@ _eina_value_type_long_convert_to(const Eina_Value_Type *type __UNUSED__, const E
}
static Eina_Bool
-_eina_value_type_long_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_long_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
long *tmem = mem;
*tmem = va_arg(args, long);
@@ -1526,7 +1526,7 @@ _eina_value_type_long_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va
}
static Eina_Bool
-_eina_value_type_long_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_long_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
long *tmem = mem;
const long *p = ptr;
@@ -1535,7 +1535,7 @@ _eina_value_type_long_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co
}
static Eina_Bool
-_eina_value_type_long_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_long_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const long *tmem = mem;
long *p = ptr;
@@ -1544,7 +1544,7 @@ _eina_value_type_long_pget(const Eina_Value_Type *type __UNUSED__, const void *m
}
static Eina_Bool
-_eina_value_type_int64_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_int64_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
int64_t *tmem = mem;
*tmem = 0;
@@ -1552,13 +1552,13 @@ _eina_value_type_int64_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_int64_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_int64_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_int64_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_int64_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const int64_t *s = src;
int64_t *d = dst;
@@ -1567,7 +1567,7 @@ _eina_value_type_int64_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_int64_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_int64_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const int64_t *ta = a, *tb = b;
if (*ta < *tb)
@@ -1578,7 +1578,7 @@ _eina_value_type_int64_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_int64_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_int64_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const int64_t v = *(const int64_t *)type_mem;
@@ -1698,7 +1698,7 @@ _eina_value_type_int64_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_int64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_int64_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
int64_t *tmem = mem;
*tmem = va_arg(args, int64_t);
@@ -1706,7 +1706,7 @@ _eina_value_type_int64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_int64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_int64_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
int64_t *tmem = mem;
const int64_t *p = ptr;
@@ -1715,7 +1715,7 @@ _eina_value_type_int64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_int64_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_int64_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const int64_t *tmem = mem;
int64_t *p = ptr;
@@ -1724,7 +1724,7 @@ _eina_value_type_int64_pget(const Eina_Value_Type *type __UNUSED__, const void *
}
static Eina_Bool
-_eina_value_type_float_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_float_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
float *tmem = mem;
*tmem = 0;
@@ -1732,13 +1732,13 @@ _eina_value_type_float_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_float_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_float_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_float_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_float_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const float *s = src;
float *d = dst;
@@ -1747,7 +1747,7 @@ _eina_value_type_float_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_float_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_float_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const float *ta = a, *tb = b;
if (*ta < *tb)
@@ -1758,7 +1758,7 @@ _eina_value_type_float_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_float_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_float_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const float v = *(const float *)type_mem;
@@ -1884,7 +1884,7 @@ _eina_value_type_float_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_float_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_float_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
float *tmem = mem;
*tmem = va_arg(args, double); /* float is promoted to double for va_args */
@@ -1892,7 +1892,7 @@ _eina_value_type_float_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_float_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_float_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
float *tmem = mem;
const float *p = ptr;
@@ -1901,7 +1901,7 @@ _eina_value_type_float_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_float_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_float_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const float *tmem = mem;
float *p = ptr;
@@ -1910,7 +1910,7 @@ _eina_value_type_float_pget(const Eina_Value_Type *type __UNUSED__, const void *
}
static Eina_Bool
-_eina_value_type_double_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_double_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
double *tmem = mem;
*tmem = 0;
@@ -1918,13 +1918,13 @@ _eina_value_type_double_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_double_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_double_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_double_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_double_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const double *s = src;
double *d = dst;
@@ -1933,7 +1933,7 @@ _eina_value_type_double_copy(const Eina_Value_Type *type __UNUSED__, const void
}
static int
-_eina_value_type_double_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_double_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const double *ta = a, *tb = b;
if (*ta < *tb)
@@ -1944,7 +1944,7 @@ _eina_value_type_double_compare(const Eina_Value_Type *type __UNUSED__, const vo
}
static Eina_Bool
-_eina_value_type_double_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_double_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const double v = *(const double *)type_mem;
@@ -2064,7 +2064,7 @@ _eina_value_type_double_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_double_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_double_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
double *tmem = mem;
*tmem = va_arg(args, double);
@@ -2072,7 +2072,7 @@ _eina_value_type_double_vset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_double_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_double_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
double *tmem = mem;
const double *p = ptr;
@@ -2081,7 +2081,7 @@ _eina_value_type_double_pset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_double_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_double_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
const double *tmem = mem;
double *p = ptr;
@@ -2090,7 +2090,7 @@ _eina_value_type_double_pget(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_string_common_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_string_common_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
const char **tmem = mem;
*tmem = NULL;
@@ -2098,7 +2098,7 @@ _eina_value_type_string_common_setup(const Eina_Value_Type *type __UNUSED__, voi
}
static int
-_eina_value_type_string_common_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_string_common_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const char *sa = *(const char **)a;
const char *sb = *(const char **)b;
@@ -2112,7 +2112,7 @@ _eina_value_type_string_common_compare(const Eina_Value_Type *type __UNUSED__, c
}
static Eina_Bool
-_eina_value_type_string_common_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_string_common_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const char *v = *(const char **)type_mem;
@@ -2237,14 +2237,14 @@ _eina_value_type_string_common_convert_to(const Eina_Value_Type *type __UNUSED__
}
static Eina_Bool
-_eina_value_type_string_common_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_string_common_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(const char *));
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_stringshare_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_stringshare_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
const char **tmem = mem;
if (*tmem)
@@ -2256,7 +2256,7 @@ _eina_value_type_stringshare_flush(const Eina_Value_Type *type __UNUSED__, void
}
static Eina_Bool
-_eina_value_type_stringshare_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_stringshare_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const char * const*s = src;
const char **d = dst;
@@ -2265,21 +2265,21 @@ _eina_value_type_stringshare_copy(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_stringshare_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_stringshare_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
const char *str = va_arg(args, const char *);
return eina_stringshare_replace((const char **)mem, str);
}
static Eina_Bool
-_eina_value_type_stringshare_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_stringshare_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
const char * const *str = ptr;
return eina_stringshare_replace((const char **)mem, *str);
}
static Eina_Bool
-_eina_value_type_string_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_string_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
char **tmem = mem;
if (*tmem)
@@ -2291,7 +2291,7 @@ _eina_value_type_string_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_string_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_string_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const char * const *s = src;
char **d = dst;
@@ -2310,7 +2310,7 @@ _eina_value_type_string_copy(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_string_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_string_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
char **tmem = mem;
const char *str = va_arg(args, const char *);
@@ -2336,7 +2336,7 @@ _eina_value_type_string_vset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_string_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_string_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
char **tmem = mem;
const char * const *str = ptr;
@@ -2362,7 +2362,7 @@ _eina_value_type_string_pset(const Eina_Value_Type *type __UNUSED__, void *mem,
}
static Eina_Bool
-_eina_value_type_array_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_array_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(Eina_Value_Array));
return EINA_TRUE;
@@ -2390,7 +2390,7 @@ _eina_value_type_array_flush_elements(Eina_Value_Array *tmem)
}
static Eina_Bool
-_eina_value_type_array_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_array_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
Eina_Value_Array *tmem = mem;
Eina_Bool ret =_eina_value_type_array_flush_elements(tmem);
@@ -2402,7 +2402,7 @@ _eina_value_type_array_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_array_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Value_Type *subtype;
const Eina_Value_Array *s = src;
@@ -2454,7 +2454,7 @@ _eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_array_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_array_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Value_Type *subtype;
const Eina_Value_Array *eva_a = a, *eva_b = b;
@@ -2512,7 +2512,7 @@ _eina_value_type_array_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_array_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_array_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Value_Array *tmem = type_mem;
Eina_Bool ret = EINA_FALSE;
@@ -2680,7 +2680,7 @@ _eina_value_type_array_vset(const Eina_Value_Type *type, void *mem, va_list args
}
static Eina_Bool
-_eina_value_type_array_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_array_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(Eina_Value_Array));
return EINA_TRUE;
@@ -2702,7 +2702,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_ARRAY = {
};
static Eina_Bool
-_eina_value_type_list_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_list_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(Eina_Value_List));
return EINA_TRUE;
@@ -2728,7 +2728,7 @@ _eina_value_type_list_flush_elements(Eina_Value_List *tmem)
}
static Eina_Bool
-_eina_value_type_list_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_list_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
Eina_Value_List *tmem = mem;
Eina_Bool ret =_eina_value_type_list_flush_elements(tmem);
@@ -2740,7 +2740,7 @@ _eina_value_type_list_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_list_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_list_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Value_Type *subtype;
const Eina_Value_List *s = src;
@@ -2788,7 +2788,7 @@ _eina_value_type_list_copy(const Eina_Value_Type *type __UNUSED__, const void *s
}
static int
-_eina_value_type_list_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_list_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Value_Type *subtype;
const Eina_Value_List *eva_a = a, *eva_b = b;
@@ -2837,7 +2837,7 @@ _eina_value_type_list_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_list_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_list_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Value_List *tmem = type_mem;
Eina_Bool ret = EINA_FALSE;
@@ -2999,7 +2999,7 @@ _eina_value_type_list_vset(const Eina_Value_Type *type, void *mem, va_list args)
}
static Eina_Bool
-_eina_value_type_list_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_list_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(Eina_Value_List));
return EINA_TRUE;
@@ -3021,7 +3021,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_LIST = {
};
static Eina_Bool
-_eina_value_type_hash_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_hash_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(Eina_Value_Hash));
return EINA_TRUE;
@@ -3034,7 +3034,7 @@ struct _eina_value_type_hash_flush_each_ctx
};
static Eina_Bool
-_eina_value_type_hash_flush_each(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *mem, void *user_data)
+_eina_value_type_hash_flush_each(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *mem, void *user_data)
{
struct _eina_value_type_hash_flush_each_ctx *ctx = user_data;
ctx->ret &= eina_value_type_flush(ctx->subtype, mem);
@@ -3059,7 +3059,7 @@ _eina_value_type_hash_flush_elements(Eina_Value_Hash *tmem)
}
static Eina_Bool
-_eina_value_type_hash_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_hash_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
Eina_Value_Hash *tmem = mem;
Eina_Bool ret =_eina_value_type_hash_flush_elements(tmem);
@@ -3105,7 +3105,7 @@ struct _eina_value_type_hash_copy_each_ctx
};
static Eina_Bool
-_eina_value_type_hash_copy_each(const Eina_Hash *hash __UNUSED__, const void *key, void *_ptr, void *user_data)
+_eina_value_type_hash_copy_each(const Eina_Hash *hash EINA_UNUSED, const void *key, void *_ptr, void *user_data)
{
struct _eina_value_type_hash_copy_each_ctx *ctx = user_data;
const void *ptr = _ptr;
@@ -3132,7 +3132,7 @@ _eina_value_type_hash_copy_each(const Eina_Hash *hash __UNUSED__, const void *ke
}
static Eina_Bool
-_eina_value_type_hash_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_hash_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Value_Hash *s = src;
Eina_Value_Hash *d = dst;
@@ -3173,7 +3173,7 @@ struct _eina_value_type_hash_compare_each_ctx
};
static Eina_Bool
-_eina_value_type_hash_compare_each(const Eina_Hash *hash __UNUSED__, const void *key, void *_ptr, void *user_data)
+_eina_value_type_hash_compare_each(const Eina_Hash *hash EINA_UNUSED, const void *key, void *_ptr, void *user_data)
{
struct _eina_value_type_hash_compare_each_ctx *ctx = user_data;
const void *self_ptr = _ptr;
@@ -3184,7 +3184,7 @@ _eina_value_type_hash_compare_each(const Eina_Hash *hash __UNUSED__, const void
}
static int
-_eina_value_type_hash_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_hash_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Value_Hash *eva_a = a, *eva_b = b;
struct _eina_value_type_hash_compare_each_ctx ctx = {
@@ -3226,7 +3226,7 @@ _eina_value_type_hash_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_hash_find_first(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *ptr, void *user_data)
+_eina_value_type_hash_find_first(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *ptr, void *user_data)
{
void **ret = user_data;
*ret = ptr;
@@ -3242,7 +3242,7 @@ struct _eina_value_type_hash_convert_to_string_each_ctx
};
static Eina_Bool
-_eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash __UNUSED__, const void *_key, void *_ptr, void *user_data)
+_eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash EINA_UNUSED, const void *_key, void *_ptr, void *user_data)
{
struct _eina_value_type_hash_convert_to_string_each_ctx *ctx = user_data;
const char *key = _key;
@@ -3274,7 +3274,7 @@ _eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash __UNUSED__, c
}
static Eina_Bool
-_eina_value_type_hash_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_hash_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Value_Hash *tmem = type_mem;
Eina_Bool ret = EINA_FALSE;
@@ -3377,7 +3377,7 @@ _eina_value_type_hash_vset(const Eina_Value_Type *type, void *mem, va_list args)
}
static Eina_Bool
-_eina_value_type_hash_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_hash_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(Eina_Value_Hash));
return EINA_TRUE;
@@ -3399,20 +3399,20 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_HASH = {
};
static Eina_Bool
-_eina_value_type_timeval_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_timeval_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(struct timeval));
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_timeval_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__)
+_eina_value_type_timeval_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED)
{
return EINA_TRUE;
}
static Eina_Bool
-_eina_value_type_timeval_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_timeval_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const struct timeval *s = src;
struct timeval *d = dst;
@@ -3432,7 +3432,7 @@ static inline struct timeval _eina_value_type_timeval_fix(const struct timeval *
}
static int
-_eina_value_type_timeval_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_timeval_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
struct timeval va = _eina_value_type_timeval_fix(a);
struct timeval vb = _eina_value_type_timeval_fix(b);
@@ -3451,7 +3451,7 @@ _eina_value_type_timeval_compare(const Eina_Value_Type *type __UNUSED__, const v
}
static Eina_Bool
-_eina_value_type_timeval_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_timeval_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
struct timeval v = _eina_value_type_timeval_fix(type_mem);
@@ -3569,7 +3569,7 @@ _eina_value_type_timeval_convert_to(const Eina_Value_Type *type __UNUSED__, cons
}
static Eina_Bool
-_eina_value_type_timeval_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_timeval_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
struct timeval *tmem = mem;
*tmem = _eina_value_type_timeval_fix(ptr);
@@ -3585,7 +3585,7 @@ _eina_value_type_timeval_vset(const Eina_Value_Type *type, void *mem, va_list ar
}
static Eina_Bool
-_eina_value_type_timeval_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_timeval_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(struct timeval));
return EINA_TRUE;
@@ -3607,7 +3607,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_TIMEVAL = {
};
static Eina_Bool
-_eina_value_type_blob_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_blob_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(Eina_Value_Blob));
return EINA_TRUE;
@@ -3624,7 +3624,7 @@ _eina_value_type_blob_ops_get(const Eina_Value_Blob *blob)
}
static Eina_Bool
-_eina_value_type_blob_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_blob_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem);
Eina_Value_Blob *tmem = mem;
@@ -3636,7 +3636,7 @@ _eina_value_type_blob_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_blob_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_blob_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(src);
const Eina_Value_Blob *s = src;
@@ -3655,7 +3655,7 @@ _eina_value_type_blob_copy(const Eina_Value_Type *type __UNUSED__, const void *s
}
static int
-_eina_value_type_blob_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_blob_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(a);
const Eina_Value_Blob *ta = a, *tb = b;
@@ -3677,7 +3677,7 @@ _eina_value_type_blob_compare(const Eina_Value_Type *type __UNUSED__, const void
}
static Eina_Bool
-_eina_value_type_blob_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_blob_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Value_Blob *tmem = type_mem;
@@ -3832,7 +3832,7 @@ _eina_value_type_blob_convert_from(const Eina_Value_Type *type, const Eina_Value
}
static Eina_Bool
-_eina_value_type_blob_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_blob_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem);
Eina_Value_Blob *tmem = mem;
@@ -3862,7 +3862,7 @@ _eina_value_type_blob_vset(const Eina_Value_Type *type, void *mem, va_list args)
}
static Eina_Bool
-_eina_value_type_blob_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_blob_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(Eina_Value_Blob));
return EINA_TRUE;
@@ -3891,7 +3891,7 @@ _eina_value_struct_operations_binsearch_cmp(const void *pa, const void *pb)
}
static const Eina_Value_Struct_Member *
-_eina_value_struct_operations_binsearch_find_member(const Eina_Value_Struct_Operations *ops __UNUSED__, const Eina_Value_Struct_Desc *desc, const char *name)
+_eina_value_struct_operations_binsearch_find_member(const Eina_Value_Struct_Operations *ops EINA_UNUSED, const Eina_Value_Struct_Desc *desc, const char *name)
{
unsigned int count = desc->member_count;
Eina_Value_Struct_Member search;
@@ -3918,7 +3918,7 @@ static Eina_Value_Struct_Operations _EINA_VALUE_STRUCT_OPERATIONS_BINSEARCH = {
};
static const Eina_Value_Struct_Member *
-_eina_value_struct_operations_stringshare_find_member(const Eina_Value_Struct_Operations *ops __UNUSED__, const Eina_Value_Struct_Desc *desc, const char *name)
+_eina_value_struct_operations_stringshare_find_member(const Eina_Value_Struct_Operations *ops EINA_UNUSED, const Eina_Value_Struct_Desc *desc, const char *name)
{
const Eina_Value_Struct_Member *itr = desc->members;
@@ -4019,7 +4019,7 @@ eina_value_struct_member_find(const Eina_Value_Struct *st, const char *name)
}
static Eina_Bool
-_eina_value_type_struct_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_struct_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
memset(mem, 0, sizeof(Eina_Value_Struct));
return EINA_TRUE;
@@ -4040,7 +4040,7 @@ _eina_value_type_struct_flush_member(const Eina_Value_Struct_Member *member, Ein
}
static Eina_Bool
-_eina_value_type_struct_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_struct_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
const Eina_Value_Struct_Operations *ops;
const Eina_Value_Struct_Member *itr;
@@ -4087,7 +4087,7 @@ _eina_value_type_struct_copy_member(const Eina_Value_Struct_Member *member, cons
}
static Eina_Bool
-_eina_value_type_struct_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_struct_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Value_Struct_Operations *ops;
const Eina_Value_Struct_Member *itr;
@@ -4158,7 +4158,7 @@ _eina_value_type_struct_compare_member(const Eina_Value_Struct_Member *member, c
}
static int
-_eina_value_type_struct_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_struct_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Value_Struct_Operations *ops = _eina_value_type_struct_ops_get(a);
const Eina_Value_Struct *ta = a, *tb = b;
@@ -4231,7 +4231,7 @@ _eina_value_type_struct_convert_to_string_member(const Eina_Value_Struct *st, co
}
static Eina_Bool
-_eina_value_type_struct_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_struct_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Value_Struct *tmem = type_mem;
@@ -4420,7 +4420,7 @@ _eina_value_type_struct_vset(const Eina_Value_Type *type, void *mem, va_list arg
}
static Eina_Bool
-_eina_value_type_struct_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_struct_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
memcpy(ptr, mem, sizeof(Eina_Value_Struct));
return EINA_TRUE;
@@ -4443,7 +4443,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_STRUCT = {
/* no model for now
static Eina_Bool
-_eina_value_type_model_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_model_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
Eina_Model **tmem = mem;
*tmem = NULL;
@@ -4451,7 +4451,7 @@ _eina_value_type_model_setup(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_model_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
+_eina_value_type_model_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem)
{
Eina_Model **tmem = mem;
if (*tmem)
@@ -4463,7 +4463,7 @@ _eina_value_type_model_flush(const Eina_Value_Type *type __UNUSED__, void *mem)
}
static Eina_Bool
-_eina_value_type_model_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst)
+_eina_value_type_model_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst)
{
const Eina_Model * const *s = src;
Eina_Model **d = dst;
@@ -4475,7 +4475,7 @@ _eina_value_type_model_copy(const Eina_Value_Type *type __UNUSED__, const void *
}
static int
-_eina_value_type_model_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b)
+_eina_value_type_model_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b)
{
const Eina_Model * const *ta = a;
const Eina_Model * const *tb = b;
@@ -4487,7 +4487,7 @@ _eina_value_type_model_compare(const Eina_Value_Type *type __UNUSED__, const voi
}
static Eina_Bool
-_eina_value_type_model_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+_eina_value_type_model_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
{
const Eina_Model *v = *(const Eina_Model **)type_mem;
@@ -4511,7 +4511,7 @@ _eina_value_type_model_convert_to(const Eina_Value_Type *type __UNUSED__, const
}
static Eina_Bool
-_eina_value_type_model_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args)
+_eina_value_type_model_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args)
{
Eina_Model **tmem = mem, *tmp;
@@ -4526,7 +4526,7 @@ _eina_value_type_model_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v
}
static Eina_Bool
-_eina_value_type_model_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr)
+_eina_value_type_model_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr)
{
Eina_Model **tmem = mem;
Eina_Model **p = (Eina_Model **)ptr;
@@ -4543,7 +4543,7 @@ _eina_value_type_model_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c
}
static Eina_Bool
-_eina_value_type_model_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr)
+_eina_value_type_model_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr)
{
Eina_Model **tmem = (Eina_Model **)mem;
Eina_Model **p = ptr;
@@ -4787,13 +4787,13 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_BASICS[] = {
};
static void
-_eina_value_blob_operations_malloc_free(const Eina_Value_Blob_Operations *ops __UNUSED__, void *memory, size_t size __UNUSED__)
+_eina_value_blob_operations_malloc_free(const Eina_Value_Blob_Operations *ops EINA_UNUSED, void *memory, size_t size EINA_UNUSED)
{
free(memory);
}
static void *
-_eina_value_blob_operations_malloc_copy(const Eina_Value_Blob_Operations *ops __UNUSED__, const void *memory, size_t size)
+_eina_value_blob_operations_malloc_copy(const Eina_Value_Blob_Operations *ops EINA_UNUSED, const void *memory, size_t size)
{
void *ret = malloc(size);
if (!ret)
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c
index d4ed13965..581d5e0b3 100644
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@@ -140,7 +140,7 @@ _eina_xattr_ls_iterator_next(Eina_Xattr_Iterator *it, void **data)
}
static void *
-_eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it __UNUSED__)
+_eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it EINA_UNUSED)
{
return NULL;
}
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index f507230e7..2e08f4dd7 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -8,6 +8,12 @@ AM_CPPFLAGS = \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
+if HAVE_WINDOWS
+AM_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
installed_headerdir = $(includedir)/eo-@VMAJ@
dist_installed_header_DATA = Eo.h
diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/dlfcn.c
index 818cabf01..a877653ec 100644
--- a/src/lib/evil/dlfcn.c
+++ b/src/lib/evil/dlfcn.c
@@ -21,6 +21,7 @@
#endif
#include "Evil.h"
+#include "evil_private.h"
#include "dlfcn.h"
@@ -57,7 +58,7 @@ get_last_error(char *desc)
}
void *
-dlopen(const char* path, int mode __UNUSED__)
+dlopen(const char* path, int mode EVIL_UNUSED)
{
HMODULE module = NULL;
@@ -190,7 +191,7 @@ dlsym(void *handle, const char *symbol)
}
int
-dladdr (const void *addr __UNUSED__, Dl_info *info)
+dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
{
TCHAR tpath[PATH_MAX];
MEMORY_BASIC_INFORMATION mbi;
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c
index 8898357cf..709eb24fc 100644
--- a/src/lib/evil/evil_mman.c
+++ b/src/lib/evil/evil_mman.c
@@ -24,6 +24,7 @@
#include "evil_private.h"
#define APICHAR char
#include "evil_print.h"
+#include "evil_private.h"
#ifdef __MINGW32CE__
# define _get_osfhandle(FILEDES) ((long)FILEDES)
@@ -34,7 +35,7 @@
void *
-mmap(void *addr __UNUSED__,
+mmap(void *addr EVIL_UNUSED,
size_t len,
int prot,
int flags,
@@ -189,7 +190,7 @@ mmap(void *addr __UNUSED__,
int
munmap(void *addr,
- size_t len __UNUSED__)
+ size_t len EVIL_UNUSED)
{
#ifdef _WIN32_WCE
OSVERSIONINFO os_version;
diff --git a/src/lib/evil/evil_private.h b/src/lib/evil/evil_private.h
index d46a379d0..0f8b6d193 100644
--- a/src/lib/evil/evil_private.h
+++ b/src/lib/evil/evil_private.h
@@ -6,6 +6,14 @@
extern "C" {
#endif
+#ifdef __GNUC__
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# define EVIL_UNUSED __attribute__ ((__unused__))
+# else
+# define EVIL_UNUSED
+# endif
+#endif
+
long _evil_systemtime_to_time(SYSTEMTIME st);
void _evil_error_display(const char *fct, LONG res);
diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c
index 594d28115..1aa6f6753 100644
--- a/src/lib/evil/evil_stdio.c
+++ b/src/lib/evil/evil_stdio.c
@@ -15,7 +15,7 @@
*
*/
-void evil_perror (const char *s __UNUSED__)
+void evil_perror (const char *s EVIL_UNUSED)
{
fprintf(stderr, "[Windows CE] error\n");
}
diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c
index ffbe308b6..491a880e1 100644
--- a/src/lib/evil/evil_string.c
+++ b/src/lib/evil/evil_string.c
@@ -3,6 +3,7 @@
#endif /* HAVE_CONFIG_H */
#include "Evil.h"
+#include "evil_private.h"
#ifdef _WIN32_WCE
@@ -12,7 +13,7 @@
*
*/
-char *strerror (int errnum __UNUSED__)
+char *strerror (int errnum EVIL_UNUSED)
{
return "[Windows CE] error\n";
}
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index e1498509d..10ef018e1 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -68,7 +68,7 @@ evil_time_get(void)
#ifdef _MSC_VER
int
-evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
+evil_gettimeofday(struct timeval *tp, void *tzp EVIL_UNUSED)
{
LARGE_INTEGER count;
LONGLONG diff;
@@ -423,7 +423,7 @@ evil_pipe(int *fds)
#ifdef _WIN32_WCE
-int execvp (const char *file __UNUSED__, char *const argv[] __UNUSED__)
+int execvp (const char *file EVIL_UNUSED, char *const argv[] EVIL_UNUSED)
{
return 1;
}
diff --git a/src/modules/eina/mp/buddy/eina_buddy.c b/src/modules/eina/mp/buddy/eina_buddy.c
index 7d830dbfb..8344c9db5 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 e56df4cee..c3985c2d6 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 0d02f80bb..9b2deb6e8 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 56b99f66c..736bcc193 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 e053e1579..1fd55348d 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 1159378de..c23c47837 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 196868ecb..9aa1f2284 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)
{
}
diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c
index 5e14984f8..b00882b9d 100644
--- a/src/tests/eet/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
@@ -679,7 +679,7 @@ _eet_test_ex_check(Eet_Test_Ex_Type *stuff,
} /* _eet_test_ex_check */
static Eina_Bool
-func(__UNUSED__ const Eina_Hash *hash,
+func(EINA_UNUSED const Eina_Hash *hash,
const void *key,
void *data,
void *fdata)
@@ -697,8 +697,8 @@ func(__UNUSED__ const Eina_Hash *hash,
} /* func */
static Eina_Bool
-func7(__UNUSED__ const Eina_Hash *hash,
- __UNUSED__ const void *key,
+func7(EINA_UNUSED const Eina_Hash *hash,
+ EINA_UNUSED const void *key,
void *data,
void *fdata)
{
@@ -1743,8 +1743,8 @@ END_TEST
static int
pass_get(char *pass,
int size,
- __UNUSED__ int rwflags,
- __UNUSED__ void *u)
+ EINA_UNUSED int rwflags,
+ EINA_UNUSED void *u)
{
memset(pass, 0, size);
@@ -1758,8 +1758,8 @@ pass_get(char *pass,
static int
badpass_get(char *pass,
int size,
- __UNUSED__ int rwflags,
- __UNUSED__ void *u)
+ EINA_UNUSED int rwflags,
+ EINA_UNUSED void *u)
{
memset(pass, 0, size);
diff --git a/src/tests/eina/eina_test_accessor.c b/src/tests/eina/eina_test_accessor.c
index 3c85ef037..a99542913 100644
--- a/src/tests/eina/eina_test_accessor.c
+++ b/src/tests/eina/eina_test_accessor.c
@@ -26,7 +26,7 @@
#include "Eina.h"
static Eina_Bool
-eina_accessor_check(__UNUSED__ const Eina_Array *array,
+eina_accessor_check(EINA_UNUSED const Eina_Array *array,
int *data, int *fdata)
{
fail_if(*fdata > *data);
@@ -97,7 +97,7 @@ _eina_test_inlist_build(int i)
}
static Eina_Bool
-eina_accessor_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list,
+eina_accessor_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list,
Eina_Test_Inlist *data,
int *fdata)
{
@@ -167,7 +167,7 @@ START_TEST(eina_accessor_inlist_simple)
END_TEST
static Eina_Bool
-eina_iterator_list_data_check(__UNUSED__ const Eina_List *list,
+eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
int *data,
int *fdata)
{
diff --git a/src/tests/eina/eina_test_counter.c b/src/tests/eina/eina_test_counter.c
index 4d956fd35..1a6c77c95 100644
--- a/src/tests/eina/eina_test_counter.c
+++ b/src/tests/eina/eina_test_counter.c
@@ -38,7 +38,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index 962f2ded4..2f3d92e2f 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -43,7 +43,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index a3ba99869..60b3a3c36 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -39,7 +39,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index aeeb655e7..7a1fceaa4 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -28,10 +28,10 @@
#include "Eina.h"
static Eina_Bool
-eina_foreach_check(__UNUSED__ const Eina_Hash *hash,
+eina_foreach_check(EINA_UNUSED const Eina_Hash *hash,
const void *key,
void *data,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
int *j = data;
int i;
diff --git a/src/tests/eina/eina_test_inarray.c b/src/tests/eina/eina_test_inarray.c
index 5f33f4710..51397707d 100644
--- a/src/tests/eina/eina_test_inarray.c
+++ b/src/tests/eina/eina_test_inarray.c
@@ -289,7 +289,7 @@ START_TEST(eina_inarray_test_reverse)
END_TEST
static Eina_Bool
-array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
+array_foreach(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
{
short *member = p;
int *i = user_data;
@@ -299,7 +299,7 @@ array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
}
static Eina_Bool
-array_foreach_stop_2nd(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
+array_foreach_stop_2nd(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
{
short *member = p;
int *i = user_data;
diff --git a/src/tests/eina/eina_test_inlist.c b/src/tests/eina/eina_test_inlist.c
index a8631e708..7d29b37f4 100644
--- a/src/tests/eina/eina_test_inlist.c
+++ b/src/tests/eina/eina_test_inlist.c
@@ -45,7 +45,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c
index 84bb33693..4c14decc7 100644
--- a/src/tests/eina/eina_test_iterator.c
+++ b/src/tests/eina/eina_test_iterator.c
@@ -26,7 +26,7 @@
#include "Eina.h"
static Eina_Bool
-eina_iterator_array_check(__UNUSED__ const Eina_Array *array,
+eina_iterator_array_check(EINA_UNUSED const Eina_Array *array,
int *data, int *fdata)
{
fail_if(*fdata > *data);
@@ -77,7 +77,7 @@ END_TEST
static Eina_Bool
eina_iterator_hash_key_check(const Eina_Hash *hash,
const char *key,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
fail_if(eina_hash_find(hash, key) == NULL);
@@ -86,7 +86,7 @@ eina_iterator_hash_key_check(const Eina_Hash *hash,
static Eina_Bool
eina_iterator_hash_data_check(const Eina_Hash *hash,
int *data,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
char tmp[10];
@@ -96,9 +96,9 @@ eina_iterator_hash_data_check(const Eina_Hash *hash,
return EINA_TRUE;
}
static Eina_Bool
-eina_iterator_hash_tuple_check(__UNUSED__ const Eina_Hash *hash,
+eina_iterator_hash_tuple_check(EINA_UNUSED const Eina_Hash *hash,
Eina_Hash_Tuple *tuple,
- __UNUSED__ void *fdata)
+ EINA_UNUSED void *fdata)
{
fail_if(atoi((char *)tuple->key) != *((int *)tuple->data));
@@ -160,7 +160,7 @@ _eina_test_inlist_build(int i)
}
static Eina_Bool
-eina_iterator_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list,
+eina_iterator_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list,
Eina_Test_Inlist *data,
int *fdata)
{
@@ -223,7 +223,7 @@ START_TEST(eina_iterator_inlist_simple)
END_TEST
static Eina_Bool
-eina_iterator_list_data_check(__UNUSED__ const Eina_List *list,
+eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
int *data,
int *fdata)
{
@@ -320,7 +320,7 @@ _eina_rbtree_int_new(int value)
}
static Eina_Bool
-eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_sorted(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
@@ -343,7 +343,7 @@ eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list,
}
static Eina_Bool
-eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_prefix(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
@@ -366,7 +366,7 @@ eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list,
}
static Eina_Bool
-eina_iterator_rbtree_data_check_postfix(__UNUSED__ const Eina_List *list,
+eina_iterator_rbtree_data_check_postfix(EINA_UNUSED const Eina_List *list,
Eina_Rbtree_Int *data,
int *fdata)
{
diff --git a/src/tests/eina/eina_test_log.c b/src/tests/eina/eina_test_log.c
index e0f0363b9..f922281e6 100644
--- a/src/tests/eina/eina_test_log.c
+++ b/src/tests/eina/eina_test_log.c
@@ -40,7 +40,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
ck_assert_int_eq(ctx->level, level);
@@ -57,7 +57,7 @@ _eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file,
}
static void
-_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
ck_assert_int_eq(ctx->level, level);
@@ -73,7 +73,7 @@ _eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char
}
static void
-_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eina/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
index d0a374e77..b41ed5d09 100644
--- a/src/tests/eina/eina_test_magic.c
+++ b/src/tests/eina/eina_test_magic.c
@@ -50,7 +50,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
@@ -76,7 +76,7 @@ _eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const
}
static void
-_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
diff --git a/src/tests/eina/eina_test_matrixsparse.c b/src/tests/eina/eina_test_matrixsparse.c
index e07b1eead..1aaf4e62a 100644
--- a/src/tests/eina/eina_test_matrixsparse.c
+++ b/src/tests/eina/eina_test_matrixsparse.c
@@ -10,8 +10,8 @@
#define MAX_ROWS 10
#define MAX_COLS 10
-static void eina_matrixsparse_free_cell_cb(void *user_data __UNUSED__,
- void *cell_data __UNUSED__)
+static void eina_matrixsparse_free_cell_cb(void *user_data EINA_UNUSED,
+ void *cell_data EINA_UNUSED)
{
}
@@ -35,8 +35,8 @@ static void matrixsparse_initialize(Eina_Matrixsparse *matrix,
static void matrixsparse_check(Eina_Matrixsparse *matrix,
long data[MAX_ROWS][MAX_COLS],
- unsigned long nrows __UNUSED__,
- unsigned long ncols __UNUSED__)
+ unsigned long nrows EINA_UNUSED,
+ unsigned long ncols EINA_UNUSED)
{
unsigned long i, j;
long *test1;
diff --git a/src/tests/eina/eina_test_module.c b/src/tests/eina/eina_test_module.c
index 56bdca7bc..de7fa697e 100644
--- a/src/tests/eina/eina_test_module.c
+++ b/src/tests/eina/eina_test_module.c
@@ -25,7 +25,7 @@
#include "eina_suite.h"
#include "Eina.h"
-static Eina_Bool list_cb(Eina_Module *m, void *data __UNUSED__)
+static Eina_Bool list_cb(Eina_Module *m, void *data EINA_UNUSED)
{
int *sym;
const char *file;
diff --git a/src/tests/eina/eina_test_rbtree.c b/src/tests/eina/eina_test_rbtree.c
index fabe2bfd2..dba904a21 100644
--- a/src/tests/eina/eina_test_rbtree.c
+++ b/src/tests/eina/eina_test_rbtree.c
@@ -87,7 +87,7 @@ struct _Eina_Rbtree_Int
static Eina_Rbtree_Direction
eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
const Eina_Rbtree_Int *right,
- __UNUSED__ void *data)
+ EINA_UNUSED void *data)
{
fail_if(!left);
fail_if(!right);
@@ -101,8 +101,8 @@ eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
static int
eina_rbtree_int_key(const Eina_Rbtree_Int *node,
const int *key,
- __UNUSED__ int length,
- __UNUSED__ void *data)
+ EINA_UNUSED int length,
+ EINA_UNUSED void *data)
{
fail_if(!node);
return node->value - *key;
diff --git a/src/tests/eina/eina_test_sched.c b/src/tests/eina/eina_test_sched.c
index ff83a7efc..53a771dc7 100644
--- a/src/tests/eina/eina_test_sched.c
+++ b/src/tests/eina/eina_test_sched.c
@@ -37,7 +37,7 @@
*/
static void *
-_thread_run(void *arg __UNUSED__)
+_thread_run(void *arg EINA_UNUSED)
{
int niceval = getpriority(PRIO_PROCESS, 0);
int niceval2;
diff --git a/src/tests/eina/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
index 75126cc6f..6240dd671 100644
--- a/src/tests/eina/eina_test_ustr.c
+++ b/src/tests/eina/eina_test_ustr.c
@@ -39,7 +39,7 @@ struct log_ctx {
//#define SHOW_LOG 1
static void
-_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__)
+_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
{
struct log_ctx *ctx = data;
va_list cp_args;
diff --git a/src/tests/eo/Makefile.am b/src/tests/eo/Makefile.am
index 15241bb08..b6fab2ef7 100644
--- a/src/tests/eo/Makefile.am
+++ b/src/tests/eo/Makefile.am
@@ -1,7 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@ \