command_handler: change 'cmd_ctx' to CMD_CTX

[fw/openocd] / src / helper / jim-eventloop.c

diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c
index 1119cb3844e36dd19cadba163091f42f2bcf7558..fae46e899e7dda40951db1f5012faed8c93f1d69 100644 (file)
--- a/src/helper/jim-eventloop.c
+++ b/src/helper/jim-eventloop.c
@@ -3,7 +3,7 @@
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
  * Copyright 2005 Clemens Hintze <c.hintze@gmx.net>
  * Copyright 2005 patthoyts - Pat Thoyts <patthoyts@users.sf.net>
- * Copyright 2008 oharboe - Øyvind Harboe - oyvind.harboe@zylin.com
+ * Copyright 2008 oharboe - Øyvind Harboe - oyvind.harboe@zylin.com
  * Copyright 2008 Andrew Lunn <andrew@lunn.ch>
  * Copyright 2008 Duane Ellis <openocd@duaneellis.com>
  * Copyright 2008 Uwe Klein <uklein@klein-messgeraete.de>
@@ -52,8 +52,7 @@
 #define __JIM_EVENTLOOP_CORE__
 #ifdef __ECOS
 #include <pkgconf/jimtcl.h>
-#endif
-#ifdef __ECOS
+#include <sys/time.h>
 #include <cyg/jimtcl/jim.h>
 #include <cyg/jimtcl/jim-eventloop.h>
 #else
@@ -498,7 +497,7 @@ static int JimELAfterCommand(Jim_Interp *interp, int argc,
        int tlen ;
        jim_wide remain = 0;
        const char *tok = Jim_GetString(argv[2], &tlen);
-       if (sscanf(tok,"after#%lld",&id) == 1) {
+       if (sscanf(tok,"after#%" JIM_WIDE_MODIFIER, &id) == 1) {
                remain =  Jim_DeleteTimeHandler(interp, id);
                if (remain > -2)  {
                        Jim_SetResult(interp, Jim_NewIntObj(interp, remain));