4 files changed, 3 insertions, 15 deletions
diff --git a/engines/glk/alan2/main.h b/engines/glk/alan2/main.h
index a43d3f729b..afab540706 100644
--- a/engines/glk/alan2/main.h
+++ b/engines/glk/alan2/main.h
@@ -87,9 +87,6 @@ extern const char *advnam;
 extern int col, lin;
 extern int paglen, pagwidth;
 
-/* Long jump buffer for restart */
-//extern jmp_buf restart_label;
-
 extern Boolean verbose, errflg, trcflg, dbgflg, stpflg, logflg, statusflg;
 extern Boolean fail;
 extern Boolean anyOutput;
diff --git a/engines/glk/tads/tads2/error.cpp b/engines/glk/tads/tads2/error.cpp
index ad83d06f21..5ce0e10b09 100644
--- a/engines/glk/tads/tads2/error.cpp
+++ b/engines/glk/tads/tads2/error.cpp
@@ -162,12 +162,7 @@ int errfmt(char *outbuf, int outbufl, const char *fmt, int argc, const erradef *
 }
 
 #ifdef DEBUG
-void errjmp(buf, e)
-jmp_buf buf;
-int     e;
-{
-    longjmp(buf, e);
-}
+#error lonjump isn't supported in ScummVM
 #endif /* DEBUG */
 
 
diff --git a/engines/glk/tads/tads2/error_handling.cpp b/engines/glk/tads/tads2/error_handling.cpp
index ac2b01df53..86b307724d 100644
--- a/engines/glk/tads/tads2/error_handling.cpp
+++ b/engines/glk/tads/tads2/error_handling.cpp
@@ -137,10 +137,7 @@ int errfmt(char *outbuf, int outbufl, char *fmt, int argc, erradef *argv)
 }
 
 #if defined(DEBUG) && !defined(ERR_NO_MACRO)
-void errjmp(jmp_buf buf, int e)
-{
-    longjmp(buf, e);
-}
+#error longjmp isn't supported in ScummVM
 #endif /* DEBUG */
 
 
diff --git a/engines/glk/tads/tads2/error_handling.h b/engines/glk/tads/tads2/error_handling.h
index 8d37929184..d1275944fd 100644
--- a/engines/glk/tads/tads2/error_handling.h
+++ b/engines/glk/tads/tads2/error_handling.h
@@ -83,7 +83,6 @@ struct errdef {
     char           errfac[ERRFACMAX+1];        /* facility of current error */
     erradef        erraav[10];                      /* parameters for error */
     int            erraac;                   /* count of parameters in argc */
-    //jmp_buf        errbuf;        ScummVM doesn't support using jump buffers
 };
 
 #define ERRBUFSIZ 512
@@ -190,7 +189,7 @@ char *errstr(errcxdef *ctx, const char *str, int len);
 void errsign(errcxdef *ctx, int e, const char *facility);
 #else /* ERR_NO_MACRO */
 # ifdef DEBUG
-void errjmp(jmp_buf buf, int e);
+void errjmp(jump_buf buf, int e);
 #  define errsign(ctx, e, fac) \
    (strncpy((ctx)->errcxptr->errfac, fac, ERRFACMAX),\
     (ctx)->errcxptr->errfac[ERRFACMAX]='\0',\