aboutsummaryrefslogtreecommitdiffstats
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
parentecore_evas: No error if window creation fails (diff)
downloadefl-86c08e6985d5b213c6227d7cb7bc73177aade66e.tar.gz
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.
-rw-r--r--src/lib/evas/common/evas_font_load.c4
-rw-r--r--src/lib/evas/include/evas_common_private.h4
2 files changed, 4 insertions, 4 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 @@
#include <assert.h>
+#include "evas_font_ot.h" /* USE_HARFBUZZ */
+
#ifdef USE_HARFBUZZ
# include <hb.h>
#endif
@@ -11,8 +13,6 @@
#include "evas_common_private.h"
#include "evas_private.h"
-#include "evas_font_ot.h" /* USE_HARFBUZZ */
-
#include "evas_font_private.h" /* for Frame-Queuing support */
#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 4f48fd4aaf..16b7b40468 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>