aboutsummaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2021-04-26 09:48:25 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2021-05-01 13:35:33 +0100
commita60979b069b5964639d87ce268a37078c0fb57bb (patch)
treed34fa0fddc90f9da7c9ab279bf165a6df9e1134c /src/helper
parentef0da7944886466bc09386616fa089925be5ac62 (diff)
downloadriscv-openocd-a60979b069b5964639d87ce268a37078c0fb57bb.zip
riscv-openocd-a60979b069b5964639d87ce268a37078c0fb57bb.tar.gz
riscv-openocd-a60979b069b5964639d87ce268a37078c0fb57bb.tar.bz2
helper/command: fix build with jimtcl 0.79 or older
Commit a7d68878e4ba ("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: a7d68878e4ba ("helper/command: unregister commands through their full-name") Reviewed-on: http://openocd.zylin.com/6191 Tested-by: jenkins
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/command.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 80e297b..e703be4 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -437,7 +437,11 @@ int unregister_commands_match(struct command_context *cmd_ctx, const char *forma
continue;
}
LOG_DEBUG("delete command \"%s\"", name);
+#if JIM_VERSION >= 80
Jim_DeleteCommand(interp, elem);
+#else
+ Jim_DeleteCommand(interp, name);
+#endif
help_del_command(cmd_ctx, name);