summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-11-21 10:55:37 +0000
committerTom Hacohen <tom@stosb.com>2013-11-21 10:55:37 +0000
commit86c08e6985d5b213c6227d7cb7bc73177aade66e (patch)
tree27aaabc36c557f20562d0b0f13a14ba366debc5f /src/lib/evas/common
parent0223d0cee3b25d7756cb9f2fa0e03cfa8564180e (diff)
Revert "evas: this headers order are seriously insane..."
Perhaps they are insane, but as the comments imply it defines USE_HARFBUZZ which is needed afterwards. You just broke everything. I know it's a mess there, but it's a mess that works. Your change doesn't. This reverts commit d4b9e3b287d01fe12462fba872db18de0f7a407a.
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_font_load.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index fbe83e18ec..c6d6ce3eda 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -4,6 +4,8 @@
4 4
5#include <assert.h> 5#include <assert.h>
6 6
7#include "evas_font_ot.h" /* USE_HARFBUZZ */
8
7#ifdef USE_HARFBUZZ 9#ifdef USE_HARFBUZZ
8# include <hb.h> 10# include <hb.h>
9#endif 11#endif
@@ -11,8 +13,6 @@
11#include "evas_common_private.h" 13#include "evas_common_private.h"
12#include "evas_private.h" 14#include "evas_private.h"
13 15
14#include "evas_font_ot.h" /* USE_HARFBUZZ */
15
16#include "evas_font_private.h" /* for Frame-Queuing support */ 16#include "evas_font_private.h" /* for Frame-Queuing support */
17#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */ 17#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
18 18