aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/type42
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/type42
parent90137f4c5e30b1c6f9a262e8c853494540dad2d7 (diff)
downloadvcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.gz
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.bz2
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.zip
Solved freetype compilation problems
Diffstat (limited to 'freetype/src/type42')
-rw-r--r--freetype/src/type42/t42drivr.c4
-rw-r--r--freetype/src/type42/t42drivr.h2
-rw-r--r--freetype/src/type42/t42objs.c2
-rw-r--r--freetype/src/type42/t42objs.h14
-rw-r--r--freetype/src/type42/t42parse.c6
-rw-r--r--freetype/src/type42/t42parse.h2
-rw-r--r--freetype/src/type42/t42types.h8
7 files changed, 19 insertions, 19 deletions
diff --git a/freetype/src/type42/t42drivr.c b/freetype/src/type42/t42drivr.c
index 7782b1da0..e3a52d772 100644
--- a/freetype/src/type42/t42drivr.c
+++ b/freetype/src/type42/t42drivr.c
@@ -39,12 +39,12 @@
#include "t42drivr.h"
#include "t42objs.h"
#include "t42error.h"
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
#include FT_SERVICE_XFREE86_NAME_H
#include FT_SERVICE_GLYPH_DICT_H
#include FT_SERVICE_POSTSCRIPT_NAME_H
-#include <freetype/internal/services/svpsinfo.h>
+#include <internal/services/svpsinfo.h>
#undef FT_COMPONENT
#define FT_COMPONENT trace_t42
diff --git a/freetype/src/type42/t42drivr.h b/freetype/src/type42/t42drivr.h
index 1defca7ff..fca34d03f 100644
--- a/freetype/src/type42/t42drivr.h
+++ b/freetype/src/type42/t42drivr.h
@@ -20,7 +20,7 @@
#include <ft2build.h>
-#include <freetype/internal/ftdriver.h>
+#include <internal/ftdriver.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42objs.c b/freetype/src/type42/t42objs.c
index 85d10a36f..2595ecc25 100644
--- a/freetype/src/type42/t42objs.c
+++ b/freetype/src/type42/t42objs.c
@@ -19,7 +19,7 @@
#include "t42objs.h"
#include "t42parse.h"
#include "t42error.h"
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
#include FT_LIST_H
#include FT_TRUETYPE_IDS_H
diff --git a/freetype/src/type42/t42objs.h b/freetype/src/type42/t42objs.h
index 4db189948..0fad19adb 100644
--- a/freetype/src/type42/t42objs.h
+++ b/freetype/src/type42/t42objs.h
@@ -19,14 +19,14 @@
#define __T42OBJS_H__
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/t1types.h>
+#include <freetype.h>
+#include <t1tables.h>
+#include <internal/t1types.h>
#include "t42types.h"
-#include <freetype/internal/ftobjs.h>
-#include <freetype/internal/ftdriver.h>
-#include <freetype/internal/services/svpscmap.h>
-#include <freetype/internal/pshints.h>
+#include <internal/ftobjs.h>
+#include <internal/ftdriver.h>
+#include <internal/services/svpscmap.h>
+#include <internal/pshints.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42parse.c b/freetype/src/type42/t42parse.c
index 5fdecb291..d103f94e9 100644
--- a/freetype/src/type42/t42parse.c
+++ b/freetype/src/type42/t42parse.c
@@ -18,9 +18,9 @@
#include "t42parse.h"
#include "t42error.h"
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/psaux.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <internal/psaux.h>
/*************************************************************************/
diff --git a/freetype/src/type42/t42parse.h b/freetype/src/type42/t42parse.h
index 28c22d0c3..f1ae1fcad 100644
--- a/freetype/src/type42/t42parse.h
+++ b/freetype/src/type42/t42parse.h
@@ -20,7 +20,7 @@
#include "t42objs.h"
-#include <freetype/internal/psaux.h>
+#include <internal/psaux.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/type42/t42types.h b/freetype/src/type42/t42types.h
index 2d930d0b3..cfe1cb192 100644
--- a/freetype/src/type42/t42types.h
+++ b/freetype/src/type42/t42types.h
@@ -20,10 +20,10 @@
#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/t1tables.h>
-#include <freetype/internal/t1types.h>
-#include <freetype/internal/pshints.h>
+#include <freetype.h>
+#include <t1tables.h>
+#include <internal/t1types.h>
+#include <internal/pshints.h>
FT_BEGIN_HEADER