From: Marcel Hollerbach Date: Thu, 30 Apr 2020 13:22:01 +0000 (-0400) Subject: ecore_evas: only define these eina errors once X-Git-Tag: accepted/tizen/unified/20200604.164556~241 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96782c71119790b999a88998d211c126afbd7297;p=platform%2Fupstream%2Fefl.git 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 --- diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index d58ceb9..42766b4 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -57,6 +57,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 d6dd6a1..9e447a8 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