diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-08-19 14:36:13 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-08-21 17:28:26 +0930 |
| commit | d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c (patch) | |
| tree | bf067730f9e795ebdbfce84e9f716cf5caccd6e9 /keycodes.c | |
| parent | 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd (diff) | |
| download | xorg-app-xkbcomp-d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c.tar.gz | |
Remove unused merge parameter from HandleKeyNameVar.
Diffstat (limited to 'keycodes.c')
| -rw-r--r-- | keycodes.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -616,7 +616,7 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info) * @return 1 on success, 0 otherwise. */ static int -HandleKeyNameVar(VarDef * stmt, unsigned merge, KeyNamesInfo * info) +HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info) { ExprResult tmp, field; ExprDef *arrayNdx; @@ -774,7 +774,7 @@ HandleKeycodesFile(XkbFile * file, info->errorCount++; break; case StmtVarDef: /* e.g. minimum, maximum */ - if (!HandleKeyNameVar((VarDef *) stmt, merge, info)) + if (!HandleKeyNameVar((VarDef *) stmt, info)) info->errorCount++; break; case StmtIndicatorNameDef: /* e.g. indicator 1 = "Caps Lock"; */ |