From d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue, 19 Aug 2008 14:36:13 +0930
Subject: Remove unused merge parameter from HandleKeyNameVar.

---
 keycodes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'keycodes.c')

diff --git a/keycodes.c b/keycodes.c
index 2c28932..79da721 100644
--- a/keycodes.c
+++ b/keycodes.c
@@ -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"; */
-- 
cgit v1.2.3