<div dir="ltr">Ah, I see this was addressed in <span style="font-family:monospace">250386 - though might be nice to address across the whole project rather than this particular inclusion. Though maybe we've few enough inclusions that it's not too bad.</span></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 16, 2015 at 2:51 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Thu, Oct 15, 2015 at 2:17 AM, David Majnemer via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Thu Oct 15 04:17:15 2015<br>
New Revision: 250383<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=250383&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=250383&view=rev</a><br>
Log:<br>
Speculatively unbreak Windows build<br>
<br>
<windows.h> defines macros named min and max in conflict with<br>
<algorithm>.  Prevent macro expansion by wrapping std::min in<br>
parenthesis.<br></blockquote><div><br></div></span><div>Could we just build with NOMINMAX in the windows build?</div><span class=""><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=250383&r1=250382&r2=250383&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=250383&r1=250382&r2=250383&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)<br>
+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Thu Oct 15 04:17:15 2015<br>
@@ -361,8 +361,8 @@ static void dumpStructure(MemoryBufferRe<br>
       if (BytesLeftToReadInStream == 0)<br>
         break;<br>
<br>
-      uint32_t BytesToReadInBlock =<br>
-          std::min(BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));<br>
+      uint32_t BytesToReadInBlock = (std::min)(<br>
+          BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));<br>
       auto StreamBlockData =<br>
           StringRef(M.getBufferStart() + StreamBlockOffset, BytesToReadInBlock);<br>
       if (auto EC = checkOffset(M, StreamBlockData))<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></span></div><br></div></div>
</blockquote></div><br></div>