summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2014-07-31 22:12:25 -0700
committerScott Graham <scottmg@chromium.org>2014-07-31 22:12:25 -0700
commitb7e2af924f5ea820d9ccfed4afa675bf32e76c6f (patch)
treee00af4f029ac1b5cad1834c1badf22aaf6420fe9 /core/src
parentd4ca3b48f6d7bbfeb774f27018baa3a5c63bdd41 (diff)
downloadpdfium-b7e2af924f5ea820d9ccfed4afa675bf32e76c6f.tar.xz
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
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fxge/win32/fx_win32_gdipext.cpp5
1 files changed, 5 insertions, 0 deletions
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 <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"