X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Fhashmap.c;h=8ed2c3b4c09b887ec0ad6960c2ef48aac0917350;hp=05c379199c217f4aa513b1f8d4f1aef5ccc7ff95;hb=2debf76e0c23a2b3d1333f0853317a7b2ae1777f;hpb=7a6bbc8cf41c5186d46accc3d08622dc86526b34

diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index 05c37919..8ed2c3b4 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -69,7 +69,11 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hashmap.c,v 1.57 2009/04/18 19:03:50 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: hashmap.c,v 1.61 2009/11/07 16:07:55 tom Exp $")
 
 #ifdef HASHDEBUG
 
@@ -90,10 +94,10 @@ static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH];
 #else /* !HASHDEBUG */
 
 # define OLDNUM(sp,n)	(sp)->_oldnum_list[n]
-# define OLDTEXT(sp,n)	(sp)->_curscr->_line[n].text
-# define NEWTEXT(sp,m)	(sp)->_newscr->_line[m].text
-# define TEXTWIDTH(sp)	((sp)->_curscr->_maxx+1)
-# define PENDING(sp,n)  ((sp)->_newscr->_line[n].firstchar != _NOCHANGE)
+# define OLDTEXT(sp,n)	CurScreen(sp)->_line[n].text
+# define NEWTEXT(sp,m)	NewScreen(sp)->_line[m].text
+# define TEXTWIDTH(sp)	(CurScreen(sp)->_maxx + 1)
+# define PENDING(sp,n)  (NewScreen(sp)->_line[n].firstchar != _NOCHANGE)
 
 #endif /* !HASHDEBUG */