summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean@guyomarch.bzh>2017-12-19 14:11:44 +0100
committerJean Guyomarc'h <jean@guyomarch.bzh>2017-12-19 15:08:46 +0100
commita1e05aa0890faba20205a5c0f998f331a2ca4b24 (patch)
tree8caba2b9238ce06cf4628c4df034fb514b6e06a1
parentf71444baa8d9cdec9c559b1381d41293084e84ce (diff)
evas/elm: fix visibility of some symbols
Public symbols were defined internal to Evas/Elementary on macOS, making the link of external modules unfeasible. - EAPI was messed up by an invalid inclusion of evas_text_utils.h, making some symbols private instead of public. - A similar issue was present in evas_font_draw.c, where the symbols were directly imported without the proper definition of EAPI. - Elementary.h did include some eo-generated headers, but for windows only. It should not been restricted to windows, as it allows to export symbols to external modules. Fixes T6448.
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/Elementary.h5
-rw-r--r--src/lib/evas/common/evas_font.h3
-rw-r--r--src/lib/evas/common/evas_font_draw.c2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index e9a30fd3c4..20e4d70130 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -217,9 +217,6 @@ EAPI extern Elm_Version *elm_version;
217#include <elm_glview.h> 217#include <elm_glview.h>
218#include <elm_grid.h> 218#include <elm_grid.h>
219 219
220
221#ifdef _WIN32
222#ifdef ELEMENTARY_BUILD
223// Elm legacy headers that require EAPI defined 220// Elm legacy headers that require EAPI defined
224#include <elm_spinner.eo.h> 221#include <elm_spinner.eo.h>
225#include <elm_entry.eo.h> 222#include <elm_entry.eo.h>
@@ -232,8 +229,6 @@ EAPI extern Elm_Version *elm_version;
232#include <elm_systray.eo.h> 229#include <elm_systray.eo.h>
233#include <elm_notify.eo.h> 230#include <elm_notify.eo.h>
234#include <elm_hoversel.eo.h> 231#include <elm_hoversel.eo.h>
235#endif
236#endif
237 232
238#include <elm_hover.h> 233#include <elm_hover.h>
239#include <elm_image.h> 234#include <elm_image.h>
diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h
index 5c4f07c699..1a010bfe05 100644
--- a/src/lib/evas/common/evas_font.h
+++ b/src/lib/evas/common/evas_font.h
@@ -20,6 +20,8 @@ typedef unsigned long long DATA64;
20 20
21#include <Eina.h> 21#include <Eina.h>
22 22
23#include "evas_text_utils.h"
24
23#ifdef EAPI 25#ifdef EAPI
24# undef EAPI 26# undef EAPI
25#endif 27#endif
@@ -54,7 +56,6 @@ typedef unsigned long long DATA64;
54#define LKU(x) eina_lock_release(&(x)) 56#define LKU(x) eina_lock_release(&(x))
55#define LKDBG(x) eina_lock_debug(&(x)) 57#define LKDBG(x) eina_lock_debug(&(x))
56 58
57#include "evas_text_utils.h"
58 59
59 60
60enum _Evas_Font_Style 61enum _Evas_Font_Style
diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index f40e9b50c8..9e42c9fe8e 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -1,4 +1,4 @@
1#include "evas_font_draw.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "evas_blend_private.h" 3#include "evas_blend_private.h"
4 4