forked from enlightenment/efl
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 d4b9e3b287
.
This commit is contained in:
parent
0223d0cee3
commit
86c08e6985
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "evas_font_ot.h" /* USE_HARFBUZZ */
|
||||||
|
|
||||||
#ifdef USE_HARFBUZZ
|
#ifdef USE_HARFBUZZ
|
||||||
# include <hb.h>
|
# include <hb.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -11,8 +13,6 @@
|
||||||
#include "evas_common_private.h"
|
#include "evas_common_private.h"
|
||||||
#include "evas_private.h"
|
#include "evas_private.h"
|
||||||
|
|
||||||
#include "evas_font_ot.h" /* USE_HARFBUZZ */
|
|
||||||
|
|
||||||
#include "evas_font_private.h" /* for Frame-Queuing support */
|
#include "evas_font_private.h" /* for Frame-Queuing support */
|
||||||
#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
|
#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#ifndef EVAS_COMMON_H
|
#ifndef EVAS_COMMON_H
|
||||||
#define 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 */
|
#include "config.h" /* so that EAPI in Evas.h is correctly defined */
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
#ifdef STDC_HEADERS
|
#ifdef STDC_HEADERS
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
|
|
Loading…
Reference in New Issue