aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-11-21 18:24:16 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-21 18:26:29 +0900
commitd4b9e3b287d01fe12462fba872db18de0f7a407a (patch)
tree3114f5890bac1884798ba55bfdc6297553a7ef51
parentefreet: Only lock once for efficiency (diff)
downloadefl-d4b9e3b287d01fe12462fba872db18de0f7a407a.tar.gz
evas: this headers order are seriously insane, hope that one fix the last breakage.
-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 c6d6ce3eda..fbe83e18ec 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -4,8 +4,6 @@
#include <assert.h>
-#include "evas_font_ot.h" /* USE_HARFBUZZ */
-
#ifdef USE_HARFBUZZ
# include <hb.h>
#endif
@@ -13,6 +11,8 @@
#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 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>