From 4dcd58724a3473be3382f2eaf27a31ed923ced4a Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 15 May 2009 20:35:53 +0000
Subject: [PATCH] Less wrong handling of JIM_EMBEDDED, follow Jim Tcl doc's and
only use JIM_EMBEDDED in a single .c file. Still broken w/-fno-common(i.e.
Mac OS).
git-svn-id: svn://svn.berlios.de/openocd/trunk@1794 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/helper/command.c | 11 ++++++++---
src/helper/command.h | 1 -
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/helper/command.c b/src/helper/command.c
index cb576bb39..9d4956c77 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -30,6 +30,11 @@
#include "config.h"
#endif
+#if !BUILD_ECOSBOARD
+/* see Embedder-HOWTO.txt in Jim Tcl project hosted on BerliOS*/
+#define JIM_EMBEDDED
+#endif
+
// @todo the inclusion of target.h here is a layering violation
#include "target.h"
#include "command.h"
@@ -675,7 +680,7 @@ command_context_t* command_init()
context->output_handler = NULL;
context->output_handler_priv = NULL;
-#ifdef JIM_EMBEDDED
+#if !BUILD_ECOSBOARD
Jim_InitEmbedded();
/* Create an interpreter */
interp = Jim_CreateInterp();
@@ -721,7 +726,7 @@ command_context_t* command_init()
add_default_dirs();
-#ifdef JIM_EMBEDDED
+#if !BUILD_ECOSBOARD
Jim_EventLoopOnLoad(interp);
#endif
if (Jim_Eval_Named(interp, startup_tcl, "embedded:startup.tcl",1)==JIM_ERR)
@@ -800,7 +805,7 @@ int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
void process_jim_events(void)
{
-#ifdef JIM_EMBEDDED
+#if !BUILD_ECOSBOARD
static int recursion = 0;
if (!recursion)
diff --git a/src/helper/command.h b/src/helper/command.h
index 07f3c2990..48cbdaab7 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -32,7 +32,6 @@
/* Jim is provied by eCos */
#include <cyg/jimtcl/jim.h>
#else
-#define JIM_EMBEDDED
#include "jim.h"
#endif
--
GitLab