aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/sfnt
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/sfnt
parent90137f4c5e30b1c6f9a262e8c853494540dad2d7 (diff)
downloadvcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.gz
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.tar.bz2
vcxsrv-095ea6e18c55df550fda14f72c2d174af9b239ba.zip
Solved freetype compilation problems
Diffstat (limited to 'freetype/src/sfnt')
-rw-r--r--freetype/src/sfnt/sfdriver.c6
-rw-r--r--freetype/src/sfnt/sfntpic.c2
-rw-r--r--freetype/src/sfnt/sfntpic.h2
-rw-r--r--freetype/src/sfnt/sfobjs.c4
-rw-r--r--freetype/src/sfnt/sfobjs.h4
-rw-r--r--freetype/src/sfnt/ttbdf.c4
-rw-r--r--freetype/src/sfnt/ttcmap.c6
-rw-r--r--freetype/src/sfnt/ttcmap.h4
-rw-r--r--freetype/src/sfnt/ttkern.c4
-rw-r--r--freetype/src/sfnt/ttkern.h4
-rw-r--r--freetype/src/sfnt/ttload.c4
-rw-r--r--freetype/src/sfnt/ttload.h4
-rw-r--r--freetype/src/sfnt/ttmtx.c4
-rw-r--r--freetype/src/sfnt/ttmtx.h4
-rw-r--r--freetype/src/sfnt/ttpost.c6
-rw-r--r--freetype/src/sfnt/ttpost.h2
-rw-r--r--freetype/src/sfnt/ttsbit.c8
17 files changed, 36 insertions, 36 deletions
diff --git a/freetype/src/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c
index cea38be6b..2b7ffd556 100644
--- a/freetype/src/sfnt/sfdriver.c
+++ b/freetype/src/sfnt/sfdriver.c
@@ -17,9 +17,9 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftdebug.h>
+#include <internal/sfnt.h>
+#include <internal/ftobjs.h>
#include "sfdriver.h"
#include "ttload.h"
diff --git a/freetype/src/sfnt/sfntpic.c b/freetype/src/sfnt/sfntpic.c
index 80d9547f9..d62d5bef2 100644
--- a/freetype/src/sfnt/sfntpic.c
+++ b/freetype/src/sfnt/sfntpic.c
@@ -18,7 +18,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/internal/ftobjs.h>
+#include <internal/ftobjs.h>
#include "sfntpic.h"
#include "sferrors.h"
diff --git a/freetype/src/sfnt/sfntpic.h b/freetype/src/sfnt/sfntpic.h
index e107b924b..948148899 100644
--- a/freetype/src/sfnt/sfntpic.h
+++ b/freetype/src/sfnt/sfntpic.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/sfnt/sfobjs.c b/freetype/src/sfnt/sfobjs.c
index 93e4321b6..112753160 100644
--- a/freetype/src/sfnt/sfobjs.c
+++ b/freetype/src/sfnt/sfobjs.c
@@ -21,8 +21,8 @@
#include "ttload.h"
#include "ttcmap.h"
#include "ttkern.h"
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/sfnt.h>
+#include <internal/ftdebug.h>
#include FT_TRUETYPE_IDS_H
#include FT_TRUETYPE_TAGS_H
#include FT_SERVICE_POSTSCRIPT_CMAPS_H
diff --git a/freetype/src/sfnt/sfobjs.h b/freetype/src/sfnt/sfobjs.h
index 97bd8efdb..e5cf16061 100644
--- a/freetype/src/sfnt/sfobjs.h
+++ b/freetype/src/sfnt/sfobjs.h
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/sfnt.h>
-#include <freetype/internal/ftobjs.h>
+#include <internal/sfnt.h>
+#include <internal/ftobjs.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttbdf.c b/freetype/src/sfnt/ttbdf.c
index 9851fb1af..04f87a24e 100644
--- a/freetype/src/sfnt/ttbdf.c
+++ b/freetype/src/sfnt/ttbdf.c
@@ -17,8 +17,8 @@
#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 "ttbdf.h"
diff --git a/freetype/src/sfnt/ttcmap.c b/freetype/src/sfnt/ttcmap.c
index 1ef6d3ceb..580c43050 100644
--- a/freetype/src/sfnt/ttcmap.c
+++ b/freetype/src/sfnt/ttcmap.c
@@ -17,12 +17,12 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
+#include <internal/ftdebug.h>
#include "sferrors.h" /* must come before <freetype/internal/ftvalid.h> */
-#include <freetype/internal/ftvalid.h>
-#include <freetype/internal/ftstream.h>
+#include <internal/ftvalid.h>
+#include <internal/ftstream.h>
#include "ttload.h"
#include "ttcmap.h"
#include "sfntpic.h"
diff --git a/freetype/src/sfnt/ttcmap.h b/freetype/src/sfnt/ttcmap.h
index 87aadc31c..352e58f6d 100644
--- a/freetype/src/sfnt/ttcmap.h
+++ b/freetype/src/sfnt/ttcmap.h
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/tttypes.h>
-#include <freetype/internal/ftvalid.h>
+#include <internal/tttypes.h>
+#include <internal/ftvalid.h>
#include FT_SERVICE_TT_CMAP_H
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttkern.c b/freetype/src/sfnt/ttkern.c
index ac870b424..3bfd78891 100644
--- a/freetype/src/sfnt/ttkern.c
+++ b/freetype/src/sfnt/ttkern.c
@@ -18,8 +18,8 @@
#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 "ttkern.h"
diff --git a/freetype/src/sfnt/ttkern.h b/freetype/src/sfnt/ttkern.h
index 39b51fc35..7d21309b0 100644
--- a/freetype/src/sfnt/ttkern.h
+++ b/freetype/src/sfnt/ttkern.h
@@ -22,8 +22,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttload.c b/freetype/src/sfnt/ttload.c
index f6a11c12f..1ca2dd5c2 100644
--- a/freetype/src/sfnt/ttload.c
+++ b/freetype/src/sfnt/ttload.c
@@ -18,8 +18,8 @@
#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 "ttload.h"
diff --git a/freetype/src/sfnt/ttload.h b/freetype/src/sfnt/ttload.h
index 186e9ec90..12c036b99 100644
--- a/freetype/src/sfnt/ttload.h
+++ b/freetype/src/sfnt/ttload.h
@@ -22,8 +22,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttmtx.c b/freetype/src/sfnt/ttmtx.c
index bc95bf861..920b2b92a 100644
--- a/freetype/src/sfnt/ttmtx.c
+++ b/freetype/src/sfnt/ttmtx.c
@@ -17,8 +17,8 @@
#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 "ttmtx.h"
diff --git a/freetype/src/sfnt/ttmtx.h b/freetype/src/sfnt/ttmtx.h
index b045458ee..13b0775ce 100644
--- a/freetype/src/sfnt/ttmtx.h
+++ b/freetype/src/sfnt/ttmtx.h
@@ -21,8 +21,8 @@
#include <ft2build.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/internal/tttypes.h>
+#include <internal/ftstream.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttpost.c b/freetype/src/sfnt/ttpost.c
index 73792aed4..164edd8ce 100644
--- a/freetype/src/sfnt/ttpost.c
+++ b/freetype/src/sfnt/ttpost.c
@@ -26,9 +26,9 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/tttags.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <tttags.h>
#include "ttpost.h"
#include "sferrors.h"
diff --git a/freetype/src/sfnt/ttpost.h b/freetype/src/sfnt/ttpost.h
index 965928cce..d552c3aa5 100644
--- a/freetype/src/sfnt/ttpost.h
+++ b/freetype/src/sfnt/ttpost.h
@@ -23,7 +23,7 @@
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
-#include <freetype/internal/tttypes.h>
+#include <internal/tttypes.h>
FT_BEGIN_HEADER
diff --git a/freetype/src/sfnt/ttsbit.c b/freetype/src/sfnt/ttsbit.c
index cd7592dff..01dfac015 100644
--- a/freetype/src/sfnt/ttsbit.c
+++ b/freetype/src/sfnt/ttsbit.c
@@ -20,10 +20,10 @@
#include <ft2build.h>
-#include <freetype/internal/ftdebug.h>
-#include <freetype/internal/ftstream.h>
-#include <freetype/tttags.h>
-#include <freetype/ftbitmap.h>
+#include <internal/ftdebug.h>
+#include <internal/ftstream.h>
+#include <tttags.h>
+#include <ftbitmap.h>
#include "ttsbit.h"
#include "sferrors.h"