From 7274bec58a031185d23dad31ec9446ff884b0024 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Thu, 28 Dec 2017 20:59:40 +0900 Subject: [PATCH] make some hidden APIs to visible Change-Id: I17072295cc92ad0a779ecbb68f0f9b442924b33d --- src/lib/evas/common/evas_font.h | 3 +-- src/lib/evas/common/evas_font_draw.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h index 5c4f07c..80c6537 100644 --- a/src/lib/evas/common/evas_font.h +++ b/src/lib/evas/common/evas_font.h @@ -19,6 +19,7 @@ typedef unsigned long long DATA64; #endif #include +#include "evas_text_utils.h" #ifdef EAPI # undef EAPI @@ -54,8 +55,6 @@ typedef unsigned long long DATA64; #define LKU(x) eina_lock_release(&(x)) #define LKDBG(x) eina_lock_debug(&(x)) -#include "evas_text_utils.h" - enum _Evas_Font_Style { diff --git a/src/lib/evas/common/evas_font_draw.h b/src/lib/evas/common/evas_font_draw.h index 2fdfc36..9068f2a 100644 --- a/src/lib/evas/common/evas_font_draw.h +++ b/src/lib/evas/common/evas_font_draw.h @@ -3,6 +3,32 @@ #include "../include/evas_common_private.h" +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_EVAS_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EVAS_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + /* draw */ typedef Eina_Bool (*Evas_Common_Font_Draw_Cb)(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, Evas_Glyph_Array *glyphs, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w, int ext_h, int im_w, int im_h); @@ -15,4 +41,7 @@ EAPI void evas_common_font_draw_do (const Cutout_Rects EAPI Eina_Bool evas_common_font_draw_prepare_cutout (Cutout_Rects **reuse, RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Gfx_Func *func); EAPI void evas_common_font_glyph_draw (RGBA_Font_Glyph *fg, RGBA_Draw_Context *dc, RGBA_Image *dst, int dst_pitch, int dx, int dy, int dw, int dh, int cx, int cy, int cw, int ch); +#undef EAPI +#define EAPI + #endif /* _EVAS_FONT_DRAW_H */ -- 2.7.4