forked from enlightenment/efl
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.
This commit is contained in:
parent
f71444baa8
commit
a1e05aa089
|
@ -217,9 +217,6 @@ EAPI extern Elm_Version *elm_version;
|
||||||
#include <elm_glview.h>
|
#include <elm_glview.h>
|
||||||
#include <elm_grid.h>
|
#include <elm_grid.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#ifdef ELEMENTARY_BUILD
|
|
||||||
// Elm legacy headers that require EAPI defined
|
// Elm legacy headers that require EAPI defined
|
||||||
#include <elm_spinner.eo.h>
|
#include <elm_spinner.eo.h>
|
||||||
#include <elm_entry.eo.h>
|
#include <elm_entry.eo.h>
|
||||||
|
@ -232,8 +229,6 @@ EAPI extern Elm_Version *elm_version;
|
||||||
#include <elm_systray.eo.h>
|
#include <elm_systray.eo.h>
|
||||||
#include <elm_notify.eo.h>
|
#include <elm_notify.eo.h>
|
||||||
#include <elm_hoversel.eo.h>
|
#include <elm_hoversel.eo.h>
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <elm_hover.h>
|
#include <elm_hover.h>
|
||||||
#include <elm_image.h>
|
#include <elm_image.h>
|
||||||
|
|
|
@ -20,6 +20,8 @@ typedef unsigned long long DATA64;
|
||||||
|
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
|
|
||||||
|
#include "evas_text_utils.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EAPI
|
||||||
# undef EAPI
|
# undef EAPI
|
||||||
#endif
|
#endif
|
||||||
|
@ -54,7 +56,6 @@ typedef unsigned long long DATA64;
|
||||||
#define LKU(x) eina_lock_release(&(x))
|
#define LKU(x) eina_lock_release(&(x))
|
||||||
#define LKDBG(x) eina_lock_debug(&(x))
|
#define LKDBG(x) eina_lock_debug(&(x))
|
||||||
|
|
||||||
#include "evas_text_utils.h"
|
|
||||||
|
|
||||||
|
|
||||||
enum _Evas_Font_Style
|
enum _Evas_Font_Style
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "evas_font_draw.h"
|
#include "evas_common_private.h"
|
||||||
#include "evas_private.h"
|
#include "evas_private.h"
|
||||||
#include "evas_blend_private.h"
|
#include "evas_blend_private.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue