* src/sysdep.c: Move include term.h last of includes (Bug#6812).

2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 48968c0a97f..30b73ffdf4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * sysdep.c: Move include term.h last of includes (Bug#6812).
+
 2010-08-06  Eli Zaretskii  <eliz@gnu.org>
 
         * dispnew.c (realloc_glyph_pool): Zero out newly allocated glyphs.
diff --git a/src/sysdep.c b/src/sysdep.c
index 678f4a6faea..6e5adc8ec87 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -33,9 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_TERM_H
-#include <term.h>
-#endif
 
 #include "lisp.h"
 /* Including stdlib.h isn't necessarily enough to get srandom
@@ -110,6 +107,12 @@ extern int quit_char;
 #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
 
 /* For serial_configure and serial_open.  */
 extern Lisp_Object QCport, QCspeed, QCprocess;