devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=be76c3ca47b201a8abaf8caeaf300c3c8b23deb2
commit be76c3ca47b201a8abaf8caeaf300c3c8b23deb2 Author: Christopher Michael <[email protected]> Date: Mon Jan 28 11:59:47 2019 -0500 evas: Remove left over includes from cserve2 removal NB: No functional changes. These were missed when cserve2 support was removed --- src/lib/evas/canvas/evas_object_text.c | 4 ---- src/lib/evas/canvas/evas_out.c | 3 --- src/lib/evas/common/evas_font.h | 3 --- src/lib/evas/filters/evas_filter.c | 4 ---- 4 files changed, 14 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 07b8202fd3..bf95b8e4b2 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -11,10 +11,6 @@ #define MY_CLASS_NAME "Evas_Text" -#ifdef EVAS_CSERVE2 -# include "evas_cs2_private.h" -#endif - /* save typing */ #define COL_OBJECT(obj, sub) ARGB_JOIN(obj->sub->color.a, obj->sub->color.r, obj->sub->color.g, obj->sub->color.b) #define COL_JOIN(o, sub, color) ARGB_JOIN(o->sub.color.a, o->sub.color.r, o->sub.color.g, o->sub.color.b) diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 40cce4ce04..35ea97d579 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -1,9 +1,6 @@ #include "evas_common_private.h" #include "evas_private.h" //#include "evas_cs.h" -#ifdef EVAS_CSERVE2 -#include "evas_cs2_private.h" -#endif static Evas_Public_Data * _efl_canvas_output_async_block(Efl_Canvas_Output *output) diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h index 246fe5a3cb..ab6e6fbd17 100644 --- a/src/lib/evas/common/evas_font.h +++ b/src/lib/evas/common/evas_font.h @@ -265,9 +265,6 @@ struct _RGBA_Font_Int in order to comply with the wanted_rend. */ Eina_List *task; -#ifdef EVAS_CSERVE2 - void *cs2_handler; -#endif int generation; diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index f67d7b06a5..39806843f2 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -16,10 +16,6 @@ #include "evas_filter.h" -#ifdef EVAS_CSERVE2 -# include "evas_cs2_private.h" -#endif - #include "evas_filter_private.h" #include <Ector.h> #include <software/Ector_Software.h> --
