From a60979b069b5964639d87ce268a37078c0fb57bb Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Mon, 26 Apr 2021 09:48:25 +0200 Subject: [PATCH] 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 Fixes: a7d68878e4ba ("helper/command: unregister commands through their full-name") Reviewed-on: http://openocd.zylin.com/6191 Tested-by: jenkins --- src/helper/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/helper/command.c b/src/helper/command.c index 80e297b1f8..e703be400c 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); -- 2.30.2