bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c06486ca49d1e4767a6cb0bb41d20e9a97dc44bd
commit c06486ca49d1e4767a6cb0bb41d20e9a97dc44bd Author: Lauro Moura <[email protected]> Date: Thu May 2 21:47:49 2019 +0000 cxx: Fix missing bits from header rename Reviewed-by: Vincent Torri <[email protected]> Differential Revision: https://phab.enlightenment.org/D8811 --- src/Makefile_Cxx.am | 2 +- src/lib/elementary/Efl_Ui.hh | 8 ++++---- src/tests/elementary/elm_cxx_suite.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am index a3cc88c1d8..9f4b467337 100644 --- a/src/Makefile_Cxx.am +++ b/src/Makefile_Cxx.am @@ -26,7 +26,7 @@ installed_eflcxxextraheadersdir = $(includedir)/efl-cxx-@VMAJ@/cxx dist_installed_eflcxxextraheaders_DATA = lib/efl/cxx/efl_part_impl.hh installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ -dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh +dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Efl_Ui.hh installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh diff --git a/src/lib/elementary/Efl_Ui.hh b/src/lib/elementary/Efl_Ui.hh index d8551b8d09..611cdbe07f 100644 --- a/src/lib/elementary/Efl_Ui.hh +++ b/src/lib/elementary/Efl_Ui.hh @@ -1,7 +1,7 @@ -#ifndef EFL_CXX_ELEMENTARY_HH -#define EFL_CXX_ELEMENTARY_HH -#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H) -#error "Do not include Elm C API headers before including Elementary.hh" +#ifndef EFL_CXX_EFL_UI_HH +#define EFL_CXX_EFL_UI_HH +#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H) || defined(_EFL_UI_H) +#error "Do not include Elm C API headers before including Efl_Ui.hh" #endif #ifndef EFL_BETA_API_SUPPORT diff --git a/src/tests/elementary/elm_cxx_suite.cc b/src/tests/elementary/elm_cxx_suite.cc index 1e7a5d63a0..eb88aa8d1a 100644 --- a/src/tests/elementary/elm_cxx_suite.cc +++ b/src/tests/elementary/elm_cxx_suite.cc @@ -1,4 +1,4 @@ -#include <Elementary.hh> +#include <Efl_Ui.hh> int main() { --
