summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-15 15:31:12 -0800
committerLei Zhang <thestig@chromium.org>2016-01-15 15:31:12 -0800
commit6eaaaa3ed4157df021e99146422fd8634c63ecd5 (patch)
treeb7b975c025e1bb2b8a4f0fc4b8aba76ebbb9495f /core/include
parent76c995796f95fd4c54c5f11d2a04392f16478619 (diff)
downloadpdfium-6eaaaa3ed4157df021e99146422fd8634c63ecd5.tar.xz
Merge to XFA: Fix the way FT headers are included
FreeType headers have to be included with macros defined in ftheaders.h. Not doing so breaks when the FreeType header location changes as was the case between FreeType 2.6.0 and 2.6.2. Patch by jshin@chromium.org BUG=pdfium:362 TBR=jshin@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1587333002 . (cherry picked from commit 56461d66054c53fe3abc88208eaf5d84e80e6551) Review URL: https://codereview.chromium.org/1585233004 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxge/fx_freetype.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h
index c7c8295961..5721784eb7 100644
--- a/core/include/fxge/fx_freetype.h
+++ b/core/include/fxge/fx_freetype.h
@@ -8,12 +8,13 @@
#define CORE_INCLUDE_FXGE_FX_FREETYPE_H_
#include <ft2build.h>
-#include <freetype.h>
-#include <ftglyph.h>
-#include <ftlcdfil.h>
-#include <ftmm.h>
-#include <ftoutln.h>
-#include <tttables.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_LCD_FILTER_H
+#include FT_MULTIPLE_MASTERS_H
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_TABLES_H
+
#ifdef __cplusplus
extern "C" {
#endif