[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-385-g3c6bb4b

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  3c6bb4bce8a3a85495f3297d0e4d2f8a958da662 (commit)
      from  60b66deb4f75efb325dbdf7de7f8bf7c6518376d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3c6bb4bce8a3a85495f3297d0e4d2f8a958da662
Author: oyvind <oyvind@titan.(none)>
Date:   Mon Oct 19 15:16:42 2009 +0200

    Sync with official Jim Tcl repository.

diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c
index edeeae7..fae46e8 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 dfee1dd..117ec56 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 0aa0c93..089ccc1 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

-----------------------------------------------------------------------

Summary of changes:
 src/helper/jim-eventloop.c |    3 +--
 src/helper/jim.c           |    3 +++
 src/helper/jim.h           |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository