summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-06 15:12:21 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-07 09:57:24 +0900
commitccc3efd77d82db9aef6d6c19d21ec8a5d69ca994 (patch)
treed45a8c4e4898b2937a8992a79710e26158d23810
parent778c5afb3f29fe0763d875d31f6411b24cbb997d (diff)
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.
-rw-r--r--src/lib/elementary/elementary_config.h3
-rw-r--r--src/tests/elementary/elm_code_test_widget.c4
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 @@
8 */ 8 */
9 9
10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" 10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
11
12#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
11#define ELM_WIDGET_PROTECTED 13#define ELM_WIDGET_PROTECTED
12#define ELM_WIDGET_BETA 14#define ELM_WIDGET_BETA
13#define EFL_CANVAS_OBJECT_PROTECTED 15#define EFL_CANVAS_OBJECT_PROTECTED
@@ -22,3 +24,4 @@
22#define EFL_ACCESS_SELECTION_BETA 24#define EFL_ACCESS_SELECTION_BETA
23#define EFL_ACCESS_TEXT_BETA 25#define EFL_ACCESS_TEXT_BETA
24#define EFL_ACCESS_VALUE_BETA 26#define EFL_ACCESS_VALUE_BETA
27#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 @@
1#define ELM_INTERNAL_API_ARGESFSDFEFC
2
1#ifdef HAVE_CONFIG_H 3#ifdef HAVE_CONFIG_H
2# include "elementary_config.h" 4# include "elementary_config.h"
3#endif 5#endif
4 6
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 7#include "elm_suite.h"
8#include "Elementary.h" 8#include "Elementary.h"
9 9