1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
| | From 5c45e53ee2f8ab39f3471eaf5f9636c68f3c3960 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@theqtcompany.com>
Date: Wed, 11 Mar 2015 13:15:30 +0100
Subject: <third_party/mesa> Fix conflicting declaration errors due to
duplicate typedefs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Due to cascading includes to QtWebEngine core GLintptr and GLsizeiptr
might end up being defined twice if compiling with some embedded
toolchains like for the colibri-vf setup, due to chromium's
gles2_cmd_format.h also defining these typedefs unconditionally.
Prevent the conflicting definitions by guarding them with
BUILDING_CHROMIUM which we define when compiling QtWebEngineCore.
Change-Id: I33719c08300211f4ad304efa3e7a5326136bb3cf
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
chromium/third_party/mesa/src/include/GL/glext.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index cb19ed4..1b78767 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6148,6 +6148,7 @@ typedef char GLchar;
#endif
#ifndef GL_VERSION_1_5
+#ifndef BUILDING_CHROMIUM
/* GL types for handling large vertex buffer objects */
#ifdef _WIN64
typedef signed long long int GLintptr;
@@ -6157,6 +6158,7 @@ typedef signed long int GLintptr;
typedef signed long int GLsizeiptr;
#endif
#endif
+#endif
#ifndef GL_ARB_vertex_buffer_object
/* GL types for handling large vertex buffer objects */
--
cgit v0.11.0
|