Ecere Software
/
sdk
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
256681c
)
ecere/gfx/drivers/OpenGLDisplayDriver: Work around for 'pointer' conflicts
author
Jerome St-Louis
<jerome@ecere.com>
Wed, 9 Dec 2015 23:35:17 +0000
(18:35 -0500)
committer
Jerome St-Louis
<jerome@ecere.com>
Tue, 22 Dec 2015 06:45:17 +0000
(
01:45
-0500)
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
patch
|
blob
|
history
diff --git
a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index
932cbd2
..
b0a7c1b
100644
(file)
--- a/
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@
-10,6
+10,8
@@
namespace gfx::drivers;
#define GL_GLEXT_PROTOTYPES
#endif
+#define pointer _pointer
+
#ifdef ECERE_MINIGLX
//#include <GL/miniglx.h>
@@
-85,6
+87,8
@@
namespace gfx::drivers;
#endif
+#undef pointer
+
import "Display"
#if defined(__unix__) || defined(__APPLE__)