From: oyvind <oyvind@titan.(none)>
Date: Mon, 19 Oct 2009 13:16:42 +0000 (+0200)
Subject: Sync with official Jim Tcl repository.
X-Git-Tag: v0.3.0-rc0~71
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=557d1b6490fab73bd0df0b1127275db784281595;ds=sidebyside

Sync with official Jim Tcl repository.
---

diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c
index edeeae71ef..fae46e899e 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 dfee1dd5a7..117ec56f42 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 0aa0c93dfe..089ccc157c 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