kbproto unentanglement: XkbGeomPtsPerMM

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y
index d702890..e1bf18e 100644 (file)
--- a/src/xkbcomp/parser.y
+++ b/src/xkbcomp/parser.y
@@ -724,7 +724,7 @@ SignedNumber    :       MINUS Number    { $$ = -$2; }
                 ;
 
 Number          :       FLOAT   { $$ = $1; }
-                |       INTEGER { $$ = $1 * XkbGeomPtsPerMM; }
+                |       INTEGER { $$ = $1; }
                 ;
 
 Float           :       FLOAT   { $$ = 0; }

diff --git a/src/xkbcomp/scanner.l b/src/xkbcomp/scanner.l
index 6e1089d..95fcaa1 100644 (file)
--- a/src/xkbcomp/scanner.l
+++ b/src/xkbcomp/scanner.l
@@ -179,7 +179,7 @@ alternate_group         return ALTERNATE_GROUP;
                         }
 [0-9]+\.[0-9]+ {
                             char *end;
-                            yylval->num = strtod(yytext, &end) * XkbGeomPtsPerMM;
+                            yylval->num = strtod(yytext, &end);
 
                             return FLOAT;
                         }