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 ++
 1 file changed, 2 insertions(+)

(limited to 'src/3rdparty/angle')

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
 {
 
-- 
cgit v1.2.3


From 00bf148b07cb7771136ed472766400336ab4d2bf Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 28 Oct 2013 10:27:53 +0100
Subject: Fix compilation with MinGW gcc 64 bit

Fix compilation of ANGLE with gcc 4.8.0 64 bit: The

  reinterpret_cast<unsigned long>(void*)

was causing

  error: cast from 'const void*' to 'long unsigned int' loses precision

Task-number: QTBUG-34395
Change-Id: Ibde75dd4b5536f3827bdf0ab02a15e93a1a8a4f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/3rdparty/angle')

diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
index 113b126a77..72d354dd64 100644
--- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
+++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
@@ -589,7 +589,7 @@ const unsigned long long noEventId = 0;
 class TraceID {
 public:
     explicit TraceID(const void* id, unsigned char* flags) :
-        m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
+        m_data(reinterpret_cast<unsigned long long>(id))
     {
         *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
     }
-- 
cgit v1.2.3