interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

helper/command: fix build with jimtcl 0.79 or older 

Commit a7d68878e4 ("helper/command: unregister commands through
their full-name") introduces for the first time in OpenOCD the use
of jimtcl API Jim_DeleteCommand().
The prototype of Jim_DeleteCommand() has changed with jimtcl 0.80
and the current code doesn't build with jimtcl 0.79 or older. This
is an issue for those distributions, like Debian, that provide
jimtcl as a separate package/library and have not switched yet to
the new jimtcl version.

Add a compile-time condition to cope with the jimtcl API change.

Change-Id: Ic813ab7c0ebd3c8772f27775ba3912a47d5c275c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Fixes: a7d68878e4 ("helper/command: unregister commands through their full-name")
Reviewed-on: http://openocd.zylin.com/6191
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2021-04-26 09:48:25 +02:00
parent ef0da79448
commit a60979b069
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/helper/command.c
View File

@ -437,7 +437,11 @@ int unregister_commands_match(struct command_context *cmd_ctx, const char *forma
continue; continue;
} }
LOG_DEBUG("delete command \"%s\"", name); LOG_DEBUG("delete command \"%s\"", name);
#if JIM_VERSION >= 80
Jim_DeleteCommand(interp, elem); Jim_DeleteCommand(interp, elem);
#else
Jim_DeleteCommand(interp, name);
#endif
help_del_command(cmd_ctx, name); help_del_command(cmd_ctx, name);