[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-379-g7db3d86

[David B. <dbr...@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  7db3d860386591599bb62e908e9b32ce25cf3168 (commit)
       via  1b28e0337dfdf34a3f700722c7c2b7304adb7f2e (commit)
      from  0bd885f539dc6e085a2b16851ab4e5173aa22a6c (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 7db3d860386591599bb62e908e9b32ce25cf3168
Author: Redirect \"Slash\" NIL <red...@gm...>
Date:   Sat Oct 17 12:15:13 2009 -0700

    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 5da00c9..edeeae7 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 82d987f..0aa0c93 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"

commit 1b28e0337dfdf34a3f700722c7c2b7304adb7f2e
Author: David Brownell <dbr...@us...>
Date:   Sat Oct 17 12:14:19 2009 -0700

    build tweak for bin2char
    
    Work better when building outside the source tree.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index ea1641e..bdef58c 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -10,10 +10,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/jtag \
 	-I$(top_srcdir)/src/xsvf
 
-BIN2C = $(top_srcdir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+BIN2C		= $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+DEBUG_HANDLER	= $(top_srcdir)/src/target/xscale/debug_handler.bin
 
-xscale_debug.h: $(BIN2C) xscale/debug_handler.bin
-	$(BIN2C) < xscale/debug_handler.bin xscale_debug_handler > xscale_debug.h
+xscale_debug.h: $(BIN2C) $(DEBUG_HANDLER)
+	$(BIN2C) < $(DEBUG_HANDLER) xscale_debug_handler > xscale_debug.h
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libtarget.la

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

Summary of changes:
 src/helper/jim-eventloop.c |    2 +-
 src/helper/jim.h           |    2 +-
 src/target/Makefile.am     |    7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository