You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@mesos.apache.org by Alex Clemmer <cl...@gmail.com> on 2017/02/14 11:01:35 UTC

Review Request 56652: Windows: Change ZK patch to fix macro redefinition warnings on MSVC.

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56652/
-----------------------------------------------------------

Review request for mesos, Andrew Schwartzmeyer, Daniel Pravat, and Joseph Wu.


Repository: mesos


Description
-------

Currently, compiling against ZK on Windows will cause many macro
redefinition errors. This occurs because ZK has a `winstdint.h` file,
which contains definitions for macros that historically have not existed
in the MSVC toolchain.

However, since MSVC 1900, many of these now exist. Here, we introduce a
patch file that will condition out these definitions for versions 1900
and later.

Additionally, the previous patch file was not fully correct, resulting
in the patch being "fuzzed" when it was applied. This patch generates
the correct output, allowing the patches to apply cleanly.


Diffs
-----

  3rdparty/zookeeper-06d3f3f.patch be2ceaf529895c92dcf53984d6d88c78fb1d74ec 

Diff: https://reviews.apache.org/r/56652/diff/


Testing
-------


Thanks,

Alex Clemmer


Re: Review Request 56652: Windows: Change ZK patch to fix macro redefinition warnings on MSVC.

Posted by Mesos Reviewbot <re...@mesos.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/56652/#review165506
-----------------------------------------------------------



Bad patch!

Reviews applied: [56652, 56594, 56593, 56592, 56591, 56505, 56504, 55749, 55550, 55549, 55547, 55546, 55543, 55162, 55030, 55024, 55023, 55022]

Failed command: python support/apply-reviews.py -n -r 55547

Error:
2017-02-14 14:21:06 URL:https://reviews.apache.org/r/55547/diff/raw/ [11453/11453] -> "55547.patch" [1]
error: patch failed: 3rdparty/stout/include/Makefile.am:112
error: 3rdparty/stout/include/Makefile.am: patch does not apply

Full log: https://builds.apache.org/job/Mesos-Reviewbot/17086/console

- Mesos Reviewbot


On Feb. 14, 2017, 11:01 a.m., Alex Clemmer wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/56652/
> -----------------------------------------------------------
> 
> (Updated Feb. 14, 2017, 11:01 a.m.)
> 
> 
> Review request for mesos, Andrew Schwartzmeyer, Daniel Pravat, and Joseph Wu.
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> Currently, compiling against ZK on Windows will cause many macro
> redefinition errors. This occurs because ZK has a `winstdint.h` file,
> which contains definitions for macros that historically have not existed
> in the MSVC toolchain.
> 
> However, since MSVC 1900, many of these now exist. Here, we introduce a
> patch file that will condition out these definitions for versions 1900
> and later.
> 
> Additionally, the previous patch file was not fully correct, resulting
> in the patch being "fuzzed" when it was applied. This patch generates
> the correct output, allowing the patches to apply cleanly.
> 
> 
> Diffs
> -----
> 
>   3rdparty/zookeeper-06d3f3f.patch be2ceaf529895c92dcf53984d6d88c78fb1d74ec 
> 
> Diff: https://reviews.apache.org/r/56652/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>