diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-04-30 09:22:01 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2020-04-30 09:22:01 -0400 |
commit | 7b68960d3a2deb5d4064193a2e2a7b6f7f8baae3 (patch) | |
tree | 49cd26a392fb7a3d2f9a3e47c5c75764b7413bbe /src/lib/ecore_evas | |
parent | f21df93595f18f803ee50095084bd695421b304a (diff) |
ecore_evas: only define these eina errors once
Summary:
they are not needed multiple times, infact this is creating multiple
definition errors.
@fix
Reviewers: stefan_schmidt, zmike
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11766
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_evas/ecore_evas_private.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index f06c189ad9..87331f03e8 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -55,6 +55,10 @@ | |||
55 | goto _label; \ | 55 | goto _label; \ |
56 | } | 56 | } |
57 | 57 | ||
58 | EAPI Eina_Error ecore_evas_no_matching_type; | ||
59 | EAPI Eina_Error ecore_evas_no_selection; | ||
60 | EAPI Eina_Error ecore_evas_request_replaced; | ||
61 | |||
58 | EAPI Eina_Bool _ecore_evas_app_comp_sync = EINA_FALSE; | 62 | EAPI Eina_Bool _ecore_evas_app_comp_sync = EINA_FALSE; |
59 | EAPI int _ecore_evas_log_dom = -1; | 63 | EAPI int _ecore_evas_log_dom = -1; |
60 | static int _ecore_evas_init_count = 0; | 64 | static int _ecore_evas_init_count = 0; |
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index 1a35e62a5c..20c176f050 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h | |||
@@ -33,9 +33,9 @@ | |||
33 | 33 | ||
34 | EAPI extern int _ecore_evas_log_dom; | 34 | EAPI extern int _ecore_evas_log_dom; |
35 | 35 | ||
36 | EAPI Eina_Error ecore_evas_no_matching_type; | 36 | EAPI extern Eina_Error ecore_evas_no_matching_type; |
37 | EAPI Eina_Error ecore_evas_no_selection; | 37 | EAPI extern Eina_Error ecore_evas_no_selection; |
38 | EAPI Eina_Error ecore_evas_request_replaced; | 38 | EAPI extern Eina_Error ecore_evas_request_replaced; |
39 | 39 | ||
40 | #ifdef ECORE_EVAS_DEFAULT_LOG_COLOR | 40 | #ifdef ECORE_EVAS_DEFAULT_LOG_COLOR |
41 | # undef ECORE_EVAS_DEFAULT_LOG_COLOR | 41 | # undef ECORE_EVAS_DEFAULT_LOG_COLOR |