--- gforth/engine/engine.c	2012/01/16 22:17:32	1.117
+++ gforth/engine/engine.c	2012/07/15 12:03:07	1.119
@@ -208,6 +208,9 @@ extern Char *gforth_memcpy(Char * dest,
 #ifndef FTOSREG
 #define FTOSREG
 #endif
+#ifndef OPREG
+#define OPREG
+#endif
 
 #ifndef CPU_DEP1
 # define CPU_DEP1 0
@@ -269,11 +272,11 @@ extern Char *gforth_memcpy(Char * dest,
 #endif
 
 #ifdef STANDALONE
-jmp_buf throw_jmp_buf;
+jmp_buf * throw_jmp_handler;
 
 void throw(int code)
 {
-  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+  longjmp(*throw_jmp_handler,code); /* !! or use siglongjmp ? */
 }
 #endif
 
@@ -337,6 +340,9 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
   register Address lp LPREG = lp0;
   register Xt cfa CFAREG;
   register Label real_ca CAREG;
+#ifdef HAS_OBJECTS
+  register Char * op OPREG = NULL;
+#endif
 #ifdef MORE_VARS
   MORE_VARS
 #endif