| Index: core/include/fxge/fx_font.h
|
| diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
|
| index 6e0c1ba881d340cd05e28ba9caecc04bca627ef4..7ae3c6d39dc981c7956406751b0d8ef5141e977a 100644
|
| --- a/core/include/fxge/fx_font.h
|
| +++ b/core/include/fxge/fx_font.h
|
| @@ -4,14 +4,12 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#ifndef _FX_FONT_H_
|
| -#define _FX_FONT_H_
|
| -#ifndef _FXCRT_EXTENSION_
|
| -#include "../../include/fxcrt/fx_ext.h"
|
| -#endif
|
| -#ifndef _FX_DIB_H_
|
| +#ifndef FX_FONT_H_
|
| +#define FX_FONT_H_
|
| +
|
| +#include "../fxcrt/fx_ext.h"
|
| #include "fx_dib.h"
|
| -#endif
|
| +
|
| typedef struct FT_FaceRec_* FXFT_Face;
|
| typedef void* FXFT_Library;
|
| class IFX_FontEncoding;
|
| @@ -433,4 +431,5 @@ protected:
|
| ~IFX_GSUBTable() { }
|
| };
|
| IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
|
| -#endif
|
| +
|
| +#endif // FX_FONT_H_
|
|
|