Commit 584fe03d authored by Ben Wagner's avatar Ben Wagner Committed by Commit Bot

Roll src/third_party/freetype/src/ 707cd028b..994eb2b34 (8 commits)

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/707cd028b2b4..994eb2b34934

$ git log 707cd028b..994eb2b34 --date=short --no-merges --format='%ad %ae %s'
2018-01-26 wl [truetype] Fix multiple calls of `FT_Get_MM_Var' (#52955).
2018-01-23 apodtele [apinames] Anonymous version map for GNU linker.
2018-01-21 apodtele [unix] Call libtool to clean up.
2018-01-18 apodtele * src/base/ftver.rc: Fix mingw-w64 compilation.
2018-01-18 apodtele [build] Enable VERSIONINFO resource for Cygwin/MinGW.
2018-01-18 apodtele [build] Move VERSIONINFO resource.
2018-01-12 apodtele [build] Expand dllexport/dllimport to Cygwin/MinGW.
2018-01-12 apodtele [build] Improve and document MSVC build.

Created with:
  roll-dep src/third_party/freetype/src
R=bungeman@chromium.org,drott@chromium.org

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_msan_rel_ng
PDFium issue: pdfium:995

Change-Id: I2a3483beea08685c6ce68c23e6f07f77988d751f
Reviewed-on: https://chromium-review.googlesource.com/889767Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532394}
parent b7c59483
......@@ -131,7 +131,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
'freetype_revision': '707cd028b2b419a5491d444b128d8092afd9f201',
'freetype_revision': '994eb2b34934bc5face9f83b2d3b12cf7a9262ab',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
......
Name: FreeType
URL: http://www.freetype.org/
Version: VER-2-9-3
Revision: 707cd028b2b419a5491d444b128d8092afd9f201
Version: VER-2-9-11
Revision: 994eb2b34934bc5face9f83b2d3b12cf7a9262ab
License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
JPEG Group) licenses"
License File: src/docs/FTL.TXT
......
......@@ -486,11 +486,13 @@ FT_BEGIN_HEADER
#define FT_EXPORT( x ) extern x
#endif
#ifdef _MSC_VER
#ifdef _WIN32
#if defined( FT2_BUILD_LIBRARY ) && \
( defined( _DLL ) || defined( DLL_EXPORT ) )
#undef FT_EXPORT
#ifdef _DLL
#define FT_EXPORT( x ) __declspec( dllexport ) x
#else
#elif defined( FT2_DLLIMPORT )
#undef FT_EXPORT
#define FT_EXPORT( x ) __declspec( dllimport ) x
#endif
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment