blob: 14404ed30a8ba95e1f6edd50a1f4330cdbb014ea (
plain) (
blame)
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
46
47
48
49
50
51
52
53
|
From d6c2c3b9ca52af697088f280c30fe5b27f7a694f Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 14 Nov 2018 21:07:29 +0100
Subject: [PATCH] Fixed compilation with current mesa versions.
As you can see in
https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h
now the file uses __gl_glext_h_ instead of __glext_h_
It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada
---
auto/src/glew_head.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index 41e5a262..742f27f5 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -14,7 +14,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -30,6 +30,7 @@
#define __X_GL_H
#define __glext_h_
#define __GLEXT_H_
+#define __gl_glext_h_
#define __gl_ATI_h_
#if defined(_WIN32)
--- glew-2.1.0/include/GL/glew.h.old 2017-07-31 11:25:39.000000000 +0000
+++ glew-2.1.0/include/GL/glew.h 2019-03-20 19:05:46.240000000 +0000
@@ -93,7 +93,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -109,6 +109,7 @@
#define __X_GL_H
#define __glext_h_
#define __GLEXT_H_
+#define __gl_glext_h_
#define __gl_ATI_h_
#if defined(_WIN32)
|
