evas: this headers order are seriously insane, hope that one fix the last breakage.

diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index c6d6ce3eda0a480b6541e1509e4b4a8a275f2ea7..fbe83e18ec71dacfff41cb12941eff171f390b3f 100644 (file)
--- 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 16b7b4046815ed9bc54b720e2578b260efa1de78..4f48fd4aaf0e55fc1d255cca21ae9c6a93de9019 100644 (file)
--- 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>