diff options
| author | Darin Fisher <darin@chromium.org> | 2019-07-19 21:26:12 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-19 21:26:12 +0000 |
| commit | 03559ccddad582c1e43af419d69d7a6f0639f8ca (patch) | |
| tree | 61d66a1d87b72b8d14dac409e14921574a50a410 /chromeconf.h | |
| parent | abd51836c6dad6c460d236fff70f28cc578a1336 (diff) | |
| download | zlib-03559ccddad582c1e43af419d69d7a6f0639f8ca.tar.gz | |
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: Mark Mentovai <mark@chromium.org>
Reviewed-by: Nico 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
Diffstat (limited to 'chromeconf.h')
| -rw-r--r-- | chromeconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeconf.h b/chromeconf.h index 3414831..e9aa386 100644 --- a/chromeconf.h +++ b/chromeconf.h @@ -158,7 +158,7 @@ #define voidpc Cr_z_voidpc #define voidpf Cr_z_voidpf #define gz_header_s Cr_z_gz_header_s -#define internal_state Cr_z_internal_state +/* #undef internal_state */ /* #undef z_off64_t */ /* An exported symbol that isn't handled by Z_PREFIX in zconf.h */ |