From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 13 Nov 2010 22:17:22 +0000 (-0800)
Subject: Fix compilation on Solaris.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~251
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff2e8052fda9c0710e0b9088080e6e351c02e338;p=emacs.git

Fix compilation on Solaris.

* src/sysdep.c: Do not #include <term.h>.
(tputs): Add declaration, similar to what cm.c does.  (Bug#7178)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8a7c27637e3..26a6c4c5b83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
diff --git a/src/sysdep.c b/src/sysdep.c
index f68d475d22c..84fa6d6b3b7 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -90,12 +90,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ struct utimbuf {
 #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 @@ system_process_attributes (Lisp_Object pid)
 
 #endif	/* !defined (WINDOWSNT) */
 
-
-/* arch-tag: edb43589-4e09-4544-b325-978b5b121dcf
-   (do not change this comment) */