forked from enlightenment/efl
evas: Let fix the mess in our header instead of sweeping it under the carpet.
This also does fix the build on Windows.
This reverts commit 86c08e6985
.
This commit is contained in:
parent
b663b5b8c7
commit
e551f88a09
|
@ -4,15 +4,13 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "evas_font_ot.h" /* USE_HARFBUZZ */
|
#include "evas_common_private.h"
|
||||||
|
#include "evas_private.h"
|
||||||
|
|
||||||
#ifdef USE_HARFBUZZ
|
#ifdef USE_HARFBUZZ
|
||||||
# include <hb.h>
|
# include <hb.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "evas_common_private.h"
|
|
||||||
#include "evas_private.h"
|
|
||||||
|
|
||||||
#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,13 +1,10 @@
|
||||||
#include "evas_font_ot.h"
|
#include "evas_common_private.h"
|
||||||
|
|
||||||
#ifdef USE_HARFBUZZ
|
#ifdef USE_HARFBUZZ
|
||||||
# include <hb.h>
|
# include <hb.h>
|
||||||
# include <hb-ft.h>
|
# include <hb-ft.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "evas_common_private.h"
|
|
||||||
|
|
||||||
#include <Eina.h>
|
|
||||||
#include "evas_font_private.h"
|
#include "evas_font_private.h"
|
||||||
|
|
||||||
#ifdef USE_HARFBUZZ
|
#ifdef USE_HARFBUZZ
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
#ifndef _EVAS_FONT_OT_H
|
#ifndef _EVAS_FONT_OT_H
|
||||||
# define _EVAS_FONT_OT_H
|
# define _EVAS_FONT_OT_H
|
||||||
|
|
||||||
# ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef HAVE_HARFBUZZ
|
# ifdef HAVE_HARFBUZZ
|
||||||
# define OT_SUPPORT
|
# define OT_SUPPORT
|
||||||
# define USE_HARFBUZZ
|
# define USE_HARFBUZZ
|
||||||
|
@ -17,8 +13,6 @@ typedef struct _Evas_Font_OT_Info Evas_Font_OT_Info;
|
||||||
typedef void *Evas_Font_OT_Info;
|
typedef void *Evas_Font_OT_Info;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# include "Evas.h"
|
|
||||||
|
|
||||||
# ifdef OT_SUPPORT
|
# ifdef OT_SUPPORT
|
||||||
struct _Evas_Font_OT_Info
|
struct _Evas_Font_OT_Info
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include "evas_text_utils.h"
|
#include "evas_text_utils.h"
|
||||||
#include "language/evas_bidi_utils.h"
|
#include "language/evas_bidi_utils.h"
|
||||||
#include "language/evas_language_utils.h"
|
#include "language/evas_language_utils.h"
|
||||||
#include "evas_font_ot.h"
|
|
||||||
|
|
||||||
#define PROPS_CHANGE(Props) Props->changed = EINA_TRUE;
|
#define PROPS_CHANGE(Props) Props->changed = EINA_TRUE;
|
||||||
|
|
||||||
|
|
|
@ -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