aboutsummaryrefslogtreecommitdiffstats
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
parentworkaround for T543 (diff)
downloadefl-e551f88a094dffa7e29c8f3c0eac1fac7ab10538.tar.gz
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.
-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
-rw-r--r--src/lib/evas/include/evas_common_private.h4
5 files changed, 5 insertions, 17 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 @@
#include <assert.h>
-#include "evas_font_ot.h" /* USE_HARFBUZZ */
+#include "evas_common_private.h"
+#include "evas_private.h"
#ifdef USE_HARFBUZZ
# include <hb.h>
#endif
-#include "evas_common_private.h"
-#include "evas_private.h"
-
#include "evas_font_private.h" /* for Frame-Queuing support */
#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
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 @@
-#include "evas_font_ot.h"
+#include "evas_common_private.h"
#ifdef USE_HARFBUZZ
# include <hb.h>
# include <hb-ft.h>
#endif
-#include "evas_common_private.h"
-
-#include <Eina.h>
#include "evas_font_private.h"
#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 @@
#ifndef _EVAS_FONT_OT_H
# define _EVAS_FONT_OT_H
-# ifdef HAVE_CONFIG_H
-# include "config.h"
-# endif
-
# ifdef HAVE_HARFBUZZ
# define OT_SUPPORT
# define USE_HARFBUZZ
@@ -17,8 +13,6 @@ typedef struct _Evas_Font_OT_Info Evas_Font_OT_Info;
typedef void *Evas_Font_OT_Info;
# endif
-# include "Evas.h"
-
# ifdef OT_SUPPORT
struct _Evas_Font_OT_Info
{
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 @@
#include "evas_text_utils.h"
#include "language/evas_bidi_utils.h"
#include "language/evas_language_utils.h"
-#include "evas_font_ot.h"
#define PROPS_CHANGE(Props) Props->changed = EINA_TRUE;
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 16b7b40468..4f48fd4aaf 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -1,9 +1,9 @@
#ifndef EVAS_COMMON_H
#define EVAS_COMMON_H
-//#ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#include "config.h" /* so that EAPI in Evas.h is correctly defined */
-//#endif
+#endif
#ifdef STDC_HEADERS
# include <stdlib.h>