Index: openocd-0.7.99+git20140317/src/helper/command.h
===================================================================
--- openocd-0.7.99+git20140317.orig/src/helper/command.h
+++ openocd-0.7.99+git20140317/src/helper/command.h
@@ -168,7 +168,7 @@ struct command {
 	struct command *parent;
 	struct command *children;
 	command_handler_t handler;
-	Jim_CmdProc jim_handler;
+	Jim_CmdProc* jim_handler;
 	void *jim_handler_data;
 	enum command_mode mode;
 	struct command *next;
@@ -204,7 +204,7 @@ char *command_name(struct command *c, ch
 struct command_registration {
 	const char *name;
 	command_handler_t handler;
-	Jim_CmdProc jim_handler;
+	Jim_CmdProc* jim_handler;
 	void *jim_handler_data;
 	enum command_mode mode;
 	const char *help;
Index: openocd-0.7.99+git20140317/src/helper/command.c
===================================================================
--- openocd-0.7.99+git20140317.orig/src/helper/command.c
+++ openocd-0.7.99+git20140317/src/helper/command.c
@@ -365,7 +365,7 @@ static int register_command_handler(stru
 
 	LOG_DEBUG("registering '%s'...", ocd_name);
 
-	Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
+	Jim_CmdProc* func = c->handler ? &script_command : &command_unknown;
 	int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
 	free(ocd_name);
 	if (JIM_OK != retval)