From: Redirect \"Slash\" NIL Date: Sat, 17 Oct 2009 19:15:13 +0000 (-0700) Subject: jim-eventloop for MinGW-w64 X-Git-Tag: v0.3.0-rc0~77 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a;p=openocd jim-eventloop for MinGW-w64 Use JIM_WIDE_MODIFIER for the sscanf format, and apply it for MINGW32 as well as other Windows environments. (Microsoft doesn't conform to the C99 standard, and uses "%I64d" not "%lld" for "long long".) NB: __MINGW32__ should work on both w32 and w64,. --- diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c index 5da00c94..edeeae71 100644 --- a/src/helper/jim-eventloop.c +++ b/src/helper/jim-eventloop.c @@ -498,7 +498,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)); diff --git a/src/helper/jim.h b/src/helper/jim.h index 82d987f7..0aa0c93d 100644 --- a/src/helper/jim.h +++ b/src/helper/jim.h @@ -120,7 +120,7 @@ extern "C" { * ---------------------------------------------------------------------------*/ #ifdef HAVE_LONG_LONG_INT -# if defined(_MSC_VER) || defined(__MSVCRT__) +# if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__MINGW32__) # define JIM_WIDE_MODIFIER "I64d" # else # define JIM_WIDE_MODIFIER "lld"