ncurses 5.7 - patch 20090815

[ncurses.git] / ncurses / base / lib_getch.c

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index ccfcc33656df68410e60deb7775c90738ebdadef..cdc965fec5e0b4518e9a477ebd0094c86c51c2c0 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -42,26 +42,26 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.104 2009/07/04 20:41:13 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.107 2009/08/15 20:41:24 Clemens.Ladisch Exp $")
 
 #include <fifo_defs.h>
 
 #if USE_REENTRANT
 #define GetEscdelay(sp) *_nc_ptr_Escdelay(sp)
-NCURSES_EXPORT(int *)
-_nc_ptr_Escdelay(SCREEN *sp)
-{
-    return ptrEscdelay(sp);
-}
 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(ESCDELAY) (void)
 {
     return *(_nc_ptr_Escdelay(CURRENT_SCREEN));
 }
+
+NCURSES_EXPORT(int *)
+_nc_ptr_Escdelay(SCREEN *sp)
+{
+    return ptrEscdelay(sp);
+}
 #else
 #define GetEscdelay(sp) ESCDELAY
-NCURSES_EXPORT_VAR (int)
-  ESCDELAY = 1000;             /* max interval betw. chars in funkeys, in millisecs */
+NCURSES_EXPORT_VAR(int) ESCDELAY = 1000;
 #endif
 
 #if NCURSES_EXT_FUNCS
@@ -110,9 +110,9 @@ NCURSES_SP_NAME(get_escdelay) (NCURSES_SP_DCL0)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-get_escdelay (void)
+get_escdelay(void)
 {
-    return NCURSES_SP_NAME(get_escdelay)(CURRENT_SCREEN);
+    return NCURSES_SP_NAME(get_escdelay) (CURRENT_SCREEN);
 }
 #endif
 #endif /* NCURSES_EXT_FUNCS */
@@ -467,7 +467,7 @@ _nc_wgetch(WINDOW *win,
            }
 #endif
            if (!rc) {
-               returnCode(ERR);
+               goto check_sigwinch;
            }
        }
        /* else go on to read data available */
@@ -529,6 +529,7 @@ _nc_wgetch(WINDOW *win,
     }
 
     if (ch == ERR) {
+      check_sigwinch:
 #if USE_SIZECHANGE
        if (_nc_handle_sigwinch(sp)) {
            _nc_update_screensize(sp);