merge: and now Evas

I've tested make -j 3 install and it works nicely

I've tested expedite with software and opengl xlib,
and it works. Not tested other engines, so please
report any problems (engines or other) on the ML.

TODO: examples and tests, I'll add them later

ISSUE: Eina_Unicode size check. It indirectly depends on
       eina_config.h, which is created at the end of the
       configure script. So its size is always 0. I don't
       know how that size is used, so I can't do a lot,
       for now.


SVN revision: 78895

1 files changed, 19 insertions, 19 deletions

diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 06cf555340..f49fcb8d8d 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -20,7 +20,7 @@ eng_info(Evas *e)
 }
 
 static void
-eng_info_free(Evas *e __UNUSED__, void *info)
+eng_info_free(Evas *e EINA_UNUSED, void *info)
 {
    Evas_Engine_Info_GL_SDL *in;
    in = (Evas_Engine_Info_GL_SDL *)info;
@@ -105,7 +105,7 @@ eng_output_resize(void *data, int w, int h)
 }
 
 static void
-eng_output_tile_size_set(void *data, int w __UNUSED__, int h __UNUSED__)
+eng_output_tile_size_set(void *data, int w EINA_UNUSED, int h EINA_UNUSED)
 {
 //   Render_Engine *re;
 //
@@ -145,7 +145,7 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
 }
 
 static void
-eng_output_redraws_rect_del(void *data, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_redraws_rect_del(void *data, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
 {
 //   Render_Engine *re;
 //
@@ -222,7 +222,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
 }
 
 static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
 {
    Render_Engine *re;
 
@@ -318,7 +318,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2,
 }
 
 static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
+eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y)
 {
    Render_Engine *re;
 
@@ -327,7 +327,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x
 }
 
 static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
+eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon)
 {
    Render_Engine *re;
 
@@ -408,7 +408,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
 }
 
 static void *
-eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
+eng_image_border_set(void *data, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED)
 {
 //   Render_Engine *re;
 //
@@ -417,7 +417,7 @@ eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__
 }
 
 static void
-eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
+eng_image_border_get(void *data, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED)
 {
 //   Render_Engine *re;
 //
@@ -425,7 +425,7 @@ eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int
 }
 
 static char *
-eng_image_comment_get(void *data, void *image, char *key __UNUSED__)
+eng_image_comment_get(void *data, void *image, char *key EINA_UNUSED)
 {
 //   Render_Engine *re;
    Evas_GL_Image *im;
@@ -779,7 +779,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
 }
 
 static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
+eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
 {
    Evas_GL_Image *gim = image;
    RGBA_Image *im;
@@ -792,7 +792,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t
 }
 
 static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
+eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
 {
    Evas_GL_Image *gim = image;
    RGBA_Image *im;
@@ -820,13 +820,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x,
 }
 
 static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint)
 {
    if (image) evas_gl_common_image_scale_hint_set(image, hint);
 }
 
 static void
-eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image,  RGBA_Map *m, int smooth, int level)
+eng_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image,  RGBA_Map *m, int smooth, int level)
 {
    Evas_GL_Image *gim = image;
    Render_Engine *re;
@@ -875,7 +875,7 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im
 }
 
 static void *
-eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
+eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha)
 {
    Render_Engine *re;
    
@@ -884,13 +884,13 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
 }
 
 static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
+eng_image_map_surface_free(void *data EINA_UNUSED, void *surface)
 {
    evas_gl_common_image_free(surface);
 }
 
 static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
+eng_image_scale_hint_get(void *data EINA_UNUSED, void *image)
 {
    Evas_GL_Image *gim = image;
    if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
@@ -898,7 +898,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
 }
 
 static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props)
+eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props)
 {
    Render_Engine *re;
 
@@ -929,14 +929,14 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
 }
 
 static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__)
+eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
 {
    // FIXME: support ARGB gl targets!!!
    return EINA_FALSE;
 }
 
 static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
+eng_image_load_error_get(void *data EINA_UNUSED, void *image)
 {
    Evas_GL_Image *im;