* ChangeLog, jim.c, jim.h, jim-aio.c: Support for eCos.

4 files changed, 22 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0694c20..6fa3518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2008-06-15 oharboe
-	
+
+	* ChangeLog, jim.c, jim.h, jim-aio.c: Support for eCos.	
 	* ChangeLog, jim.c: realloc/malloc(0) fix. Convert
 	realloc/malloc(0) => realloc/malloc(1) which has an
 	identical implementation, whereas realloc/malloc(0) is
diff --git a/ecos/update.sh b/ecos/update.sh
index ba58286..82f0252 100644
--- a/ecos/update.sh
+++ b/ecos/update.sh
@@ -1,3 +1,5 @@
 # Copy files from original places into eCos repository structure

 cp ../jim.c language/tcl/jim/current/src

-cp ../jim.c language/tcl/jim/current/src

+cp ../jim-aio.c language/tcl/jim/current/src

+cp ../jim.h language/tcl/jim/current/include

+

diff --git a/jim-aio.c b/jim-aio.c
index 74bf8ae..795dba6 100644
--- a/jim-aio.c
+++ b/jim-aio.c
@@ -1,7 +1,7 @@
 /* Jim - ANSI I/O extension
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
  *
- * $Id: jim-aio.c,v 1.11 2007/01/31 00:49:05 patthoyts Exp $
+ * $Id: jim-aio.c,v 1.12 2008/06/15 21:03:26 oharboe Exp $
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,17 @@
 #include <string.h>
 #include <errno.h>
 
+#ifdef __ECOS
+#include <pkgconf/jimtcl.h>
+#endif
 #ifndef JIM_STATICEXT
 #define JIM_EXTENSION
 #endif
+#ifdef __ECOS
+#include <cyg/jimtcl/jim.h>
+#else
 #include "jim.h"
+#endif
 
 #define AIO_CMD_LEN 128
 #define AIO_BUF_LEN 1024
diff --git a/jim.c b/jim.c
index 53a711b..bbee56e 100644
--- a/jim.c
+++ b/jim.c
@@ -2,7 +2,7 @@
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
  * Copyright 2005 Clemens Hintze <c.hintze@gmx.net>
  *
- * $Id: jim.c,v 1.172 2008/06/15 18:49:31 oharboe Exp $
+ * $Id: jim.c,v 1.173 2008/06/15 21:03:26 oharboe Exp $
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@
 #define __JIM_CORE__
 #define JIM_OPTIMIZATION /* comment to avoid optimizations and reduce size */
 
+#ifdef __ECOS
+#include <pkgconf/jimtcl.h>
+#endif
 #ifndef JIM_ANSIC
 #define JIM_DYNLIB      /* Dynamic library support for UNIX and WIN32 */
 #endif /* JIM_ANSIC */
@@ -55,7 +58,11 @@
 #endif /* WIN32 */
 #endif /* JIM_DYNLIB */
 
+#ifdef __ECOS
+#include <cyg/jimtcl/jim.h>
+#else
 #include "jim.h"
+#endif
 
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
@@ -11763,7 +11770,7 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
            "Copyright (c) 2005 Salvatore Sanfilippo" JIM_NL,
            JIM_VERSION / 100, JIM_VERSION % 100);
     fprintf(interp->stdout_,
-            "CVS ID: $Id: jim.c,v 1.172 2008/06/15 18:49:31 oharboe Exp $"
+            "CVS ID: $Id: jim.c,v 1.173 2008/06/15 21:03:26 oharboe Exp $"
             JIM_NL);
     Jim_SetVariableStrWithStr(interp, "jim_interactive", "1");
     while (1) {