X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_cur_term.c;h=64ff4c29700a5672d4a5f1655c00b532d8aa4c3a;hp=d0aad633dd287340bfa5d9197d89fc61eee6d9dc;hb=b94faec6aab7c3613c1e7d217f6df6f42d929234;hpb=1078c0231b8a58fbd2dd56b6e0a81b19d6b07f77;ds=sidebyside diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c index d0aad633..64ff4c29 100644 --- a/ncurses/tinfo/lib_cur_term.c +++ b/ncurses/tinfo/lib_cur_term.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -40,12 +40,14 @@ #include /* TTY, cur_term */ #include /* 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.19 2009/02/28 15:49:58 tom Exp $") #undef CUR #define CUR termp->type. -#if USE_REENTRANT +#if BROKEN_LINKER && !USE_REENTRANT +NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0; +#elif BROKEN_LINKER || USE_REENTRANT NCURSES_EXPORT(TERMINAL *) NCURSES_PUBLIC_VAR(cur_term) (void) { @@ -66,7 +68,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 +76,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);