zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b68960d3a2deb5d4064193a2e2a7b6f7f8baae3
commit 7b68960d3a2deb5d4064193a2e2a7b6f7f8baae3
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Thu Apr 30 09:22:01 2020 -0400
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
---
src/lib/ecore_evas/ecore_evas.c | 4 ++++
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 @@
goto _label; \
}
+EAPI Eina_Error ecore_evas_no_matching_type;
+EAPI Eina_Error ecore_evas_no_selection;
+EAPI Eina_Error ecore_evas_request_replaced;
+
EAPI Eina_Bool _ecore_evas_app_comp_sync = EINA_FALSE;
EAPI int _ecore_evas_log_dom = -1;
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 @@
EAPI extern int _ecore_evas_log_dom;
-EAPI Eina_Error ecore_evas_no_matching_type;
-EAPI Eina_Error ecore_evas_no_selection;
-EAPI Eina_Error ecore_evas_request_replaced;
+EAPI extern Eina_Error ecore_evas_no_matching_type;
+EAPI extern Eina_Error ecore_evas_no_selection;
+EAPI extern Eina_Error ecore_evas_request_replaced;
#ifdef ECORE_EVAS_DEFAULT_LOG_COLOR
# undef ECORE_EVAS_DEFAULT_LOG_COLOR
--
