From b7e2af924f5ea820d9ccfed4afa675bf32e76c6f Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 31 Jul 2014 22:12:25 -0700 Subject: Fix for min/max compile error on Windows Patch from jschuh@chromium.org. BUG=pdfium:31 TBR=jschuh@chromium.org,thakis@chromium.org Review URL: https://codereview.chromium.org/438843003 --- core/src/fxge/win32/fx_win32_gdipext.cpp | 5 +++++ pdfium.gyp | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 82ff2be952..0f13721c70 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 +#include +namespace Gdiplus { + using std::min; + using std::max; +} // namespace Gdiplus #include #include "../../../include/fxge/fx_ge_win32.h" #include "win32_int.h" diff --git a/pdfium.gyp b/pdfium.gyp index 02ab629c1c..277c1c74a0 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -669,7 +669,6 @@ }], ['OS=="win"', { 'defines!': [ - 'NOMINMAX', 'WIN32_LEAN_AND_MEAN' ], 'sources': [ -- cgit v1.2.3