Ecere Software / sdk / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 708c40d)
ecere/gfx/drivers/X: Fixed compilation with Glyph class conflict
authorJerome St-Louis <jerome@ecere.com>
Wed, 11 May 2016 04:00:20 +0000 (13:00 +0900)
committerJerome St-Louis <jerome@ecere.com>
Sat, 11 Jun 2016 07:07:21 +0000 (03:07 -0400)
ecere/src/gfx/drivers/XDisplayDriver.ec patch | blob | history

diff --git a/ecere/src/gfx/drivers/XDisplayDriver.ec b/ecere/src/gfx/drivers/XDisplayDriver.ec
index 01497c9..b384459 100644 (file)
--- a/ecere/src/gfx/drivers/XDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/XDisplayDriver.ec
@@ -18,6 +18,7 @@ default:
 #define Time      X11Time
 #define KeyCode   X11KeyCode
 #define Picture   X11Picture
+#define Glyph     X11Glyph
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -34,6 +35,7 @@ default:
 #undef Time
 #undef KeyCode
 #undef Picture
+#undef Glyph
 
 #undef uint
 #undef new
The Ecere SDK