From b66a217a1c0517376a730c391c2c1bb45c7eb271 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 24 Oct 2013 12:49:59 +0300
Subject: 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>
---
 src/3rdparty/angle/src/libEGL/Surface.cpp          |  2 ++
 .../0001-ANGLE-Fix-compilation-with-MSVC2013.patch | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch

(limited to 'src')

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
 {
 
diff --git a/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch b/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch
new file mode 100644
index 0000000000..cf32a20d46
--- /dev/null
+++ b/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch
@@ -0,0 +1,28 @@
+From 4863cf64cd332a5fcefe453634c3c5ef62cb758c Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@digia.com>
+Date: Thu, 24 Oct 2013 12:49:59 +0300
+Subject: [PATCH] ANGLE: Fix compilation with MSVC2013.
+
+Add missing include for std::min(), std::max().
+
+Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637
+---
+ src/3rdparty/angle/src/libEGL/Surface.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp
+index b47a7bc..83fbbf5 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
+ {
+ 
+-- 
+1.8.3.msysgit.0
+
-- 
cgit v1.2.3