Fix for min/max compile error on Windows
authorScott Graham <scottmg@chromium.org>
Fri, 1 Aug 2014 05:12:25 +0000 (22:12 -0700)
committerScott Graham <scottmg@chromium.org>
Fri, 1 Aug 2014 05:12:25 +0000 (22:12 -0700)
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
pdfium.gyp

index 82ff2be..0f13721 100644 (file)
@@ -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"
index 02ab629..277c1c7 100644 (file)
         }],
         ['OS=="win"', {
           'defines!': [
-            'NOMINMAX',
             'WIN32_LEAN_AND_MEAN'
           ],
           'sources': [