[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-122-ga60979b06

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  a60979b069b5964639d87ce268a37078c0fb57bb (commit)
      from  ef0da7944886466bc09386616fa089925be5ac62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a60979b069b5964639d87ce268a37078c0fb57bb
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Apr 26 09:48:25 2021 +0200

    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 <bor...@gm...>
    Fixes: a7d68878e4ba ("helper/command: unregister commands through their full-name")
    Reviewed-on: http://openocd.zylin.com/6191
    Tested-by: jenkins

diff --git a/src/helper/command.c b/src/helper/command.c
index 80e297b1f..e703be400 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);
 

-----------------------------------------------------------------------

Summary of changes:
 src/helper/command.c | 4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository