From ccc3efd77d82db9aef6d6c19d21ec8a5d69ca994 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 6 Nov 2017 15:12:21 +0900 Subject: elm: Fix examples/tests using elementary_config elementary_config.h should not even exist. It's been hijacked as a private header for elementary, but all "real" configuration is stored in efl's main config.h now. --- src/lib/elementary/elementary_config.h | 3 +++ src/tests/elementary/elm_code_test_widget.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h index 459ebd0213..788b02530e 100644 --- a/src/lib/elementary/elementary_config.h +++ b/src/lib/elementary/elementary_config.h @@ -8,6 +8,8 @@ */ #define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" + +#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC) #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_BETA #define EFL_CANVAS_OBJECT_PROTECTED @@ -22,3 +24,4 @@ #define EFL_ACCESS_SELECTION_BETA #define EFL_ACCESS_TEXT_BETA #define EFL_ACCESS_VALUE_BETA +#endif diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c index 6195b5cf45..3a5860aeb0 100644 --- a/src/tests/elementary/elm_code_test_widget.c +++ b/src/tests/elementary/elm_code_test_widget.c @@ -1,9 +1,9 @@ +#define ELM_INTERNAL_API_ARGESFSDFEFC + #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif -#define ELM_INTERNAL_API_ARGESFSDFEFC - #include "elm_suite.h" #include "Elementary.h" -- cgit v1.2.1