raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=036cf62cc7bb1c5cb743f6d28f4b6c5fc024a414
commit 036cf62cc7bb1c5cb743f6d28f4b6c5fc024a414 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Wed Dec 20 01:23:55 2017 +0900 efl build... let's not break building against efl... yet again headers messed up and building against efl is broken! --- src/lib/elementary/Elementary.h | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index 20e4d70130..3ff8b2915d 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -138,17 +138,21 @@ EAPI extern Elm_Version *elm_version; #include <elm_focus.h> #if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT) -# include "efl_ui_focus_object.eo.h" -# include "efl_ui_focus_manager.eo.h" -# include "efl_ui_focus_manager_calc.eo.h" -# include "efl_ui_focus_manager_sub.eo.h" -# include "efl_ui_focus_manager_root_focus.eo.h" -# include "efl_ui_focus_user.eo.h" -# include "efl_ui_focus_util.eo.h" +# include <efl_ui_focus_object.eo.h> +# include <efl_ui_focus_manager.eo.h> +# include <efl_ui_focus_manager_calc.eo.h> +# include <efl_ui_focus_manager_sub.eo.h> +# include <efl_ui_focus_manager_root_focus.eo.h> +# include <efl_ui_focus_user.eo.h> +# include <efl_ui_focus_util.eo.h> # include <efl_ui_textpath.eo.h> # include <efl_ui_translatable.eo.h> # include <efl_ui_focus_composition.eo.h> # include <efl_ui_focus_layer.eo.h> +# include <elm_interface_scrollable.h> +# include <elm_interface_scrollable.eo.h> +# include <elm_spinner.eo.h> + #endif #include <elm_tooltip.h> @@ -217,19 +221,6 @@ EAPI extern Elm_Version *elm_version; #include <elm_glview.h> #include <elm_grid.h> -// Elm legacy headers that require EAPI defined -#include <elm_spinner.eo.h> -#include <elm_entry.eo.h> -#include <elm_ctxpopup.eo.h> -#include <elm_ctxpopup_item.eo.h> -#include <elm_popup.eo.h> -#include <elm_popup_item.eo.h> -#include <elm_colorselector.eo.h> -#include <elm_interface_scrollable.eo.h> -#include <elm_systray.eo.h> -#include <elm_notify.eo.h> -#include <elm_hoversel.eo.h> - #include <elm_hover.h> #include <elm_image.h> #include <elm_index.h> @@ -275,7 +266,7 @@ EAPI extern Elm_Version *elm_version; #include <elm_win.h> #ifdef EFL_EO_API_SUPPORT -#include "efl_ui_list_segarray.h" +# include <efl_ui_list_segarray.h> # include <efl_config_global.eo.h> # include <elm_widget.eo.h> # include <efl_ui_widget_part.eo.h> --
