diff options
| author | SiyangXie@gmail.com <SiyangXie@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-03-11 22:47:07 +0000 |
|---|---|---|
| committer | SiyangXie@gmail.com <SiyangXie@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-03-11 22:47:07 +0000 |
| commit | 88fa7cfc6b225d00ab2225f8f587b1e145dfbdf3 (patch) | |
| tree | 5dfac51e335e70183b5b59ba5e901e4085558f20 /src | |
| parent | Google Breakpad Issue 417: Handle DWARF that omits function names. (diff) | |
| download | breakpad-88fa7cfc6b225d00ab2225f8f587b1e145dfbdf3.tar.xz | |
Protect "std::max", "std::min" against MACROs defined in WinDef.h.
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@780 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/windows/handler/exception_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc index 9c0593b4..ec5397dc 100644 --- a/src/client/windows/handler/exception_handler.cc +++ b/src/client/windows/handler/exception_handler.cc @@ -793,11 +793,11 @@ bool ExceptionHandler::WriteMinidumpWithException( // pointer, but settle for whatever's available up to the // boundaries of the memory region. const ULONG64 kIPMemorySize = 256; - context.memory_base = - std::max(reinterpret_cast<ULONG64>(info.BaseAddress), + context.memory_base = + (std::max)(reinterpret_cast<ULONG64>(info.BaseAddress), instruction_pointer - (kIPMemorySize / 2)); ULONG64 end_of_range = - std::min(instruction_pointer + (kIPMemorySize / 2), + (std::min)(instruction_pointer + (kIPMemorySize / 2), reinterpret_cast<ULONG64>(info.BaseAddress) + info.RegionSize); context.memory_size = |