Use CARD32 instead of Atom, move geom headers in

[platform/upstream/libxkbcommon.git] / src / xkbcomp / expr.h

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 6bec888..fb1fa97 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -36,8 +36,8 @@ typedef union _ExprResult
 } ExprResult;
 
 typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
-                                Atom /* elem */ ,
-                                Atom /* field */ ,
+                                CARD32 /* elem */ ,
+                                CARD32 /* field */ ,
                                 unsigned /* type */ ,
                                 ExprResult *    /* val_rtrn */
     );
@@ -76,36 +76,36 @@ extern char *exprOpText(unsigned        /* type */
     );
 
 extern int RadioLookup(char * /* priv */ ,
-                       Atom /* elem */ ,
-                       Atom /* field */ ,
+                       CARD32 /* elem */ ,
+                       CARD32 /* field */ ,
                        unsigned /* type */ ,
                        ExprResult *     /* val_rtrn */
     );
 
 extern int SimpleLookup(char * /* priv */ ,
-                        Atom /* elem */ ,
-                        Atom /* field */ ,
+                        CARD32 /* elem */ ,
+                        CARD32 /* field */ ,
                         unsigned /* type */ ,
                         ExprResult *    /* val_rtrn */
     );
 
 extern int TableLookup(char * /* priv */ ,
-                       Atom /* elem */ ,
-                       Atom /* field */ ,
+                       CARD32 /* elem */ ,
+                       CARD32 /* field */ ,
                        unsigned /* type */ ,
                        ExprResult *     /* val_rtrn */
     );
 
 extern int LookupModIndex(char * /* priv */ ,
-                          Atom /* elem */ ,
-                          Atom /* field */ ,
+                          CARD32 /* elem */ ,
+                          CARD32 /* field */ ,
                           unsigned /* type */ ,
                           ExprResult *  /* val_rtrn */
     );
 
 extern int LookupModMask(char * /* priv */ ,
-                         Atom /* elem */ ,
-                         Atom /* field */ ,
+                         CARD32 /* elem */ ,
+                         CARD32 /* field */ ,
                          unsigned /* type */ ,
                          ExprResult *   /* val_rtrn */
     );