diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 14:12:33 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 14:14:03 +0000 |
| commit | 0f0eb8c5bb69009cf575fbc32391f645758d0ddc (patch) | |
| tree | 7d671b2558edfdccbe1a81166ad81a85128b7274 /third_party | |
| parent | 9a1c91699ce1370b86124edc9a32a9f0277e1d30 (diff) | |
| download | chromium_src-0f0eb8c5bb69009cf575fbc32391f645758d0ddc.zip chromium_src-0f0eb8c5bb69009cf575fbc32391f645758d0ddc.tar.gz chromium_src-0f0eb8c5bb69009cf575fbc32391f645758d0ddc.tar.bz2 | |
Fix harfbuzz compile on Windows LKGRs after r290100
R=eae,dominik.rottsches@intel.com
TBR=eae,dominik.rottsches@intel.com
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/481653002
Cr-Commit-Position: refs/heads/master@{#290144}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/harfbuzz-ng/README.chromium | 5 | ||||
| -rw-r--r-- | third_party/harfbuzz-ng/google.patch | 15 | ||||
| -rw-r--r-- | third_party/harfbuzz-ng/src/hb-private.hh | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/third_party/harfbuzz-ng/README.chromium b/third_party/harfbuzz-ng/README.chromium index b02ddf9..8124ef6 100644 --- a/third_party/harfbuzz-ng/README.chromium +++ b/third_party/harfbuzz-ng/README.chromium @@ -14,5 +14,6 @@ API from the old one. This copy of harfbuzz is updated by downloading the release tarball from http://www.freedesktop.org/software/harfbuzz/release/ , removing files in src, copying *.h *.hh *.cc from the tarball's src folder -over to src, then checking for removed or added files and updating -our build recipes in BUILD.gn and harfbuzz.gyp accordingly. +over to src, apply google.patch, then checking for removed or added +files and update our build recipes in BUILD.gn and harfbuzz.gyp +accordingly. diff --git a/third_party/harfbuzz-ng/google.patch b/third_party/harfbuzz-ng/google.patch new file mode 100644 index 0000000..9e47fe8 --- /dev/null +++ b/third_party/harfbuzz-ng/google.patch @@ -0,0 +1,15 @@ +diff --git a/third_party/harfbuzz-ng/src/hb-private.hh b/third_party/harfbuzz-ng/src/hb-private.hh +index 6b9d791..8f68e8b 100644 +--- a/third_party/harfbuzz-ng/src/hb-private.hh ++++ b/third_party/harfbuzz-ng/src/hb-private.hh +@@ -131,7 +131,9 @@ + # ifndef WIN32_LEAN_AND_MEAN + # define WIN32_LEAN_AND_MEAN + # endif +-# define STRICT ++# ifndef STRICT ++# define STRICT ++# endif + #endif + + #ifdef _WIN32_WCE diff --git a/third_party/harfbuzz-ng/src/hb-private.hh b/third_party/harfbuzz-ng/src/hb-private.hh index 6b9d791..8f68e8b 100644 --- a/third_party/harfbuzz-ng/src/hb-private.hh +++ b/third_party/harfbuzz-ng/src/hb-private.hh @@ -131,7 +131,9 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# define STRICT +# ifndef STRICT +# define STRICT +# endif #endif #ifdef _WIN32_WCE |