--- gforth/engine/libcc.h.in	2012/03/14 15:51:15	1.10
+++ gforth/engine/libcc.h.in	2012/03/22 16:27:11	1.13
@@ -19,8 +19,9 @@
 */
 
 #include <gforth/@PACKAGE_VERSION@/config.h>
+#include <setjmp.h>
 
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__ANDROID__)
 #undef HAS_BACKLINK
 #else
 #define HAS_BACKLINK 1
@@ -38,20 +39,22 @@ extern __thread Float *gforth_FP;
 extern __thread Cell *gforth_RP;
 extern __thread char *gforth_LP;
 extern __thread char *gforth_UP;
-extern void *gforth_engine(void *, Cell *, Cell *, Float *, char *, char *);
+extern void *gforth_engine(void *, Cell *, Cell *, Float *, char *);
 extern char *cstr(char *from, Cell size);
 extern char *tilde_cstr(char *from, Cell size);
+extern __thread jmp_buf throw_jmp_buf;
 #define GFORTH_ARGS void
 #else
-#define gforth_SP *((Cell **)(gforth_pointers[0]))
-#define gforth_FP *((Float **)(gforth_pointers[1]))
-#define gforth_LP *((char **)(gforth_pointers[2]))
-#define gforth_RP *((Cell **)(gforth_pointers[3]))
-#define gforth_UP *((char **)(gforth_pointers[4]))
-#define gforth_engine ((char *(*)(Xt *, Cell *, Cell *, Float *, char *, char *))(((void **)(gforth_pointers[5]))))
-#define cstr ((char *(*)(char *, Cell))(((void **)(gforth_pointers[6]))))
-#define tilde_cstr ((char *(*)(char *, Cell))(((void **)(gforth_pointers[7]))))
-#define GFORTH_ARGS void ** gforth_pointers 
+#define gforth_SP *((Cell **)(gforth_pointers(0)))
+#define gforth_FP *((Float **)(gforth_pointers(1)))
+#define gforth_LP *((char **)(gforth_pointers(2)))
+#define gforth_RP *((Cell **)(gforth_pointers(3)))
+#define gforth_UP *((char **)(gforth_pointers(4)))
+#define gforth_engine ((char *(*)(void *, Cell *, Cell *, Float *, char *))(((void **)(gforth_pointers(5)))))
+#define cstr ((char *(*)(char *, Cell))(((void **)(gforth_pointers(6)))))
+#define tilde_cstr ((char *(*)(char *, Cell))(((void **)(gforth_pointers(7)))))
+#define throw_jmp_buf *((jmp_buf*)(gforth_pointers(8)))
+#define GFORTH_ARGS void *(*gforth_pointers)(Cell)
 #endif
 
 #define CELL_BITS	(sizeof(Cell) * 8)