aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/truetype
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-26 10:37:02 +0200
committermarha <marha@users.sourceforge.net>2014-06-26 10:37:02 +0200
commit095ea6e18c55df550fda14f72c2d174af9b239ba (patch)
tree7dd06ce2fbb82397123186136c92e14aa158e7d3 /freetype/src/truetype
parent90137f4c5e30b1c6f9a262e8c853494540dad2d7 (diff)
downloadvcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.gz
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.bz2
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.zip
Solved freetype compilation problems
Diffstat (limited to 'freetype/src/truetype')
-rw-r--r--freetype/src/truetype/ttdriver.c6
-rw-r--r--freetype/src/truetype/ttdriver.h2
-rw-r--r--freetype/src/truetype/ttgload.c8
-rw-r--r--freetype/src/truetype/ttgxvar.c6
-rw-r--r--freetype/src/truetype/ttinterp.c4
-rw-r--r--freetype/src/truetype/ttobjs.c6
-rw-r--r--freetype/src/truetype/ttobjs.h4
-rw-r--r--freetype/src/truetype/ttpic.c2
-rw-r--r--freetype/src/truetype/ttpload.c6
-rw-r--r--freetype/src/truetype/ttpload.h2
-rw-r--r--freetype/src/truetype/ttsubpix.c12
11 files changed, 29 insertions, 29 deletions
diff --git a/freetype/src/truetype/ttdriver.c b/freetype/src/truetype/ttdriver.c
index ff15ea070..ade2505c7 100644
--- a/freetype/src/truetype/ttdriver.c
+++ b/freetype/src/truetype/ttdriver.c
@@ -17,9 +17,9 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
#include FT_SERVICE_XFREE86_NAME_H
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
diff --git a/freetype/src/truetype/ttdriver.h b/freetype/src/truetype/ttdriver.h
index 59c100aa5..0f64f0652 100644
--- a/freetype/src/truetype/ttdriver.h
+++ b/freetype/src/truetype/ttdriver.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttgload.c b/freetype/src/truetype/ttgload.c
index 404ecf0df..3b4580cd7 100644
--- a/freetype/src/truetype/ttgload.c
+++ b/freetype/src/truetype/ttgload.c
@@ -17,10 +17,10 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
#include FT_TRUETYPE_TAGS_H
#include FT_OUTLINE_H
#include FT_TRUETYPE_DRIVER_H
diff --git a/freetype/src/truetype/ttgxvar.c b/freetype/src/truetype/ttgxvar.c
index b05b199c3..50e5f02a7 100644
--- a/freetype/src/truetype/ttgxvar.c
+++ b/freetype/src/truetype/ttgxvar.c
@@ -44,10 +44,10 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
#include FT_CONFIG_CONFIG_H
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
#include FT_TRUETYPE_TAGS_H
#include FT_MULTIPLE_MASTERS_H
diff --git a/freetype/src/truetype/ttinterp.c b/freetype/src/truetype/ttinterp.c
index 9b7ca9df5..828e295a5 100644
--- a/freetype/src/truetype/ttinterp.c
+++ b/freetype/src/truetype/ttinterp.c
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
#include FT_TRIGONOMETRY_H
#include FT_SYSTEM_H
#include FT_TRUETYPE_DRIVER_H
diff --git a/freetype/src/truetype/ttobjs.c b/freetype/src/truetype/ttobjs.c
index af04873fa..ebbf1b058 100644
--- a/freetype/src/truetype/ttobjs.c
+++ b/freetype/src/truetype/ttobjs.c
@@ -17,10 +17,10 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
#include FT_TRUETYPE_TAGS_H
-#include <freetype/internal/sfnt.h>
+#include <internal/sfnt.h>
#include FT_TRUETYPE_DRIVER_H
#include "ttgload.h"
diff --git a/freetype/src/truetype/ttobjs.h b/freetype/src/truetype/ttobjs.h
index 9dd4ddb8d..bcd776532 100644
--- a/freetype/src/truetype/ttobjs.h
+++ b/freetype/src/truetype/ttobjs.h
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftobjs.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttpic.c b/freetype/src/truetype/ttpic.c
index 55e5ba4e2..99ae45cb9 100644
--- a/freetype/src/truetype/ttpic.c
+++ b/freetype/src/truetype/ttpic.c
@@ -18,7 +18,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
#include "ttpic.h"
#include "tterrors.h"
diff --git a/freetype/src/truetype/ttpload.c b/freetype/src/truetype/ttpload.c
index 0c47253d8..2ee5d38b8 100644
--- a/freetype/src/truetype/ttpload.c
+++ b/freetype/src/truetype/ttpload.c
@@ -17,9 +17,9 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftdebug.h>
+#include <internal/ftobjs.h>
+#include <internal/ftstream.h>
#include FT_TRUETYPE_TAGS_H
#include "ttpload.h"
diff --git a/freetype/src/truetype/ttpload.h b/freetype/src/truetype/ttpload.h
index 9be60eec3..ec93680f4 100644
--- a/freetype/src/truetype/ttpload.h
+++ b/freetype/src/truetype/ttpload.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/truetype/ttsubpix.c b/freetype/src/truetype/ttsubpix.c
index b235eed6b..1f11d8d20 100644
--- a/freetype/src/truetype/ttsubpix.c
+++ b/freetype/src/truetype/ttsubpix.c
@@ -16,12 +16,12 @@
/***************************************************************************/
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftcalc.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/tttags.h>
-#include <freetype/ftoutln.h>
+#include <internal/ftdebug.h>
+#include <internal/ftcalc.h>
+#include <internal/ftstream.h>
+#include <internal/sfnt.h>
+#include <tttags.h>
+#include <ftoutln.h>
#include FT_TRUETYPE_DRIVER_H
#include "ttsubpix.h"