This is an automated email from Gerrit.

Antonio Borneo ([email protected]) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/6191

-- gerrit

commit 21491c996a02feffb1384be006ae035a393a14f7
Author: Antonio Borneo <[email protected]>
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 <[email protected]>
    Fixes: a7d68878e4ba ("helper/command: unregister commands through their 
full-name")

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);
 

-- 

Reply via email to