ncurses 5.6 - patch 20080816

[ncurses.git] / ncurses / tinfo / lib_cur_term.c

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index d0aad633dd287340bfa5d9197d89fc61eee6d9dc..626578d5c08b93b8a72738b2228ef2497cf4223e 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -40,12 +40,12 @@
 #include <term_entry.h>                /* TTY, cur_term */
 #include <termcap.h>           /* ospeed */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.16 2008/06/07 22:22:16 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $")
 
 #undef CUR
 #define CUR termp->type.
 
-#if USE_REENTRANT
+#if BROKEN_LINKER || USE_REENTRANT
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_PUBLIC_VAR(cur_term) (void)
 {
@@ -66,7 +66,7 @@ set_curterm(TERMINAL * termp)
     oldterm = cur_term;
     if (SP)
        SP->_term = termp;
-#if USE_REENTRANT
+#if BROKEN_LINKER || USE_REENTRANT
     _nc_prescreen._cur_term = termp;
 #else
     cur_term = termp;
@@ -74,7 +74,7 @@ set_curterm(TERMINAL * termp)
     if (termp != 0) {
        ospeed = _nc_ospeed(termp->_baudrate);
        if (termp->type.Strings) {
-           PC = (pad_char != NULL) ? pad_char[0] : 0;
+           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
        }
     }
     _nc_unlock_global(curses);