commit 1cb3d1bbe9a98de86d79df84ebed8783ca013975
author Scott Graham <scottmg@chromium.org> Thu Jul 31 22:12:25 2014 -0700
committer Bo Xu <bo_xu@foxitsoftware.com> Mon Aug 11 14:52:40 2014 -0700
tree 81804fa7ff9d6da458826f7fd9b7750c454ef56a
parent 5a7eb44f1bcfe843f7810acf60fa6c59bd13ded2

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

diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 7b586ea..f046cbe 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"

pdfium.gyp

diff --git a/pdfium.gyp b/pdfium.gyp
index 34d6959..0588000 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -681,7 +681,6 @@
         }],
         ['OS=="win"', {
           'defines!': [
-            'NOMINMAX',
             'WIN32_LEAN_AND_MEAN'
           ],
           'sources': [