Use CARD32 instead of Atom, move geom headers in

[platform/upstream/libxkbcommon.git] / src / xkbcomp / xkbparse.y

diff --git a/src/xkbcomp/xkbparse.y b/src/xkbcomp/xkbparse.y
index 1c05356..ae37f7a 100644 (file)
--- a/src/xkbcomp/xkbparse.y
+++ b/src/xkbcomp/xkbparse.y
@@ -97,7 +97,6 @@
 #include "xkbmisc.h"
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
-#include <X11/extensions/XKBgeomcommon.h>
 #include <stdlib.h>
 
 unsigned int parseDebug;
@@ -376,9 +375,9 @@ InterpretDecl       :       INTERPRET InterpretMatch OBRACE
                ;
 
 InterpretMatch :       KeySym PLUS Expr        
-                       { $$= InterpCreate(XStringToKeysym($1), $3); }
+                       { $$= InterpCreate($1, $3); }
                |       KeySym                  
-                       { $$= InterpCreate(XStringToKeysym($1), NULL); }
+                       { $$= InterpCreate($1, NULL); }
                ;
 
 VarDeclList    :       VarDeclList VarDecl