Skip to content
Commit 03559ccd authored by Darin Fisher's avatar Darin Fisher Committed by Commit Bot
Browse files

Avoid 'internal_state' macro pollution from zlib.h.

This ends up conflicting with use of 'internal_state' as a member function
name in mojo header files. It creates problems especially with jumbo builds.
Fixing it here rather than just working around it in the jumbo build helps
avoid others from stumbling over this in the future (especially as we start
utilizing mojo more).

Change-Id: I649fd80eb80c57e445b78819e9dc674adbf901bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709871


Commit-Queue: Darin Fisher <darin@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#679268}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c56fa983a92c26a87fdf36027cc03a19edd9c157
parent abd51836
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment