Index: third_party/freetype/include/ftsnames.h |
diff --git a/core/include/thirdparties/freetype/freetype/ftsnames.h b/third_party/freetype/include/ftsnames.h |
similarity index 97% |
rename from core/include/thirdparties/freetype/freetype/ftsnames.h |
rename to third_party/freetype/include/ftsnames.h |
index a13db81187555190976c587ba23f484c09b6dfe5..88af440356c7a5875ec1cae4d1092281095d398b 100644 |
--- a/core/include/thirdparties/freetype/freetype/ftsnames.h |
+++ b/third_party/freetype/include/ftsnames.h |
@@ -7,7 +7,7 @@ |
/* */ |
/* This is _not_ used to retrieve glyph names! */ |
/* */ |
-/* Copyright 1996-2001, 2002, 2003, 2006, 2009, 2010 by */ |
+/* Copyright 1996-2003, 2006, 2009, 2010, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -23,8 +23,8 @@ |
#define __FT_SFNT_NAMES_H__ |
-#include "../ft2build.h" |
-#include "freetype.h" |
+#include <ft2build.h> |
+#include FT_FREETYPE_H |
#ifdef FREETYPE_H |
#error "freetype.h of FreeType 1 has been loaded!" |
@@ -169,7 +169,7 @@ FT_BEGIN_HEADER |
* A constant used as the tag of @FT_Parameter structures to make |
* FT_Open_Face() ignore preferred family subfamily names in `name' |
* table since OpenType version 1.4. For backwards compatibility with |
- * legacy systems which has 4-face-per-family restriction. |
+ * legacy systems that have a 4-face-per-family restriction. |
* |
*/ |
#define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY FT_MAKE_TAG( 'i', 'g', 'p', 'f' ) |
@@ -184,7 +184,7 @@ FT_BEGIN_HEADER |
* A constant used as the tag of @FT_Parameter structures to make |
* FT_Open_Face() ignore preferred subfamily names in `name' table since |
* OpenType version 1.4. For backwards compatibility with legacy |
- * systems which has 4-face-per-family restriction. |
+ * systems that have a 4-face-per-family restriction. |
* |
*/ |
#define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY FT_MAKE_TAG( 'i', 'g', 'p', 's' ) |