From eccec691ae7e67c8c2ae18702458a8d2c0dfaae1 Mon Sep 17 00:00:00 2001 From: Geoff Voelker Date: Wed, 29 Apr 1998 04:34:52 +0000 Subject: [PATCH] Include cm.h after dispextern.h to avoid name conflicts in Windows system headers. (term_init) [WINDOWSNT]: Do not include remainder of function. --- src/term.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/term.c b/src/term.c index db1f317114e..05860cf7bd4 100644 --- a/src/term.c +++ b/src/term.c @@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */ #include #include "termchar.h" #include "termopts.h" -#include "cm.h" #undef NULL #include "lisp.h" #include "charset.h" @@ -34,6 +33,7 @@ Boston, MA 02111-1307, USA. */ #include "termhooks.h" #include "keyboard.h" #include "dispextern.h" +#include "cm.h" #ifdef HAVE_X_WINDOWS #include "xterm.h" #endif @@ -1604,7 +1604,7 @@ term_init (terminal_type) FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none; return; -#endif /* WINDOWSNT */ +#else /* not WINDOWSNT */ Wcm_clear (); @@ -1929,6 +1929,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", FRAME_CAN_HAVE_SCROLL_BARS (selected_frame) = 0; FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none; +#endif /* WINDOWSNT */ } /* VARARGS 1 */ -- 2.39.2