From 92ea548aafee840e1507306a3ffb38625f427ec5 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Mon, 28 Apr 2014 14:34:47 +0400 Subject: [PATCH] Update to the current Jim Tcl This is a post-release version but hopefully some fixes that went in are worth it; also the changes here make OpenOCD compatible with stock 0.75 version if a distro maintainer decides to use it. Change-Id: I7ad1814c7c4868198475cdca4750c3d0ee4f5f8b Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2121 Tested-by: jenkins Reviewed-by: Freddie Chopin --- jimtcl | 2 +- src/helper/command.c | 2 +- src/helper/command.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jimtcl b/jimtcl index 2c1eba991e..72bbd6c5a3 160000 --- a/jimtcl +++ b/jimtcl @@ -1 +1 @@ -Subproject commit 2c1eba991e21a6f0b531fb0f83e21f9e6ee7c515 +Subproject commit 72bbd6c5a327bdc1d5ea8cb12502640860b1fc44 diff --git a/src/helper/command.c b/src/helper/command.c index 21362a619f..137ac7ee67 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx, 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) diff --git a/src/helper/command.h b/src/helper/command.h index 0f0edbb578..0eda5b5e77 100644 --- a/src/helper/command.h +++ b/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, char delim); 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; -- 2.30.2