--- gforth/engine/io.h	2012/03/16 20:34:23	1.14
+++ gforth/engine/io.h	2012/12/31 15:25:19	1.18
@@ -1,6 +1,6 @@
 /* Input driver header
 
-  Copyright (C) 1995,1996,1997,1998,1999,2003,2007 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,1999,2003,2007,2012 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -20,7 +20,7 @@
 
 #include <setjmp.h>
 
-extern __thread jmp_buf throw_jmp_buf;
+extern PER_THREAD jmp_buf * throw_jmp_handler;
 
 #if defined(MSDOS) || defined(SHARC)
 #  define prep_terminal()
@@ -37,8 +37,8 @@ void deprep_terminal(void);
 void get_winsize(void);
 
 #  define key(stdin)		getkey(stdin)
-#  define key_query(stdin)	-(!!key_avail(stdin)) /* !! FLAG(...)? - anton */
-         		/* flag was originally wrong -- lennart */
+#  define key_query(stdin)	FLAG(!!key_avail(stdin))
+         		/* FLAG only negates, key_avail may return the number available */
 #endif
 
 extern UCell rows, cols;