asdfuser pushed a commit to branch master.
commit c1cba92f8b9b6769caa8fa045c9c9797659d5d9c
Author: Daniel Willmann <[email protected]>
Date: Thu Jun 6 10:51:34 2013 +0100
evas_font_load: Remove duplicate include of evas_font_ot.h
Because it defines USE_HARFBUZZ we need to include it before testing for
this define.
Signed-off-by: Daniel Willmann <[email protected]>
---
src/lib/evas/common/evas_font_load.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/evas/common/evas_font_load.c
b/src/lib/evas/common/evas_font_load.c
index ae4373f..45cec00 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -4,7 +4,7 @@
#include <assert.h>
-#include "evas_font_ot.h"
+#include "evas_font_ot.h" /* USE_HARFBUZZ */
#ifdef USE_HARFBUZZ
# include <hb.h>
@@ -14,7 +14,6 @@
#include "evas_private.h"
#include "evas_font_private.h" /* for Frame-Queuing support */
-#include "evas_font_ot.h"
#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
#ifdef EVAS_CSERVE2
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
