From 51023d2d4fd9fbde2e376d32b29dc7b37da70919 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Thu, 20 Jun 2013 12:53:29 +0200 Subject: [PATCH] evas: Keep sane name for public header Evas_Common.h should be used for the public header, and rather rename evas_common.h internal header to another name. Sa: Evas_Common_Header.h -> Evas_Common.h evas_common.h -> evas_common_private.h Shouldn't have both Evas_Common.h and evas_common.h because of case insensitive filesystems. --- src/Makefile_Evas.am | 4 ++-- src/bin/evas/evas_cserve2.h | 2 +- src/bin/evas/evas_cserve2_scale.c | 2 +- src/bin/evas/evas_cserve2_slave.h | 4 ++-- src/lib/evas/Evas.h | 2 +- src/lib/evas/{Evas_Common_Header.h => Evas_Common.h} | 0 src/lib/evas/cache/evas_cache_engine_image.c | 2 +- src/lib/evas/cache/evas_cache_image.c | 2 +- src/lib/evas/cache/evas_preload.c | 2 +- src/lib/evas/cache2/evas_cache2.c | 2 +- src/lib/evas/canvas/common_interfaces.c | 2 +- src/lib/evas/canvas/evas_async_events.c | 2 +- src/lib/evas/canvas/evas_callbacks.c | 2 +- src/lib/evas/canvas/evas_clip.c | 2 +- src/lib/evas/canvas/evas_common_interface.c | 2 +- src/lib/evas/canvas/evas_data.c | 2 +- src/lib/evas/canvas/evas_device.c | 2 +- src/lib/evas/canvas/evas_events.c | 2 +- src/lib/evas/canvas/evas_focus.c | 2 +- src/lib/evas/canvas/evas_font_dir.c | 2 +- src/lib/evas/canvas/evas_gl.c | 2 +- src/lib/evas/canvas/evas_key.c | 2 +- src/lib/evas/canvas/evas_key_grab.c | 2 +- src/lib/evas/canvas/evas_layer.c | 2 +- src/lib/evas/canvas/evas_main.c | 2 +- src/lib/evas/canvas/evas_map.c | 2 +- src/lib/evas/canvas/evas_name.c | 2 +- src/lib/evas/canvas/evas_object_box.c | 2 +- src/lib/evas/canvas/evas_object_grid.c | 2 +- src/lib/evas/canvas/evas_object_image.c | 2 +- src/lib/evas/canvas/evas_object_inform.c | 2 +- src/lib/evas/canvas/evas_object_intercept.c | 2 +- src/lib/evas/canvas/evas_object_line.c | 2 +- src/lib/evas/canvas/evas_object_main.c | 2 +- src/lib/evas/canvas/evas_object_polygon.c | 2 +- src/lib/evas/canvas/evas_object_rectangle.c | 2 +- src/lib/evas/canvas/evas_object_smart.c | 2 +- src/lib/evas/canvas/evas_object_smart_clipped.c | 2 +- src/lib/evas/canvas/evas_object_table.c | 2 +- src/lib/evas/canvas/evas_object_text.c | 2 +- src/lib/evas/canvas/evas_object_textblock.c | 2 +- src/lib/evas/canvas/evas_object_textgrid.c | 2 +- src/lib/evas/canvas/evas_out.c | 2 +- src/lib/evas/canvas/evas_rectangle.c | 2 +- src/lib/evas/canvas/evas_render.c | 2 +- src/lib/evas/canvas/evas_smart.c | 2 +- src/lib/evas/canvas/evas_stack.c | 2 +- src/lib/evas/canvas/evas_stats.c | 2 +- src/lib/evas/canvas/evas_touch_point.c | 2 +- src/lib/evas/common/evas_blend_main.c | 2 +- src/lib/evas/common/evas_blit_main.c | 2 +- src/lib/evas/common/evas_convert_color.c | 2 +- src/lib/evas/common/evas_convert_colorspace.c | 2 +- src/lib/evas/common/evas_convert_gry_1.c | 2 +- src/lib/evas/common/evas_convert_gry_8.c | 2 +- src/lib/evas/common/evas_convert_grypal_6.c | 2 +- src/lib/evas/common/evas_convert_main.c | 2 +- src/lib/evas/common/evas_convert_rgb_16.c | 2 +- src/lib/evas/common/evas_convert_rgb_24.c | 2 +- src/lib/evas/common/evas_convert_rgb_32.c | 2 +- src/lib/evas/common/evas_convert_rgb_8.c | 2 +- src/lib/evas/common/evas_convert_yuv.c | 2 +- src/lib/evas/common/evas_cpu.c | 2 +- src/lib/evas/common/evas_draw_main.c | 2 +- src/lib/evas/common/evas_font_draw.c | 2 +- src/lib/evas/common/evas_font_load.c | 2 +- src/lib/evas/common/evas_font_main.c | 2 +- src/lib/evas/common/evas_font_ot.c | 2 +- src/lib/evas/common/evas_font_query.c | 2 +- src/lib/evas/common/evas_image_data.c | 2 +- src/lib/evas/common/evas_image_load.c | 2 +- src/lib/evas/common/evas_image_main.c | 2 +- src/lib/evas/common/evas_image_save.c | 2 +- src/lib/evas/common/evas_image_scalecache.c | 2 +- src/lib/evas/common/evas_line_main.c | 2 +- src/lib/evas/common/evas_map_image.c | 2 +- src/lib/evas/common/evas_op_add_main_.c | 2 +- src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c | 2 +- src/lib/evas/common/evas_op_blend_main_.c | 2 +- src/lib/evas/common/evas_op_copy_main_.c | 2 +- src/lib/evas/common/evas_op_mask_main_.c | 2 +- src/lib/evas/common/evas_op_mul_main_.c | 2 +- src/lib/evas/common/evas_op_sub_main_.c | 2 +- src/lib/evas/common/evas_pipe.c | 2 +- src/lib/evas/common/evas_polygon_main.c | 2 +- src/lib/evas/common/evas_rectangle_main.c | 2 +- src/lib/evas/common/evas_regionbuf.c | 2 +- src/lib/evas/common/evas_scale_main.c | 2 +- src/lib/evas/common/evas_scale_sample.c | 2 +- src/lib/evas/common/evas_scale_smooth.c | 2 +- src/lib/evas/common/evas_scale_span.c | 2 +- src/lib/evas/common/evas_text_utils.c | 2 +- src/lib/evas/common/evas_thread_render.c | 2 +- src/lib/evas/common/evas_tiler.c | 2 +- src/lib/evas/common/language/evas_bidi_utils.c | 2 +- src/lib/evas/cserve2/evas_cs2_private.h | 2 +- src/lib/evas/file/evas_module.c | 2 +- src/lib/evas/file/evas_path.c | 2 +- src/lib/evas/include/{evas_common.h => evas_common_private.h} | 0 src/lib/evas/main.c | 2 +- src/modules/evas/engines/buffer/evas_engine.c | 4 ++-- src/modules/evas/engines/buffer/evas_engine.h | 2 +- src/modules/evas/engines/buffer/evas_outbuf.c | 2 +- src/modules/evas/engines/drm/evas_engine.c | 2 +- src/modules/evas/engines/drm/evas_outbuf.c | 2 +- src/modules/evas/engines/fb/evas_engine.c | 2 +- src/modules/evas/engines/fb/evas_fb_main.c | 2 +- src/modules/evas/engines/fb/evas_outbuf.c | 2 +- src/modules/evas/engines/gl_cocoa/evas_engine.c | 2 +- src/modules/evas/engines/gl_common/evas_gl_common.h | 2 +- src/modules/evas/engines/gl_sdl/evas_engine.c | 2 +- src/modules/evas/engines/gl_sdl/evas_engine.h | 2 +- src/modules/evas/engines/gl_x11/evas_engine.c | 2 +- src/modules/evas/engines/gl_x11/evas_engine.h | 2 +- src/modules/evas/engines/psl1ght/evas_engine.c | 2 +- src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c | 2 +- src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp | 2 +- src/modules/evas/engines/software_ddraw/evas_engine.c | 2 +- src/modules/evas/engines/software_ddraw/evas_outbuf.c | 2 +- src/modules/evas/engines/software_gdi/evas_engine.c | 2 +- src/modules/evas/engines/software_gdi/evas_gdi_buffer.c | 2 +- src/modules/evas/engines/software_gdi/evas_gdi_main.c | 2 +- src/modules/evas/engines/software_gdi/evas_outbuf.c | 2 +- src/modules/evas/engines/software_generic/evas_engine.c | 2 +- src/modules/evas/engines/software_x11/evas_engine.c | 2 +- src/modules/evas/engines/software_x11/evas_x_egl.c | 2 +- src/modules/evas/engines/software_x11/evas_xcb_buffer.c | 2 +- src/modules/evas/engines/software_x11/evas_xcb_color.c | 2 +- src/modules/evas/engines/software_x11/evas_xcb_main.c | 2 +- src/modules/evas/engines/software_x11/evas_xcb_outbuf.c | 2 +- src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_buffer.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_color.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_main.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_outbuf.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c | 2 +- src/modules/evas/engines/software_x11/evas_xlib_swapper.c | 2 +- src/modules/evas/engines/wayland_egl/evas_engine.c | 2 +- src/modules/evas/engines/wayland_egl/evas_engine.h | 2 +- src/modules/evas/engines/wayland_shm/evas_engine.c | 2 +- src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 2 +- src/modules/evas/engines/wayland_shm/evas_swapper.c | 2 +- src/modules/evas/loaders/bmp/evas_image_load_bmp.c | 2 +- src/modules/evas/loaders/eet/evas_image_load_eet.c | 2 +- src/modules/evas/loaders/generic/evas_image_load_generic.c | 2 +- src/modules/evas/loaders/gif/evas_image_load_gif.c | 2 +- src/modules/evas/loaders/ico/evas_image_load_ico.c | 2 +- src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c | 2 +- src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c | 2 +- src/modules/evas/loaders/png/evas_image_load_png.c | 2 +- src/modules/evas/loaders/psd/evas_image_load_psd.c | 2 +- src/modules/evas/loaders/tga/evas_image_load_tga.c | 2 +- src/modules/evas/loaders/tiff/evas_image_load_tiff.c | 2 +- src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c | 2 +- src/modules/evas/loaders/webp/evas_image_load_webp.c | 2 +- src/modules/evas/loaders/xpm/evas_image_load_xpm.c | 2 +- src/modules/evas/savers/eet/evas_image_save_eet.c | 2 +- src/modules/evas/savers/jpeg/evas_image_save_jpeg.c | 2 +- src/modules/evas/savers/png/evas_image_save_png.c | 2 +- src/modules/evas/savers/tiff/evas_image_save_tiff.c | 2 +- src/modules/evas/savers/webp/evas_image_save_webp.c | 2 +- 161 files changed, 162 insertions(+), 162 deletions(-) rename src/lib/evas/{Evas_Common_Header.h => Evas_Common.h} (100%) rename src/lib/evas/include/{evas_common.h => evas_common_private.h} (100%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index cbb0cdc..7cc9433 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -7,7 +7,7 @@ noinst_LTLIBRARIES = installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@ dist_installed_evasmainheaders_DATA = \ lib/evas/Evas.h \ -lib/evas/Evas_Common_Header.h \ +lib/evas/Evas_Common.h \ lib/evas/Evas_Eo.h \ lib/evas/Evas_Legacy.h \ lib/evas/Evas_GL.h \ @@ -19,7 +19,7 @@ lib/evas/include/evas_private.h \ lib/evas/include/evas_options.h \ lib/evas/include/evas_macros.h \ lib/evas/include/evas_mmx.h \ -lib/evas/include/evas_common.h \ +lib/evas/include/evas_common_private.h \ lib/evas/include/evas_blend_ops.h # Linebreak diff --git a/src/bin/evas/evas_cserve2.h b/src/bin/evas/evas_cserve2.h index 5b4c408..f357c62 100644 --- a/src/bin/evas/evas_cserve2.h +++ b/src/bin/evas/evas_cserve2.h @@ -205,7 +205,7 @@ struct _Slave_Request_Funcs { typedef struct _Slave_Request Slave_Request; typedef struct _Slave_Request_Funcs Slave_Request_Funcs; -/* This enum must be kept in sync with lib/evas/include/evas_common.h */ +/* This enum must be kept in sync with lib/evas/include/evas_common_private.h */ typedef enum { FONT_REND_REGULAR = 0, FONT_REND_SLANT = (1 << 0), diff --git a/src/bin/evas/evas_cserve2_scale.c b/src/bin/evas/evas_cserve2_scale.c index aa96e04..9324432 100644 --- a/src/bin/evas/evas_cserve2_scale.c +++ b/src/bin/evas/evas_cserve2_scale.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" void diff --git a/src/bin/evas/evas_cserve2_slave.h b/src/bin/evas/evas_cserve2_slave.h index a491b45..de846e9 100644 --- a/src/bin/evas/evas_cserve2_slave.h +++ b/src/bin/evas/evas_cserve2_slave.h @@ -3,7 +3,7 @@ #include -/* begin bunch of stuff from evas_common.h so that we don't need to drag +/* begin bunch of stuff from evas_common_private.h so that we don't need to drag * a lot of useless @SOMETHING_CFLAGS@ around */ typedef unsigned long long DATA64; typedef unsigned int DATA32; @@ -43,7 +43,7 @@ typedef unsigned char DATA8; #define ARGB_JOIN(a,r,g,b) \ (((a) << 24) + ((r) << 16) + ((g) << 8) + (b)) -/* end bunchf of stuff from evas_common.h */ +/* end bunchf of stuff from evas_common_private.h */ typedef struct _Evas_Loader_Module_Api Evas_Loader_Module_Api; typedef struct _Evas_Img_Load_Params Evas_Img_Load_Params; diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h index 585ce48..b20576d 100644 --- a/src/lib/evas/Evas.h +++ b/src/lib/evas/Evas.h @@ -283,7 +283,7 @@ extern "C" { #endif -#include +#include #ifndef EFL_NOLEGACY_API_SUPPORT #include #endif diff --git a/src/lib/evas/Evas_Common_Header.h b/src/lib/evas/Evas_Common.h similarity index 100% rename from src/lib/evas/Evas_Common_Header.h rename to src/lib/evas/Evas_Common.h diff --git a/src/lib/evas/cache/evas_cache_engine_image.c b/src/lib/evas/cache/evas_cache_engine_image.c index c0c4a6e..ffe2d59 100644 --- a/src/lib/evas/cache/evas_cache_engine_image.c +++ b/src/lib/evas/cache/evas_cache_engine_image.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static void diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c index fdc20c6..fe779a5 100644 --- a/src/lib/evas/cache/evas_cache_image.c +++ b/src/lib/evas/cache/evas_cache_image.c @@ -12,7 +12,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" //#define CACHEDUMP 1 diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c index f3121a9..775871e 100644 --- a/src/lib/evas/cache/evas_preload.c +++ b/src/lib/evas/cache/evas_preload.c @@ -7,7 +7,7 @@ #ifdef __linux__ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Evas.h" diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c index e84b41d..1e9b24f 100644 --- a/src/lib/evas/cache2/evas_cache2.c +++ b/src/lib/evas/cache2/evas_cache2.c @@ -12,7 +12,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_cache2.h" #include "evas_cs2.h" diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index 0246138..f608caa 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c index 76d38cb..dd3c593 100644 --- a/src/lib/evas/canvas/evas_async_events.c +++ b/src/lib/evas/canvas/evas_async_events.c @@ -8,7 +8,7 @@ #include #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _Evas_Event_Async Evas_Event_Async; diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index b85cc39..8dbdfe8 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" int _evas_event_counter = 0; diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 1d98dc9..0d3999e 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" void diff --git a/src/lib/evas/canvas/evas_common_interface.c b/src/lib/evas/canvas/evas_common_interface.c index 8f16d5a..258fba0 100644 --- a/src/lib/evas/canvas/evas_common_interface.c +++ b/src/lib/evas/canvas/evas_common_interface.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c index 1d1d698..01355b3 100644 --- a/src/lib/evas/canvas/evas_data.c +++ b/src/lib/evas/canvas/evas_data.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index 091c23a..a896bb7 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" EAPI Evas_Device * diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 02c3714..93e892f 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static Eina_List * diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c index 38c6af0..ab75ae1 100644 --- a/src/lib/evas/canvas/evas_focus.c +++ b/src/lib/evas/canvas/evas_focus.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* private calls */ diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index cf68563..5eea308 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -12,7 +12,7 @@ #include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* font dir cache */ diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c index 14a4dd6..bfad83c 100644 --- a/src/lib/evas/canvas/evas_gl.c +++ b/src/lib/evas/canvas/evas_gl.c @@ -1,5 +1,5 @@ /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Evas_GL.h" diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c index aef0fc4..e48bbfe 100644 --- a/src/lib/evas/canvas/evas_key.c +++ b/src/lib/evas/canvas/evas_key.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* private calls */ diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c index 202c9bf..19b6594 100644 --- a/src/lib/evas/canvas/evas_key_grab.c +++ b/src/lib/evas/canvas/evas_key_grab.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* private calls */ diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index b30ba66..2484d6c 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static void _evas_layer_free(Evas_Layer *lay); diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 79687ee..e4df1f8 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" //#include "evas_cs.h" #ifdef EVAS_CSERVE2 diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c index 66843da..2a6873a 100644 --- a/src/lib/evas/canvas/evas_map.c +++ b/src/lib/evas/canvas/evas_map.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c index 9693f0c..454fb89 100644 --- a/src/lib/evas/canvas/evas_name.c +++ b/src/lib/evas/canvas/evas_name.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" EAPI void diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 7b5c654..84200ed 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #ifdef _WIN32_WCE diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index f2a5779..c0bbc96 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index bced46c..e89f442 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -10,7 +10,7 @@ #endif #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #ifdef EVAS_CSERVE2 #include "../cserve2/evas_cs2_private.h" diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index c48b07f..c4aa8e1 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* local calls */ diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c index 41418f1..7bf6954 100644 --- a/src/lib/evas/canvas/evas_object_intercept.c +++ b/src/lib/evas/canvas/evas_object_intercept.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* local calls */ diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index 10cf366..8c8e1c5 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index f1ba18f..c0b3d7e 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" EVAS_MEMPOOL(_mp_sh); diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index ad4f9b2..28c3e0b 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index 6c35155..27da847 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index cc2e4dd..e5c2a0c 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 1656dc0..f247f6d 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID = EO_NOOP; diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 57e7dc6..efe3240 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 932603b..c36f6d5 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Includes evas_bidi_utils stuff. */ +#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */ #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 7130d31..4ac813d 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -61,7 +61,7 @@ * @subsection textblock_layout The layout system * @todo write @ref textblock_layout */ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index dc6e6e7..c5c7a3e 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Includes evas_bidi_utils stuff. */ +#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */ #include "evas_private.h" #include "Eo.h" diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 3d22e52..592c038 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" //#include "evas_cs.h" #ifdef EVAS_CSERVE2 diff --git a/src/lib/evas/canvas/evas_rectangle.c b/src/lib/evas/canvas/evas_rectangle.c index da6b701..bfa4a8a 100644 --- a/src/lib/evas/canvas/evas_rectangle.c +++ b/src/lib/evas/canvas/evas_rectangle.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" void diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 044bac6..c6cfebf 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include #ifdef EVAS_CSERVE2 diff --git a/src/lib/evas/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c index 87856b7..ccd9a69 100644 --- a/src/lib/evas/canvas/evas_smart.c +++ b/src/lib/evas/canvas/evas_smart.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index 1f1f210..e8b626b 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static Evas_Object_Protected_Data * diff --git a/src/lib/evas/canvas/evas_stats.c b/src/lib/evas/canvas/evas_stats.c index ba6f8ac..f178fba 100644 --- a/src/lib/evas/canvas/evas_stats.c +++ b/src/lib/evas/canvas/evas_stats.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" //#include "evas_cs.h" diff --git a/src/lib/evas/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c index 759ac8f..83da0a1 100644 --- a/src/lib/evas/canvas/evas_touch_point.c +++ b/src/lib/evas/canvas/evas_touch_point.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" void diff --git a/src/lib/evas/common/evas_blend_main.c b/src/lib/evas/common/evas_blend_main.c index d37d888..6e08382 100644 --- a/src/lib/evas/common/evas_blend_main.c +++ b/src/lib/evas/common/evas_blend_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_blend_private.h" #ifdef BUILD_MMX diff --git a/src/lib/evas/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c index bed6d01..2daaab9 100644 --- a/src/lib/evas/common/evas_blit_main.c +++ b/src/lib/evas/common/evas_blit_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #ifdef BUILD_MMX #include "evas_mmx.h" diff --git a/src/lib/evas/common/evas_convert_color.c b/src/lib/evas/common/evas_convert_color.c index 70a9e90..34bb978 100644 --- a/src/lib/evas/common/evas_convert_color.c +++ b/src/lib/evas/common/evas_convert_color.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_color.h" diff --git a/src/lib/evas/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c index 49b066c..1227804 100644 --- a/src/lib/evas/common/evas_convert_colorspace.c +++ b/src/lib/evas/common/evas_convert_colorspace.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_colorspace.h" #define CONVERT_RGB_565_TO_RGB_888(s) \ diff --git a/src/lib/evas/common/evas_convert_gry_1.c b/src/lib/evas/common/evas_convert_gry_1.c index df12ea6..d4eca7d 100644 --- a/src/lib/evas/common/evas_convert_gry_1.c +++ b/src/lib/evas/common/evas_convert_gry_1.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_gry_1.h" void evas_common_convert_rgba_to_1bpp_gry_1_dith(DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED) diff --git a/src/lib/evas/common/evas_convert_gry_8.c b/src/lib/evas/common/evas_convert_gry_8.c index 072a7dc..30993ce 100644 --- a/src/lib/evas/common/evas_convert_gry_8.c +++ b/src/lib/evas/common/evas_convert_gry_8.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_gry_8.h" #ifdef USE_DITHER_44 diff --git a/src/lib/evas/common/evas_convert_grypal_6.c b/src/lib/evas/common/evas_convert_grypal_6.c index 243bf00..920fcfd 100644 --- a/src/lib/evas/common/evas_convert_grypal_6.c +++ b/src/lib/evas/common/evas_convert_grypal_6.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_grypal_6.h" void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal) diff --git a/src/lib/evas/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c index 55a2851..ac028b8 100644 --- a/src/lib/evas/common/evas_convert_main.c +++ b/src/lib/evas/common/evas_convert_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_rgb_8.h" #include "evas_convert_rgb_16.h" #include "evas_convert_rgb_24.h" diff --git a/src/lib/evas/common/evas_convert_rgb_16.c b/src/lib/evas/common/evas_convert_rgb_16.c index d7a4f49..dcf49ee 100644 --- a/src/lib/evas/common/evas_convert_rgb_16.c +++ b/src/lib/evas/common/evas_convert_rgb_16.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_rgb_16.h" #ifndef BUILD_NO_DITHER_MASK diff --git a/src/lib/evas/common/evas_convert_rgb_24.c b/src/lib/evas/common/evas_convert_rgb_24.c index c1d196e..d02f835 100644 --- a/src/lib/evas/common/evas_convert_rgb_24.c +++ b/src/lib/evas/common/evas_convert_rgb_24.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_rgb_24.h" void diff --git a/src/lib/evas/common/evas_convert_rgb_32.c b/src/lib/evas/common/evas_convert_rgb_32.c index b765226..11c47e2 100644 --- a/src/lib/evas/common/evas_convert_rgb_32.c +++ b/src/lib/evas/common/evas_convert_rgb_32.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_rgb_32.h" void diff --git a/src/lib/evas/common/evas_convert_rgb_8.c b/src/lib/evas/common/evas_convert_rgb_8.c index 7ae0e86..2cf178c 100644 --- a/src/lib/evas/common/evas_convert_rgb_8.c +++ b/src/lib/evas/common/evas_convert_rgb_8.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_rgb_8.h" #ifdef USE_DITHER_44 diff --git a/src/lib/evas/common/evas_convert_yuv.c b/src/lib/evas/common/evas_convert_yuv.c index 0b6aa6a..b7e98e2 100644 --- a/src/lib/evas/common/evas_convert_yuv.c +++ b/src/lib/evas/common/evas_convert_yuv.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_yuv.h" #ifdef BUILD_MMX diff --git a/src/lib/evas/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c index f9cecff..4139098 100644 --- a/src/lib/evas/common/evas_cpu.c +++ b/src/lib/evas/common/evas_cpu.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #ifdef BUILD_MMX #include "evas_mmx.h" #endif diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c index bf0f96b..296ffe8 100644 --- a/src/lib/evas/common/evas_draw_main.c +++ b/src/lib/evas/common/evas_draw_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_main.h" #include "evas_private.h" diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c index 7a182f8..184c477 100644 --- a/src/lib/evas/common/evas_font_draw.c +++ b/src/lib/evas/common/evas_font_draw.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_blend_private.h" diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c index 76e0382..2e1ce0e 100644 --- a/src/lib/evas/common/evas_font_load.c +++ b/src/lib/evas/common/evas_font_load.c @@ -10,7 +10,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_font_private.h" /* for Frame-Queuing support */ diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c index 80d7221..23ba95b 100644 --- a/src/lib/evas/common/evas_font_main.c +++ b/src/lib/evas/common/evas_font_main.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_font_private.h" diff --git a/src/lib/evas/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c index 0024376..31383a4 100644 --- a/src/lib/evas/common/evas_font_ot.c +++ b/src/lib/evas/common/evas_font_ot.c @@ -5,7 +5,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include #include "evas_font_private.h" diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c index c2f68de..b2a63c0 100644 --- a/src/lib/evas/common/evas_font_query.c +++ b/src/lib/evas/common/evas_font_query.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ #include "evas_font_private.h" /* for Frame-Queuing support */ #include "evas_font_ot.h" diff --git a/src/lib/evas/common/evas_image_data.c b/src/lib/evas/common/evas_image_data.c index 25cf3d7..fe80832 100644 --- a/src/lib/evas/common/evas_image_data.c +++ b/src/lib/evas/common/evas_image_data.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_image.h" diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c index 7d0d671..b832e3f 100644 --- a/src/lib/evas/common/evas_image_load.c +++ b/src/lib/evas/common/evas_image_load.c @@ -6,7 +6,7 @@ #include #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" //#include "evas_cs.h" #ifdef EVAS_CSERVE2 diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c index 3d9972a..5d12578 100644 --- a/src/lib/evas/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -6,7 +6,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_image_private.h" #include "evas_convert_yuv.h" diff --git a/src/lib/evas/common/evas_image_save.c b/src/lib/evas/common/evas_image_save.c index ad69a10..1de5e6d 100644 --- a/src/lib/evas/common/evas_image_save.c +++ b/src/lib/evas/common/evas_image_save.c @@ -4,7 +4,7 @@ #include "evas_options.h" -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 40463a9..5d7a440 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c @@ -11,7 +11,7 @@ #ifdef EVAS_CSERVE2 #include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_image_private.h" diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c index 1985b46..d3abf1a 100644 --- a/src/lib/evas/common/evas_line_main.c +++ b/src/lib/evas/common/evas_line_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_blend_private.h" #define IN_RANGE(x, y, w, h) \ diff --git a/src/lib/evas/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c index a9e7139..742ab74 100644 --- a/src/lib/evas/common/evas_map_image.c +++ b/src/lib/evas/common/evas_map_image.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_blend_private.h" #ifdef EVAS_CSERVE2 diff --git a/src/lib/evas/common/evas_op_add_main_.c b/src/lib/evas/common/evas_op_add_main_.c index bde553c..294f1d9 100644 --- a/src/lib/evas/common/evas_op_add_main_.c +++ b/src/lib/evas/common/evas_op_add_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c index eac6755..667838e 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c @@ -1,6 +1,6 @@ #define NEED_SSE3 1 -#include "evas_common.h" +#include "evas_common_private.h" #ifdef BUILD_SSE3 static __m128i A_MASK_SSE3; diff --git a/src/lib/evas/common/evas_op_blend_main_.c b/src/lib/evas/common/evas_op_blend_main_.c index fdfb1dc..5c85673 100644 --- a/src/lib/evas/common/evas_op_blend_main_.c +++ b/src/lib/evas/common/evas_op_blend_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" RGBA_Gfx_Func op_blend_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; RGBA_Gfx_Pt_Func op_blend_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_op_copy_main_.c b/src/lib/evas/common/evas_op_copy_main_.c index 9debe17..6e3881d 100644 --- a/src/lib/evas/common/evas_op_copy_main_.c +++ b/src/lib/evas/common/evas_op_copy_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_blend_private.h" static RGBA_Gfx_Func op_copy_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_op_mask_main_.c b/src/lib/evas/common/evas_op_mask_main_.c index 4ed41d6..55a5d95 100644 --- a/src/lib/evas/common/evas_op_mask_main_.c +++ b/src/lib/evas/common/evas_op_mask_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" static RGBA_Gfx_Func op_mask_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; static RGBA_Gfx_Pt_Func op_mask_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_op_mul_main_.c b/src/lib/evas/common/evas_op_mul_main_.c index 26604d7..222062e 100644 --- a/src/lib/evas/common/evas_op_mul_main_.c +++ b/src/lib/evas/common/evas_op_mul_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" static RGBA_Gfx_Func op_mul_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; static RGBA_Gfx_Pt_Func op_mul_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_op_sub_main_.c b/src/lib/evas/common/evas_op_sub_main_.c index 9301cac..02bfdbd 100644 --- a/src/lib/evas/common/evas_op_sub_main_.c +++ b/src/lib/evas/common/evas_op_sub_main_.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" static RGBA_Gfx_Func op_sub_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; static RGBA_Gfx_Pt_Func op_sub_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c index 02f74dc..4c08bc5 100644 --- a/src/lib/evas/common/evas_pipe.c +++ b/src/lib/evas/common/evas_pipe.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include #ifdef BUILD_PIPE_RENDER diff --git a/src/lib/evas/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c index 8635d1c..52dd180 100644 --- a/src/lib/evas/common/evas_polygon_main.c +++ b/src/lib/evas/common/evas_polygon_main.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_blend_private.h" typedef struct _RGBA_Span RGBA_Span; diff --git a/src/lib/evas/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c index 4aa536a..c472242 100644 --- a/src/lib/evas/common/evas_rectangle_main.c +++ b/src/lib/evas/common/evas_rectangle_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_blend_private.h" diff --git a/src/lib/evas/common/evas_regionbuf.c b/src/lib/evas/common/evas_regionbuf.c index f381da5..3b14af8 100644 --- a/src/lib/evas/common/evas_regionbuf.c +++ b/src/lib/evas/common/evas_regionbuf.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #if 0 Regionbuf * diff --git a/src/lib/evas/common/evas_scale_main.c b/src/lib/evas/common/evas_scale_main.c index 9166266..8de658b 100644 --- a/src/lib/evas/common/evas_scale_main.c +++ b/src/lib/evas/common/evas_scale_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" EAPI void diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c index 68106a8..6aaa902 100644 --- a/src/lib/evas/common/evas_scale_sample.c +++ b/src/lib/evas/common/evas_scale_sample.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_blend_private.h" static Eina_Bool scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); diff --git a/src/lib/evas/common/evas_scale_smooth.c b/src/lib/evas/common/evas_scale_smooth.c index c9c51a7..02dbe7d 100644 --- a/src/lib/evas/common/evas_scale_smooth.c +++ b/src/lib/evas/common/evas_scale_smooth.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_scale_smooth.h" #include "evas_blend_private.h" diff --git a/src/lib/evas/common/evas_scale_span.c b/src/lib/evas/common/evas_scale_span.c index 5182a97..8e5bf6c 100644 --- a/src/lib/evas/common/evas_scale_span.c +++ b/src/lib/evas/common/evas_scale_span.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_convert_color.h" #include "evas_scale_span.h" diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c index bad68b2..14d0948 100644 --- a/src/lib/evas/common/evas_text_utils.c +++ b/src/lib/evas/common/evas_text_utils.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_font_private.h" #include "evas_text_utils.h" #include "language/evas_bidi_utils.h" diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c index 40964ba..f37f43a 100644 --- a/src/lib/evas/common/evas_thread_render.c +++ b/src/lib/evas/common/evas_thread_render.c @@ -1,6 +1,6 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" static Eina_Thread evas_thread_worker; static Eina_Condition evas_thread_queue_condition; diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c index b61e770..6315c3c 100644 --- a/src/lib/evas/common/evas_tiler.c +++ b/src/lib/evas/common/evas_tiler.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #ifdef EVAS_RECT_SPLIT static inline void rect_list_node_pool_set_max(int max); diff --git a/src/lib/evas/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c index 324db31..0707f4e 100644 --- a/src/lib/evas/common/language/evas_bidi_utils.c +++ b/src/lib/evas/common/language/evas_bidi_utils.c @@ -5,7 +5,7 @@ #include #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_bidi_utils.h" #include "evas_font_private.h" diff --git a/src/lib/evas/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h index cb43571..b055d1b 100644 --- a/src/lib/evas/cserve2/evas_cs2_private.h +++ b/src/lib/evas/cserve2/evas_cs2_private.h @@ -1,7 +1,7 @@ #ifndef EVAS_CS2_PRIVATE_H #define EVAS_CS2_PRIVATE_H 1 -#include "evas_common.h" +#include "evas_common_private.h" struct _Data_Entry { unsigned int image_id; diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index 539ef5e..b7490c6 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c index 2ff646d..6d78218 100644 --- a/src/lib/evas/file/evas_path.c +++ b/src/lib/evas/file/evas_path.c @@ -22,7 +22,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #ifdef _WIN32 diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common_private.h similarity index 100% rename from src/lib/evas/include/evas_common.h rename to src/lib/evas/include/evas_common_private.h diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c index 604c14d..caf8de1 100644 --- a/src/lib/evas/main.c +++ b/src/lib/evas/main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static Evas_Version _version = { VMAJ, VMIN, VMIC, VREV }; diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c index 72df536..1680f2c 100644 --- a/src/modules/evas/engines/buffer/evas_engine.c +++ b/src/modules/evas/engines/buffer/evas_engine.c @@ -1,10 +1,10 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" #include "Evas_Engine_Buffer.h" /* domain for eina_log */ -/* the log macros are defined in evas_common.h */ +/* the log macros are defined in evas_common_private.h */ /* theirs names are EVAS_ERR, EVAS_DBG, EVAS_CRIT, EVAS_WRN and EVAS_INF */ /* although we can use the EVAS_ERROR, etc... macros it will not work when the -fvisibility=hidden option is passed to gcc */ diff --git a/src/modules/evas/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h index af82477..8cdf8f4 100644 --- a/src/modules/evas/engines/buffer/evas_engine.h +++ b/src/modules/evas/engines/buffer/evas_engine.h @@ -1,6 +1,6 @@ #ifndef EVAS_ENGINE_H #define EVAS_ENGINE_H -#include "evas_common.h" +#include "evas_common_private.h" /* this thing is for eina_log */ extern int _evas_engine_buffer_log_dom ; diff --git a/src/modules/evas/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c index 58ce0e6..af5566f 100644 --- a/src/modules/evas/engines/buffer/evas_outbuf.c +++ b/src/modules/evas/engines/buffer/evas_outbuf.c @@ -6,7 +6,7 @@ #include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" void diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index 064b0bd..cc5e86f 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Evas_Engine_Drm.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/drm/evas_outbuf.c b/src/modules/evas/engines/drm/evas_outbuf.c index 420e431..e6327b6 100644 --- a/src/modules/evas/engines/drm/evas_outbuf.c +++ b/src/modules/evas/engines/drm/evas_outbuf.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c index 3a1a11b..ea73f8e 100644 --- a/src/modules/evas/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" #include "Evas_Engine_FB.h" diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c index 5cf2ac4..451171d 100644 --- a/src/modules/evas/engines/fb/evas_fb_main.c +++ b/src/modules/evas/engines/fb/evas_fb_main.c @@ -4,7 +4,7 @@ /* some other system if needed. */ /* Copyright (c) 1999 - Carsten Haitzler (The Rasterman) */ /* -------------------------------------------------------------------- */ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_fb.h" #include diff --git a/src/modules/evas/engines/fb/evas_outbuf.c b/src/modules/evas/engines/fb/evas_outbuf.c index 7ae24c5..04985d3 100644 --- a/src/modules/evas/engines/fb/evas_outbuf.c +++ b/src/modules/evas/engines/fb/evas_outbuf.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" #include #include diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c index bdc0b2c..83c2968 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Also includes international specific stuff */ +#include "evas_common_private.h" /* Also includes international specific stuff */ #include "evas_engine.h" #include "evas_private.h" diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h index 4bc2196..8dc08ae 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -1,7 +1,7 @@ #ifndef EVAS_GL_COMMON_H #define EVAS_GL_COMMON_H -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "config.h" diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c index daf1d26..5c5df60 100644 --- a/src/modules/evas/engines/gl_sdl/evas_engine.c +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Also includes international specific stuff */ +#include "evas_common_private.h" /* Also includes international specific stuff */ #include "evas_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.h b/src/modules/evas/engines/gl_sdl/evas_engine.h index adc03b9..837b7d9 100644 --- a/src/modules/evas/engines/gl_sdl/evas_engine.h +++ b/src/modules/evas/engines/gl_sdl/evas_engine.h @@ -17,7 +17,7 @@ # include # define EVAS_SDL_GL_FLAG SDL_OPENGL #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_gl_common.h" #include "Evas.h" diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index f467c29..7f408fd 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Also includes international specific stuff */ +#include "evas_common_private.h" /* Also includes international specific stuff */ #include "evas_engine.h" #include "evas_gl_core_private.h" diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h index aee58b1..371a10b 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.h +++ b/src/modules/evas/engines/gl_x11/evas_engine.h @@ -2,7 +2,7 @@ #define EVAS_ENGINE_H #include "config.h" -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_gl_common.h" #include "Evas.h" diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c index 422db09..0f5bcc7 100644 --- a/src/modules/evas/engines/psl1ght/evas_engine.c +++ b/src/modules/evas/engines/psl1ght/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" #include "rsxutil.h" diff --git a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c index 7ef9211..3b94686 100644 --- a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c +++ b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c @@ -1,6 +1,6 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp b/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp index 2c467c8..a55cebc 100644 --- a/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp +++ b/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" int diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c index a1ab1cd..0520ada 100644 --- a/src/modules/evas/engines/software_ddraw/evas_engine.c +++ b/src/modules/evas/engines/software_ddraw/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" #include "Evas_Engine_Software_DDraw.h" diff --git a/src/modules/evas/engines/software_ddraw/evas_outbuf.c b/src/modules/evas/engines/software_ddraw/evas_outbuf.c index 5a5f0a2..8600e0a 100644 --- a/src/modules/evas/engines/software_ddraw/evas_outbuf.c +++ b/src/modules/evas/engines/software_ddraw/evas_outbuf.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c index 2f29867..9ed5851 100644 --- a/src/modules/evas/engines/software_gdi/evas_engine.c +++ b/src/modules/evas/engines/software_gdi/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "evas_engine.h" #include "Evas_Engine_Software_Gdi.h" diff --git a/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c b/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c index 66a5abf..fe69d73 100644 --- a/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c +++ b/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c @@ -1,6 +1,6 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" Gdi_Output_Buffer * diff --git a/src/modules/evas/engines/software_gdi/evas_gdi_main.c b/src/modules/evas/engines/software_gdi/evas_gdi_main.c index 2880270..2ffc0c1 100644 --- a/src/modules/evas/engines/software_gdi/evas_gdi_main.c +++ b/src/modules/evas/engines/software_gdi/evas_gdi_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_gdi/evas_outbuf.c b/src/modules/evas/engines/software_gdi/evas_outbuf.c index 87b3048..f406256 100644 --- a/src/modules/evas/engines/software_gdi/evas_outbuf.c +++ b/src/modules/evas/engines/software_gdi/evas_outbuf.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 4281112..293536d 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" /* Also includes international specific stuff */ +#include "evas_common_private.h" /* Also includes international specific stuff */ #include "evas_private.h" #include "evas_blend_private.h" #ifdef EVAS_CSERVE2 diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 23e76df..da21b9b 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Evas_Engine_Software_X11.h" diff --git a/src/modules/evas/engines/software_x11/evas_x_egl.c b/src/modules/evas/engines/software_x11/evas_x_egl.c index cf783df..95b4e24 100644 --- a/src/modules/evas/engines/software_x11/evas_x_egl.c +++ b/src/modules/evas/engines/software_x11/evas_x_egl.c @@ -5,7 +5,7 @@ #ifdef EVAS_CSERVE2 #include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #ifdef HAVE_DLSYM diff --git a/src/modules/evas/engines/software_x11/evas_xcb_buffer.c b/src/modules/evas/engines/software_x11/evas_xcb_buffer.c index 9136eb5..38d4584 100644 --- a/src/modules/evas/engines/software_x11/evas_xcb_buffer.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_buffer.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_xcb_buffer.h" /* local function prototypes */ diff --git a/src/modules/evas/engines/software_x11/evas_xcb_color.c b/src/modules/evas/engines/software_x11/evas_xcb_color.c index 2362ac2..65c0516 100644 --- a/src/modules/evas/engines/software_x11/evas_xcb_color.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_color.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_x11/evas_xcb_main.c b/src/modules/evas/engines/software_x11/evas_xcb_main.c index d187016..c255e79 100644 --- a/src/modules/evas/engines/software_x11/evas_xcb_main.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" void diff --git a/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c index e8502d6..ba544ef 100644 --- a/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c @@ -7,7 +7,7 @@ #ifdef EVAS_CSERVE2 # include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_xcb_outbuf.h" #include "evas_xcb_buffer.h" diff --git a/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c index 3a0bda5..de0f599 100644 --- a/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c +++ b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_xcb_xdefaults.h" #include diff --git a/src/modules/evas/engines/software_x11/evas_xlib_buffer.c b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c index bdf308d..9faf9eb 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_buffer.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_xlib_buffer.h" diff --git a/src/modules/evas/engines/software_x11/evas_xlib_color.c b/src/modules/evas/engines/software_x11/evas_xlib_color.c index 806823d..d5592ec 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_color.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_color.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/software_x11/evas_xlib_main.c b/src/modules/evas/engines/software_x11/evas_xlib_main.c index 3c153e1..dea33db 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_main.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_main.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" void diff --git a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c index d495931..a189acc 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c @@ -8,7 +8,7 @@ #ifdef EVAS_CSERVE2 #include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_xlib_outbuf.h" #include "evas_xlib_buffer.h" diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c index df47404..a8cfa53 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c @@ -8,7 +8,7 @@ #ifdef EVAS_CSERVE2 #include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_xlib_swapbuf.h" diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapper.c b/src/modules/evas/engines/software_x11/evas_xlib_swapper.c index 1e2bd6f..65ad478 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_swapper.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_swapper.c @@ -2,7 +2,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_xlib_swapper.h" diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index f8315f7..7e4d3cd 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_engine.h" #include "evas_gl_core_private.h" diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h index ea54090..02e1937 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.h +++ b/src/modules/evas/engines/wayland_egl/evas_engine.h @@ -13,7 +13,7 @@ /* # include */ # endif -# include "evas_common.h" +# include "evas_common_private.h" # include "evas_private.h" # include "evas_gl_common.h" # include "Evas.h" diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 2194424..7320086 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include "Evas_Engine_Wayland_Shm.h" #include "evas_engine.h" diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c index 10dcdb7..ccb51ca 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c @@ -8,7 +8,7 @@ # include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_engine.h" #include "evas_swapbuf.h" diff --git a/src/modules/evas/engines/wayland_shm/evas_swapper.c b/src/modules/evas/engines/wayland_shm/evas_swapper.c index 73764a0..74ad08e 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapper.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapper.c @@ -8,7 +8,7 @@ # include "evas_cs2_private.h" #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_macros.h" #include "evas_engine.h" #include "evas_swapper.h" diff --git a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c index ea86238..a8e2abf 100644 --- a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c +++ b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c @@ -10,7 +10,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _BMP_Header BMP_Header; diff --git a/src/modules/evas/loaders/eet/evas_image_load_eet.c b/src/modules/evas/loaders/eet/evas_image_load_eet.c index bad82c6..6ad0b4a 100644 --- a/src/modules/evas/loaders/eet/evas_image_load_eet.c +++ b/src/modules/evas/loaders/eet/evas_image_load_eet.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _Evas_Loader_Internal Evas_Loader_Internal; diff --git a/src/modules/evas/loaders/generic/evas_image_load_generic.c b/src/modules/evas/loaders/generic/evas_image_load_generic.c index 0ca7b41..6757d0a 100644 --- a/src/modules/evas/loaders/generic/evas_image_load_generic.c +++ b/src/modules/evas/loaders/generic/evas_image_load_generic.c @@ -6,7 +6,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c index e3de8a5..edf8137 100644 --- a/src/modules/evas/loaders/gif/evas_image_load_gif.c +++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/modules/evas/loaders/ico/evas_image_load_ico.c b/src/modules/evas/loaders/ico/evas_image_load_ico.c index 993b5ad..9f96e69 100644 --- a/src/modules/evas/loaders/ico/evas_image_load_ico.c +++ b/src/modules/evas/loaders/ico/evas_image_load_ico.c @@ -8,7 +8,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _Evas_Loader_Internal Evas_Loader_Internal; diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c index 4e95bf5..1cea16b 100644 --- a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c +++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c @@ -11,7 +11,7 @@ #include #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _JPEG_error_mgr *emptr; diff --git a/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c index 2eb1ecd..b2dca89 100644 --- a/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c +++ b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c @@ -6,7 +6,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #define FILE_BUFFER_SIZE 1024 * 32 diff --git a/src/modules/evas/loaders/png/evas_image_load_png.c b/src/modules/evas/loaders/png/evas_image_load_png.c index 08430e0..e670038 100644 --- a/src/modules/evas/loaders/png/evas_image_load_png.c +++ b/src/modules/evas/loaders/png/evas_image_load_png.c @@ -10,7 +10,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #define PNG_BYTES_TO_CHECK 4 diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c index ab9cc70..d11a7f6 100644 --- a/src/modules/evas/loaders/psd/evas_image_load_psd.c +++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c @@ -23,7 +23,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" typedef struct _PSD_Header PSD_Header; diff --git a/src/modules/evas/loaders/tga/evas_image_load_tga.c b/src/modules/evas/loaders/tga/evas_image_load_tga.c index 8729402..8a482c4 100644 --- a/src/modules/evas/loaders/tga/evas_image_load_tga.c +++ b/src/modules/evas/loaders/tga/evas_image_load_tga.c @@ -10,7 +10,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" /* TGA pixel formats */ diff --git a/src/modules/evas/loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c index 29248f6..260a8b8 100644 --- a/src/modules/evas/loaders/tiff/evas_image_load_tiff.c +++ b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c @@ -11,7 +11,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int _evas_loader_tiff_log_dom = -1; diff --git a/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c index a2dc24d..1726b55 100644 --- a/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c +++ b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c @@ -8,7 +8,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int diff --git a/src/modules/evas/loaders/webp/evas_image_load_webp.c b/src/modules/evas/loaders/webp/evas_image_load_webp.c index e6d66f8..69ac690 100644 --- a/src/modules/evas/loaders/webp/evas_image_load_webp.c +++ b/src/modules/evas/loaders/webp/evas_image_load_webp.c @@ -10,7 +10,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static Eina_Bool diff --git a/src/modules/evas/loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c index cc94709..f09a8a2 100644 --- a/src/modules/evas/loaders/xpm/evas_image_load_xpm.c +++ b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c @@ -6,7 +6,7 @@ # include #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int _evas_loader_xpm_log_dom = -1; diff --git a/src/modules/evas/savers/eet/evas_image_save_eet.c b/src/modules/evas/savers/eet/evas_image_save_eet.c index 26d58d4..64e903b 100644 --- a/src/modules/evas/savers/eet/evas_image_save_eet.c +++ b/src/modules/evas/savers/eet/evas_image_save_eet.c @@ -4,7 +4,7 @@ #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int evas_image_save_file_eet(RGBA_Image *im, const char *file, const char *key, int quality, int compress); diff --git a/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c index c653c77..b0cf5f8 100644 --- a/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c +++ b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/modules/evas/savers/png/evas_image_save_png.c b/src/modules/evas/savers/png/evas_image_save_png.c index ab75681..cc31441 100644 --- a/src/modules/evas/savers/png/evas_image_save_png.c +++ b/src/modules/evas/savers/png/evas_image_save_png.c @@ -18,7 +18,7 @@ # define E_FCLOSE(stream) fclose(stream) #endif -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key, int quality, int compress); diff --git a/src/modules/evas/savers/tiff/evas_image_save_tiff.c b/src/modules/evas/savers/tiff/evas_image_save_tiff.c index 9cef969..84c73bb 100644 --- a/src/modules/evas/savers/tiff/evas_image_save_tiff.c +++ b/src/modules/evas/savers/tiff/evas_image_save_tiff.c @@ -1,4 +1,4 @@ -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" #include diff --git a/src/modules/evas/savers/webp/evas_image_save_webp.c b/src/modules/evas/savers/webp/evas_image_save_webp.c index 9c2cbd1..2c27b36 100644 --- a/src/modules/evas/savers/webp/evas_image_save_webp.c +++ b/src/modules/evas/savers/webp/evas_image_save_webp.c @@ -5,7 +5,7 @@ #include #include -#include "evas_common.h" +#include "evas_common_private.h" #include "evas_private.h" static int evas_image_save_file_webp(RGBA_Image *im, const char *file, const char *key, int quality, int compress); -- 2.7.4