summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-10-24 12:49:59 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-24 20:20:59 +0200
commitb66a217a1c0517376a730c391c2c1bb45c7eb271 (patch)
tree2b1dce1eae89808f28f774661f528b0b7a96e7c9 /src/3rdparty/angle/src
parent9ae94806addcc9d736eafd01a5841fbc23f58728 (diff)
ANGLE: Fix compilation with MSVC2013.
Add missing include for std::min(), std::max(). Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src')
-rw-r--r--src/3rdparty/angle/src/libEGL/Surface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp
index b47a7bcc20..83fbbf5b07 100644
--- a/src/3rdparty/angle/src/libEGL/Surface.cpp
+++ b/src/3rdparty/angle/src/libEGL/Surface.cpp
@@ -20,6 +20,8 @@
#include "libEGL/main.h"
#include "libEGL/Display.h"
+#include <algorithm>
+
namespace egl
{