diff options
author | marha <marha@users.sourceforge.net> | 2014-06-26 10:37:02 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-06-26 10:37:02 +0200 |
commit | 095ea6e18c55df550fda14f72c2d174af9b239ba (patch) | |
tree | 7dd06ce2fbb82397123186136c92e14aa158e7d3 /freetype/src/base | |
parent | 90137f4c5e30b1c6f9a262e8c853494540dad2d7 (diff) | |
download | vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.gz vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.bz2 vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.zip |
Solved freetype compilation problems
Diffstat (limited to 'freetype/src/base')
27 files changed, 58 insertions, 58 deletions
diff --git a/freetype/src/base/basepic.c b/freetype/src/base/basepic.c index fa7bf5142..5d317ddb3 100644 --- a/freetype/src/base/basepic.c +++ b/freetype/src/base/basepic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include "basepic.h" diff --git a/freetype/src/base/basepic.h b/freetype/src/base/basepic.h index 1910a60f9..ec7507cec 100644 --- a/freetype/src/base/basepic.h +++ b/freetype/src/base/basepic.h @@ -22,7 +22,7 @@ FT_BEGIN_HEADER -#include <freetype/internal/ftpic.h> +#include <internal/ftpic.h> #ifndef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c index 10ba02389..24da83dbb 100644 --- a/freetype/src/base/ftadvanc.c +++ b/freetype/src/base/ftadvanc.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_ADVANCES_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> static FT_Error diff --git a/freetype/src/base/ftbase.h b/freetype/src/base/ftbase.h index 9dcae7823..0ab0590d9 100644 --- a/freetype/src/base/ftbase.h +++ b/freetype/src/base/ftbase.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> FT_BEGIN_HEADER diff --git a/freetype/src/base/ftbbox.c b/freetype/src/base/ftbbox.c index e04cbdaaf..36048c296 100644 --- a/freetype/src/base/ftbbox.c +++ b/freetype/src/base/ftbbox.c @@ -30,8 +30,8 @@ #include FT_BBOX_H #include FT_IMAGE_H #include FT_OUTLINE_H -#include <freetype/internal/ftcalc.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftcalc.h> +#include <internal/ftobjs.h> typedef struct TBBox_Rec_ diff --git a/freetype/src/base/ftbdf.c b/freetype/src/base/ftbdf.c index 48aaacb9e..fccbfedde 100644 --- a/freetype/src/base/ftbdf.c +++ b/freetype/src/base/ftbdf.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include FT_SERVICE_BDF_H diff --git a/freetype/src/base/ftbitmap.c b/freetype/src/base/ftbitmap.c index 3425c368f..887722a93 100644 --- a/freetype/src/base/ftbitmap.c +++ b/freetype/src/base/ftbitmap.c @@ -21,7 +21,7 @@ #include FT_BITMAP_H #include FT_IMAGE_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> static diff --git a/freetype/src/base/ftcalc.c b/freetype/src/base/ftcalc.c index a1e76e192..fb0492721 100644 --- a/freetype/src/base/ftcalc.c +++ b/freetype/src/base/ftcalc.c @@ -34,10 +34,10 @@ #include <ft2build.h> #include FT_GLYPH_H -#include <freetype/fttrigon.h> -#include <freetype/internal/ftcalc.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftobjs.h> +#include <fttrigon.h> +#include <internal/ftcalc.h> +#include <internal/ftdebug.h> +#include <internal/ftobjs.h> #ifdef FT_MULFIX_INLINED #undef FT_MulFix diff --git a/freetype/src/base/ftdbgmem.c b/freetype/src/base/ftdbgmem.c index f4b98effc..eaf090d33 100644 --- a/freetype/src/base/ftdbgmem.c +++ b/freetype/src/base/ftdbgmem.c @@ -18,8 +18,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftmemory.h> +#include <internal/ftdebug.h> +#include <internal/ftmemory.h> #include FT_SYSTEM_H #include FT_ERRORS_H #include FT_TYPES_H diff --git a/freetype/src/base/ftdebug.c b/freetype/src/base/ftdebug.c index 95bde59bb..2e4e0e538 100644 --- a/freetype/src/base/ftdebug.c +++ b/freetype/src/base/ftdebug.c @@ -42,8 +42,8 @@ #include <ft2build.h> -#include <freetype/freetype.h> -#include <freetype/internal/ftdebug.h> +#include <freetype.h> +#include <internal/ftdebug.h> #ifdef FT_DEBUG_LEVEL_ERROR diff --git a/freetype/src/base/ftgloadr.c b/freetype/src/base/ftgloadr.c index 7defb29d8..61ab21b9c 100644 --- a/freetype/src/base/ftgloadr.c +++ b/freetype/src/base/ftgloadr.c @@ -17,10 +17,10 @@ #include <ft2build.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftgloadr.h> -#include <freetype/internal/ftmemory.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftdebug.h> +#include <internal/ftgloadr.h> +#include <internal/ftmemory.h> +#include <internal/ftobjs.h> #undef FT_COMPONENT #define FT_COMPONENT trace_gloader diff --git a/freetype/src/base/ftglyph.c b/freetype/src/base/ftglyph.c index 66b01ef29..76d8d6156 100644 --- a/freetype/src/base/ftglyph.c +++ b/freetype/src/base/ftglyph.c @@ -34,7 +34,7 @@ #include FT_GLYPH_H #include FT_OUTLINE_H #include FT_BITMAP_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include "basepic.h" diff --git a/freetype/src/base/ftinit.c b/freetype/src/base/ftinit.c index c18877aed..224b7ce37 100644 --- a/freetype/src/base/ftinit.c +++ b/freetype/src/base/ftinit.c @@ -39,8 +39,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include <freetype/internal/ftobjs.h> -#include <freetype/internal/ftdebug.h> +#include <internal/ftobjs.h> +#include <internal/ftdebug.h> #include FT_MODULE_H #include "basepic.h" diff --git a/freetype/src/base/ftlcdfil.c b/freetype/src/base/ftlcdfil.c index 17ef9c9bd..e6d7fca3b 100644 --- a/freetype/src/base/ftlcdfil.c +++ b/freetype/src/base/ftlcdfil.c @@ -21,7 +21,7 @@ #include FT_LCD_FILTER_H #include FT_IMAGE_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING diff --git a/freetype/src/base/ftmm.c b/freetype/src/base/ftmm.c index 14ed98e47..178f97abf 100644 --- a/freetype/src/base/ftmm.c +++ b/freetype/src/base/ftmm.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_MULTIPLE_MASTERS_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include FT_SERVICE_MULTIPLE_MASTERS_H diff --git a/freetype/src/base/ftobjs.c b/freetype/src/base/ftobjs.c index f01451ed5..4cbadfee6 100644 --- a/freetype/src/base/ftobjs.c +++ b/freetype/src/base/ftobjs.c @@ -19,12 +19,12 @@ #include <ft2build.h> #include FT_LIST_H #include FT_OUTLINE_H -#include <freetype/internal/ftvalid.h> -#include <freetype/internal/ftobjs.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftrfork.h> -#include <freetype/internal/ftstream.h> -#include <freetype/internal/sfnt.h> /* for SFNT_Load_Table_Func */ +#include <internal/ftvalid.h> +#include <internal/ftobjs.h> +#include <internal/ftdebug.h> +#include <internal/ftrfork.h> +#include <internal/ftstream.h> +#include <internal/sfnt.h> /* for SFNT_Load_Table_Func */ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H #include FT_TRUETYPE_IDS_H diff --git a/freetype/src/base/ftoutln.c b/freetype/src/base/ftoutln.c index ead7139b0..5f0e61c1c 100644 --- a/freetype/src/base/ftoutln.c +++ b/freetype/src/base/ftoutln.c @@ -25,10 +25,10 @@ #include <ft2build.h> #include FT_OUTLINE_H -#include <freetype/internal/ftobjs.h> -#include <freetype/internal/ftcalc.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/fttrigon.h> +#include <internal/ftobjs.h> +#include <internal/ftcalc.h> +#include <internal/ftdebug.h> +#include <fttrigon.h> /*************************************************************************/ diff --git a/freetype/src/base/ftpic.c b/freetype/src/base/ftpic.c index ce93f02ff..0d008d55f 100644 --- a/freetype/src/base/ftpic.c +++ b/freetype/src/base/ftpic.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include "basepic.h" #ifdef FT_CONFIG_OPTION_PIC diff --git a/freetype/src/base/ftrfork.c b/freetype/src/base/ftrfork.c index 84032d723..0e44d33a8 100644 --- a/freetype/src/base/ftrfork.c +++ b/freetype/src/base/ftrfork.c @@ -25,9 +25,9 @@ #include <ft2build.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftstream.h> -#include <freetype/internal/ftrfork.h> +#include <internal/ftdebug.h> +#include <internal/ftstream.h> +#include <internal/ftrfork.h> #include "basepic.h" #include "ftbase.h" diff --git a/freetype/src/base/ftsnames.c b/freetype/src/base/ftsnames.c index 26fa35c5a..06551ea8c 100644 --- a/freetype/src/base/ftsnames.c +++ b/freetype/src/base/ftsnames.c @@ -21,8 +21,8 @@ #include <ft2build.h> #include FT_SFNT_NAMES_H -#include <freetype/internal/tttypes.h> -#include <freetype/internal/ftstream.h> +#include <internal/tttypes.h> +#include <internal/ftstream.h> #ifdef TT_CONFIG_OPTION_SFNT_NAMES diff --git a/freetype/src/base/ftstream.c b/freetype/src/base/ftstream.c index 39b5c1e7f..8cb1b88b2 100644 --- a/freetype/src/base/ftstream.c +++ b/freetype/src/base/ftstream.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include <freetype/internal/ftstream.h> -#include <freetype/internal/ftdebug.h> +#include <internal/ftstream.h> +#include <internal/ftdebug.h> /*************************************************************************/ diff --git a/freetype/src/base/ftsynth.c b/freetype/src/base/ftsynth.c index fdb31982c..4fc8254c7 100644 --- a/freetype/src/base/ftsynth.c +++ b/freetype/src/base/ftsynth.c @@ -17,11 +17,11 @@ #include <ft2build.h> -#include <freetype/ftsynth.h> -#include <freetype/internal/ftobjs.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/ftoutln.h> -#include <freetype/ftbitmap.h> +#include <ftsynth.h> +#include <internal/ftobjs.h> +#include <internal/ftdebug.h> +#include <ftoutln.h> +#include <ftbitmap.h> /*************************************************************************/ diff --git a/freetype/src/base/ftsystem.c b/freetype/src/base/ftsystem.c index 6d6cb7b2e..9af57c372 100644 --- a/freetype/src/base/ftsystem.c +++ b/freetype/src/base/ftsystem.c @@ -27,8 +27,8 @@ #include <ft2build.h> #include FT_CONFIG_CONFIG_H -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftstream.h> +#include <internal/ftdebug.h> +#include <internal/ftstream.h> #include FT_SYSTEM_H #include FT_ERRORS_H #include FT_TYPES_H diff --git a/freetype/src/base/fttrigon.c b/freetype/src/base/fttrigon.c index a5c7efc01..9e0af81b0 100644 --- a/freetype/src/base/fttrigon.c +++ b/freetype/src/base/fttrigon.c @@ -30,7 +30,7 @@ /*************************************************************************/ #include <ft2build.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include FT_INTERNAL_CALC_H #include FT_TRIGONOMETRY_H diff --git a/freetype/src/base/fttype1.c b/freetype/src/base/fttype1.c index db48b135e..54ccbbd30 100644 --- a/freetype/src/base/fttype1.c +++ b/freetype/src/base/fttype1.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include <freetype/internal/ftobjs.h> -#include <freetype/internal/ftserv.h> -#include <freetype/internal/services/svpsinfo.h> +#include <internal/ftobjs.h> +#include <internal/ftserv.h> +#include <internal/services/svpsinfo.h> /* documentation is in t1tables.h */ diff --git a/freetype/src/base/ftutil.c b/freetype/src/base/ftutil.c index 042077f5a..317280b85 100644 --- a/freetype/src/base/ftutil.c +++ b/freetype/src/base/ftutil.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/internal/ftmemory.h> -#include <freetype/internal/ftobjs.h> +#include <internal/ftdebug.h> +#include <internal/ftmemory.h> +#include <internal/ftobjs.h> #include FT_LIST_H diff --git a/freetype/src/base/ftxf86.c b/freetype/src/base/ftxf86.c index 680f57637..db6407b32 100644 --- a/freetype/src/base/ftxf86.c +++ b/freetype/src/base/ftxf86.c @@ -18,7 +18,7 @@ #include <ft2build.h> #include FT_XFREE86_H -#include <freetype/internal/ftobjs.h> +#include <internal/ftobjs.h> #include FT_SERVICE_XFREE86_NAME_H |