diff options
Diffstat (limited to 'src/angle/patches/0003-Fix-compilation-with-MinGW-gcc-64-bit.patch')
-rw-r--r-- | src/angle/patches/0003-Fix-compilation-with-MinGW-gcc-64-bit.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/angle/patches/0003-Fix-compilation-with-MinGW-gcc-64-bit.patch b/src/angle/patches/0003-Fix-compilation-with-MinGW-gcc-64-bit.patch deleted file mode 100644 index 24eb2c3c79..0000000000 --- a/src/angle/patches/0003-Fix-compilation-with-MinGW-gcc-64-bit.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6611792d6ff11ef875d0ae3e9fd1a116ad832a39 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <kai.koehne@digia.com> -Date: Sat, 28 Jun 2014 16:50:57 +0300 -Subject: [PATCH 03/12] 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 ---- - src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 1880056..637cf9a 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 -@@ -587,7 +587,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; - } --- -1.9.0.msysgit.0 - |