Reland "[llvm-readobj] Simplify usage of -codeview flag"

[oota-llvm.git] / tools / llvm-pdbdump / llvm-pdbdump.cpp

diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbdump/llvm-pdbdump.cpp
index 5b5cf00956cc90094f1836ba97143774b6678ec0..0e3f0b281fe02ea9529d389369f326e9921fbb50 100644 (file)
--- a/tools/llvm-pdbdump/llvm-pdbdump.cpp
+++ b/tools/llvm-pdbdump/llvm-pdbdump.cpp
@@ -47,6 +47,9 @@
 #include "llvm/Support/Signals.h"
 
 #if defined(HAVE_DIA_SDK)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <Windows.h>
 #endif
 
@@ -361,8 +364,8 @@ static void dumpStructure(MemoryBufferRef M) {
       if (BytesLeftToReadInStream == 0)
         break;
 
-      uint32_t BytesToReadInBlock =
-          std::min(BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));
+      uint32_t BytesToReadInBlock = std::min(
+          BytesLeftToReadInStream, static_cast<uint32_t>(SB->BlockSize));
       auto StreamBlockData =
           StringRef(M.getBufferStart() + StreamBlockOffset, BytesToReadInBlock);
       if (auto EC = checkOffset(M, StreamBlockData))