Mercurial > emacs
changeset 111533:a702e5199b83
Fix compilation on Solaris.
* src/sysdep.c: Do not #include <term.h>.
(tputs): Add declaration, similar to what cm.c does. (Bug#7178)
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 13 Nov 2010 14:17:22 -0800 |
| parents | a60f425ba1b5 |
| children | e9570ce66184 |
| files | src/ChangeLog src/sysdep.c |
| diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Nov 13 14:10:34 2010 -0800 +++ b/src/ChangeLog Sat Nov 13 14:17:22 2010 -0800 @@ -1,5 +1,10 @@ 2010-11-13 Dan Nicolaescu <dann@ics.uci.edu> + Fix compilation on Solaris. + + * sysdep.c: Do not #include <term.h>. + (tputs): Add declaration, similar to what cm.c does. (Bug#7178) + * s/ms-w32.h (HAVE_TERMIOS_H): Do not undef, not used anymore. 2010-11-13 Jan Djärv <jan.h.d@swipnet.se>
--- a/src/sysdep.c Sat Nov 13 14:10:34 2010 -0800 +++ b/src/sysdep.c Sat Nov 13 14:17:22 2010 -0800 @@ -90,12 +90,6 @@ #include "dispextern.h" #include "process.h" #include "cm.h" /* for reset_sys_modes */ -#ifdef HAVE_TERM_H -/* Include this last. If it is ncurses header file, it adds a lot of - defines that interfere with stuff in other headers. Someone responsible - for ncurses messed up bigtime. See bug#6812. */ -#include <term.h> -#endif #ifdef WINDOWSNT #include <direct.h> @@ -123,6 +117,9 @@ #endif #endif +/* Declare here, including term.h is problematic on some systems. */ +extern void tputs (const char *, int, int (*)(int)); + static const int baud_convert[] = { 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, @@ -3071,6 +3068,3 @@ #endif /* !defined (WINDOWSNT) */ - -/* arch-tag: edb43589-4e09-4544-b325-978b5b121dcf - (do not change this comment) */