summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-11-22 10:49:48 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-22 11:06:07 +0900
commite551f88a094dffa7e29c8f3c0eac1fac7ab10538 (patch)
tree4ac238e6a152664ac3b2a6a32ff3b1c7df65db8d /src/lib/evas/common
parentb663b5b8c7232d38ba257f99490cfa22814d7970 (diff)
evas: Let fix the mess in our header instead of sweeping it under the carpet.
This also does fix the build on Windows. This reverts commit 86c08e6985d5b213c6227d7cb7bc73177aade66e.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_font_load.c6
-rw-r--r--src/lib/evas/common/evas_font_ot.c5
-rw-r--r--src/lib/evas/common/evas_font_ot.h6
-rw-r--r--src/lib/evas/common/evas_text_utils.c1
4 files changed, 3 insertions, 15 deletions
diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index c6d6ce3eda..59b8146a63 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -4,15 +4,13 @@
4 4
5#include <assert.h> 5#include <assert.h>
6 6
7#include "evas_font_ot.h" /* USE_HARFBUZZ */ 7#include "evas_common_private.h"
8#include "evas_private.h"
8 9
9#ifdef USE_HARFBUZZ 10#ifdef USE_HARFBUZZ
10# include <hb.h> 11# include <hb.h>
11#endif 12#endif
12 13
13#include "evas_common_private.h"
14#include "evas_private.h"
15
16#include "evas_font_private.h" /* for Frame-Queuing support */ 14#include "evas_font_private.h" /* for Frame-Queuing support */
17#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */ 15#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
18 16
diff --git a/src/lib/evas/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c
index 31383a4ebf..a5fe5b2920 100644
--- a/src/lib/evas/common/evas_font_ot.c
+++ b/src/lib/evas/common/evas_font_ot.c
@@ -1,13 +1,10 @@
1#include "evas_font_ot.h" 1#include "evas_common_private.h"
2 2
3#ifdef USE_HARFBUZZ 3#ifdef USE_HARFBUZZ
4# include <hb.h> 4# include <hb.h>
5# include <hb-ft.h> 5# include <hb-ft.h>
6#endif 6#endif
7 7
8#include "evas_common_private.h"
9
10#include <Eina.h>
11#include "evas_font_private.h" 8#include "evas_font_private.h"
12 9
13#ifdef USE_HARFBUZZ 10#ifdef USE_HARFBUZZ
diff --git a/src/lib/evas/common/evas_font_ot.h b/src/lib/evas/common/evas_font_ot.h
index 6398c92bea..6f667311e1 100644
--- a/src/lib/evas/common/evas_font_ot.h
+++ b/src/lib/evas/common/evas_font_ot.h
@@ -1,10 +1,6 @@
1#ifndef _EVAS_FONT_OT_H 1#ifndef _EVAS_FONT_OT_H
2# define _EVAS_FONT_OT_H 2# define _EVAS_FONT_OT_H
3 3
4# ifdef HAVE_CONFIG_H
5# include "config.h"
6# endif
7
8# ifdef HAVE_HARFBUZZ 4# ifdef HAVE_HARFBUZZ
9# define OT_SUPPORT 5# define OT_SUPPORT
10# define USE_HARFBUZZ 6# define USE_HARFBUZZ
@@ -17,8 +13,6 @@ typedef struct _Evas_Font_OT_Info Evas_Font_OT_Info;
17typedef void *Evas_Font_OT_Info; 13typedef void *Evas_Font_OT_Info;
18# endif 14# endif
19 15
20# include "Evas.h"
21
22# ifdef OT_SUPPORT 16# ifdef OT_SUPPORT
23struct _Evas_Font_OT_Info 17struct _Evas_Font_OT_Info
24{ 18{
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index 14d09486b9..fe17101508 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -3,7 +3,6 @@
3#include "evas_text_utils.h" 3#include "evas_text_utils.h"
4#include "language/evas_bidi_utils.h" 4#include "language/evas_bidi_utils.h"
5#include "language/evas_language_utils.h" 5#include "language/evas_language_utils.h"
6#include "evas_font_ot.h"
7 6
8#define PROPS_CHANGE(Props) Props->changed = EINA_TRUE; 7#define PROPS_CHANGE(Props) Props->changed = EINA_TRUE;
9 8