-
Mostyn Bramley-Moore authored
Linux builds have an include chain from src/perf-jit.cc: sys/mman.h -> bits/mman.h -> bits/mman-linux.h, which defines a MAP_TYPE macro that conflicts with InstanceType::MAP_TYPE in jumbo builds, for some jumbo_file_merge_limit values. Since MAP_TYPE isn't used in perf-jit.cc, it should be safe to #undef the macro immediately after the sys/mman.h #include statement. Bug: chromium:746958 Change-Id: I1339a4f56cf6783bf6121cd44c93e776af9458ba Reviewed-on: https://chromium-review.googlesource.com/654042Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Mostyn Bramley-Moore <mostynb@opera.com> Cr-Commit-Position: refs/heads/master@{#47971}
5af9ec2c