[Emacs-diffs] /srv/bzr/emacs/trunk r101001: * src/sysdep.c: Move include term.h last of includes (Bug#6812).

[Jan D]

------------------------------------------------------------
revno: 101001
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-06 19:38:01 +0200
message:
  * src/sysdep.c: Move include term.h last of includes (Bug#6812).
modified:
  src/ChangeLog
  src/sysdep.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-06 15:05:21 +0000
+++ b/src/ChangeLog     2010-08-06 17:38:01 +0000
@@ -1,3 +1,7 @@
+2010-08-06  Jan Djärv  <address@hidden>
+
+       * sysdep.c: Move include term.h last of includes (Bug#6812).
+
 2010-08-06  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (realloc_glyph_pool): Zero out newly allocated glyphs.

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2010-08-06 10:12:41 +0000
+++ b/src/sysdep.c      2010-08-06 17:38:01 +0000
@@ -33,9 +33,6 @@
 #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 @@
 #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;