tree 9f4f0f378f1620a5871aa4fcd6ade05ef83f30b5
parent 7ec8621c8d8aa2a6dd9e89410907aa5b36232dc3
author Daniel Bratell <bratell@opera.com> 1538393793 +0000
committer Commit Bot <commit-bot@chromium.org> 1538393793 +0000

Resolve Windows conflict between zlib and angle

Windows normally defines macros so that FAR expands to far, and
far expands to nothing.

Angle undefs far, leaving the FAR macro hanging, expanding to far
which is not a legal keyword anymore. zlib already tries to handle
that someone/something has undefined FAR but it doesn't handle
that someone/something has undefined far. This patch changes that.

This problem appeared in some jumbo builds in
gpu/command_buffer/service which uses both angle and zlib.

Bug: 889429
Change-Id: Ia3b10a9a82fc51b302c67b24a19f30a73bdda489
Reviewed-on: https://chromium-review.googlesource.com/1245723
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595425}