--- OLD/xc/programs/xmodmap/handle.c	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/xmodmap/handle.c	Thu Jan  1 00:00:00 1970
@@ -27,6 +27,7 @@
 #include <X11/Xlib.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include "xmodmap.h"
 #include "wq.h"
 
@@ -1152,8 +1153,11 @@
  * we need to do and that all of the input is correct.
  */
 
-static int exec_keycode(), exec_add(), exec_remove(), exec_clear();
-static int exec_pointer();
+static int exec_keycode(struct op_keycode *);
+static int exec_add(struct op_addmodifier *);
+static int exec_remove(struct op_removemodifier *);
+static int exec_clear(struct op_clearmodifier *);
+static int exec_pointer(struct op_pointer *);
 
 int execute_work_queue ()
 {
@@ -1196,26 +1200,26 @@
 	dosync = 0;
 	switch (op->generic.type) {
 	  case doKeycode:
-	    if (exec_keycode (op) < 0) errors++;
+	    if (exec_keycode (&op->keycode) < 0) errors++;
 	    if (op->keycode.target_keycode)
 		dosync = 1;
 	    else
 		dosync = -1;
 	    break;
 	  case doAddModifier:
-	    if (exec_add (op) < 0) errors++;
+	    if (exec_add (&op->addmodifier) < 0) errors++;
 	    else update_map = True;
 	    break;
 	  case doRemoveModifier:
-	    if (exec_remove (op) < 0) errors++;
+	    if (exec_remove (&op->removemodifier) < 0) errors++;
 	    else update_map = True;
 	    break;
 	  case doClearModifier:
-	    if (exec_clear (op) < 0) errors++;
+	    if (exec_clear (&op->clearmodifier) < 0) errors++;
 	    else update_map = True;
 	    break;
 	  case doPointer:
-	    if (exec_pointer (op) < 0) errors++;
+	    if (exec_pointer (&op->pointer) < 0) errors++;
 	    break;
 	  default:
 	    fprintf (stderr, "%s:  unknown opcode %d\n", 
@@ -1340,5 +1344,3 @@
     PrintPointerMap (stdout);
     return;
 }
-
-