diff options
| author | Redirect \"Slash\" NIL <redirect.slash.nil@gmail.com> | 2009-10-17 12:15:13 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-10-17 12:15:13 -0700 |
| commit | c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a (patch) | |
| tree | 9cf91d2d25bbf5224a64e1bed5ba69d1ce20224c /src | |
| parent | 05d6716936d4c8cea80443b1aaaa14a80e97cfc4 (diff) | |
| download | openocd+libswd-c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a.tar.gz openocd+libswd-c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a.tar.bz2 openocd+libswd-c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a.tar.xz openocd+libswd-c9fbfbd95c04dcc7e0e56a678d0f5c2d6c673e2a.zip | |
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,.
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/jim-eventloop.c | 2 | ||||
| -rw-r--r-- | src/helper/jim.h | 2 |
2 files changed, 2 insertions, 2 deletions
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" |