[Emacs-diffs] /srv/bzr/emacs/trunk r102380: Fix compilation on Solaris.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 102380
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-11-13 14:17:22 -0800
message:
  Fix compilation on Solaris.
  
  * src/sysdep.c: Do not #include <term.h>.
  (tputs): Add declaration, similar to what cm.c does.  (Bug#7178)
modified:
  src/ChangeLog
  src/sysdep.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-13 22:10:34 +0000
+++ b/src/ChangeLog     2010-11-13 22:17:22 +0000
@@ -1,5 +1,10 @@
 2010-11-13  Dan Nicolaescu  <address@hidden>
 
+       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  <address@hidden>

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2010-10-10 13:44:22 +0000
+++ b/src/sysdep.c      2010-11-13 22:17:22 +0000
@@ -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) */