diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-07-31 22:12:25 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-08-11 14:52:40 -0700 |
| commit | 1cb3d1bbe9a98de86d79df84ebed8783ca013975 (patch) | |
| tree | 81804fa7ff9d6da458826f7fd9b7750c454ef56a | |
| parent | 5a7eb44f1bcfe843f7810acf60fa6c59bd13ded2 (diff) | |
| download | pdfium-chromium/2062.tar.xz | |
Fix for min/max compile error on Windowschromium/2062
Patch from jschuh@chromium.org.
BUG=pdfium:31
TBR=jschuh@chromium.org,thakis@chromium.org
Review URL: https://codereview.chromium.org/438843003
| -rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 5 | ||||
| -rw-r--r-- | pdfium.gyp | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 7b586ea32a..f046cbe00e 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -7,6 +7,11 @@ #include "../../../include/fxge/fx_ge.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ #include <windows.h> +#include <algorithm> +namespace Gdiplus { + using std::min; + using std::max; +} // namespace Gdiplus #include <gdiplus.h> #include "../../../include/fxge/fx_ge_win32.h" #include "win32_int.h" diff --git a/pdfium.gyp b/pdfium.gyp index 34d6959430..05880006a6 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -681,7 +681,6 @@ }], ['OS=="win"', { 'defines!': [ - 'NOMINMAX', 'WIN32_LEAN_AND_MEAN' ], 'sources': [ |