diff options
| author | oyvind <oyvind@titan.(none)> | 2009-10-19 15:16:42 +0200 |
|---|---|---|
| committer | oyvind <oyvind@titan.(none)> | 2009-10-19 15:16:42 +0200 |
| commit | 557d1b6490fab73bd0df0b1127275db784281595 (patch) | |
| tree | e22b619bcabb56eef4370c1d6b7dec2c5e229810 /src | |
| parent | 89a8a37998871b54dd8e80d179ea5a0e59b3e7ea (diff) | |
| download | openocd+libswd-557d1b6490fab73bd0df0b1127275db784281595.tar.gz openocd+libswd-557d1b6490fab73bd0df0b1127275db784281595.tar.bz2 openocd+libswd-557d1b6490fab73bd0df0b1127275db784281595.tar.xz openocd+libswd-557d1b6490fab73bd0df0b1127275db784281595.zip | |
Sync with official Jim Tcl repository.
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/jim-eventloop.c | 3 | ||||
| -rw-r--r-- | src/helper/jim.c | 3 | ||||
| -rw-r--r-- | src/helper/jim.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c index edeeae71..fae46e89 100644 --- a/src/helper/jim-eventloop.c +++ b/src/helper/jim-eventloop.c @@ -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 diff --git a/src/helper/jim.c b/src/helper/jim.c index dfee1dd5..117ec56f 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -53,6 +53,9 @@ #include <pkgconf/jimtcl.h> #include <stdio.h> #include <stdlib.h> + +typedef CYG_ADDRWORD intptr_t; + #include <string.h> #include <stdarg.h> #include <ctype.h> diff --git a/src/helper/jim.h b/src/helper/jim.h index 0aa0c93d..089ccc15 100644 --- a/src/helper/jim.h +++ b/src/helper/jim.h @@ -87,7 +87,7 @@ extern "C" { #endif /* _MSC_VER */ /* Long Long type and related issues */ -#ifdef HAVE_LONG_LONG_INT +#if !defined(__ECOS) && defined(HAVE_LONG_LONG_INT) # ifdef _MSC_VER /* MSC compiler */ # define jim_wide _int64 # ifndef LLONG_MAX @@ -119,7 +119,7 @@ extern "C" { * LIBC specific fixes * ---------------------------------------------------------------------------*/ -#ifdef HAVE_LONG_LONG_INT +#if !defined(__ECOS) && defined(HAVE_LONG_LONG_INT) # if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__MINGW32__) # define JIM_WIDE_MODIFIER "I64d" # else |